";
foreach (array(25, 50, 100, 200) as $l) {
//$issel = ($l == $limit) ? "selected=\"1\"" : "";
@@ -766,10 +759,11 @@ class Feeds extends Handler_Protected {
print make_feed_browser("", 25);
print "";
- print "
- ".__('Subscribe')."
- ".__('Remove')."
- ".__('Cancel')."
";
+ print "
+ ".__('Subscribe')."
+ ".__('Remove')."
+ ".__('Cancel')."
+ ";
}
@@ -781,18 +775,15 @@ class Feeds extends Handler_Protected {
print "";
}
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index a033bf04f..dd7c67e7e 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -531,16 +531,16 @@ class Pref_Feeds extends Handler_Protected {
print_hidden("op", "pref-feeds");
print_hidden("method", "editSave");
- print "".__("Feed")."
";
- print "";
+ print "";
+ print "
";
+ print "";
- print "".__("Update")."
";
- print "";
+ print "";
+ print "";
/* Update Interval */
@@ -641,7 +641,7 @@ class Pref_Feeds extends Handler_Protected {
print "";
- print "
";
+ print "";
$auth_login = htmlspecialchars($row["auth_login"]);
$auth_pass = htmlspecialchars($row["auth_pass"]);
@@ -650,44 +650,39 @@ class Pref_Feeds extends Handler_Protected {
$auth_style = $auth_enabled ? '' : 'display: none';
print "";
- print "
".__("Authentication")."
";
- print "
";
+ print "
";
$auth_checked = $auth_enabled ? 'checked' : '';
- print "
-
+
- ".
- __('This feed requires authentication.')."
";
+ ".__('This feed requires authentication.')."";
print '';
/* Icon */
- print "
";
+ print "
";
- print "
";
+ print "
";
- print "
";
-
- print "
";
-
print '
';
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
@@ -822,16 +808,12 @@ class Pref_Feeds extends Handler_Protected {
$title = htmlspecialchars($title, ENT_QUOTES);
- print "
";
+ print "
+ ".
+ __('Unsubscribe')."
+ ".__('Save')."
+ ".__('Cancel')."
+ ";
}
}
@@ -849,8 +831,8 @@ class Pref_Feeds extends Handler_Protected {
print_hidden("op", "pref-feeds");
print_hidden("method", "batchEditSave");
- print "
".__("Feed")."
";
- print "
";
+ print "";
+ print "";
/* Category */
@@ -882,10 +864,10 @@ class Pref_Feeds extends Handler_Protected {
print "";
}
- print "
";
+ print "";
- print "
".__("Update")."
";
- print "
";
+ print "";
+ print "";
/* Update Interval */
@@ -916,93 +898,85 @@ class Pref_Feeds extends Handler_Protected {
print "";
}
- print "
";
- print "
".__("Authentication")."
";
- print "
";
+ print "";
+ print "";
+ print "
";
- print "
".__("Options")."
";
- print "
";
+ print "";
+ print "";
+ print "
";
+ print "";
- print "
-
+ ".
__('Save')."
- ".
__('Cancel')."
-
";
+ ";
return;
}
@@ -1499,16 +1473,14 @@ class Pref_Feeds extends Handler_Protected {
ORDER BY last_article");
$sth->execute([$_SESSION['uid']]);
- print "
";
-
- print "
";
- print "
".
+ print "
";
+ print "
".
"
" . __('Select')." ";
- print "
";
+ print "
";
print "
".__('All')."
";
+ dojoType='dijit.MenuItem'>".__('All')."
";
print "
".__('None')."
";
+ dojoType='dijit.MenuItem'>".__('None')."
";
print "
";
print "
"; #toolbar
@@ -1524,16 +1496,16 @@ class Pref_Feeds extends Handler_Protected {
print "
";
print " ";
+ onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox'
+ type='checkbox'>";
print "";
- print "".
htmlspecialchars($line["title"])." ";
- print " ";
+ print " ";
print make_local_datetime($line['last_article'], false);
print " ";
print " ";
@@ -1544,16 +1516,12 @@ class Pref_Feeds extends Handler_Protected {
print "";
print "
";
- print "
";
+ print "
+ "
+ .__('Unsubscribe from selected feeds')."
+ "
+ .__('Close this window')."
+ ";
}
@@ -1607,16 +1575,14 @@ class Pref_Feeds extends Handler_Protected {
print "";
print "
";
- print "";
+ print "";
}
private function remove_feed_category($id, $owner_uid) {
@@ -1710,9 +1676,8 @@ class Pref_Feeds extends Handler_Protected {
print_hidden("op", "pref-feeds");
print_hidden("method", "batchaddfeeds");
- print "".__("One valid feed per line (no detection is done)")."
";
-
- print "";
+ print "
".__("One valid feed per line (no detection is done)")." ";
+ print "
";
+
print "
";
- print "
" . __("Authentication") . "
";
- print "
";
+ print "" . __("Authentication") . " ";
+ print "
";
- print "
";
+ print "";
print "
";
print "
@@ -1743,10 +1710,10 @@ class Pref_Feeds extends Handler_Protected {
__('Feeds require authentication.')."";
print " ";
- print "
+ print "
".__('Subscribe')."
".__('Cancel')."
-
";
+ ";
}
function batchAddFeeds() {
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 99bb885cf..8414de9fe 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -170,10 +170,10 @@ class Pref_Filters extends Handler_Protected {
print "";
- print "";
- print "".
+ print "";
+ print "".
__('Close this window')." ";
- print "
";
+ print "";
}
@@ -346,15 +346,13 @@ class Pref_Filters extends Handler_Protected {
print_hidden("method", "editSave");
print_hidden("csrf_token", $_SESSION['csrf_token']);
- print "".__("Caption")."
";
- print "";
-
+ print "";
+ print "";
- print "
";
-
- print "".__("Match")."
";
- print "";
+ print "
";
+ print "
";
print "";
@@ -410,11 +408,11 @@ class Pref_Filters extends Handler_Protected {
print "";
- print "
";
+ print " ";
- print "
".__("Apply actions")."
";
+ print "
";
- print "
";
+ print "
";
print "";
@@ -456,10 +454,10 @@ class Pref_Filters extends Handler_Protected {
print "";
- print "
";
+ print " ";
- print "
".__("Options")."
";
- print "
";
+ print "";
+ print "";
if ($enabled) {
$checked = "checked=\"1\"";
@@ -495,9 +493,9 @@ class Pref_Filters extends Handler_Protected {
print "";
- print "
";
+ print "";
- print "
";
+ print "
";
print "";
print "".
@@ -513,7 +511,7 @@ class Pref_Filters extends Handler_Protected {
print "".
__('Cancel')." ";
- print "
";
+ print " ";
print "";
}
@@ -849,31 +847,30 @@ class Pref_Filters extends Handler_Protected {
print_hidden("method", "add");
print_hidden("csrf_token", $_SESSION['csrf_token']);
- print "
".__("Caption")."
";
+ print "
";
- print "
";
- print " ";
- print "
";
+ print "
";
- print "
".__("Match")."
";
+ print "
";
+ print "
";
- print "";
+ print "
";
- print "
";
-
- print "
".
+ print "
".
"
" . __('Select')." ";
- print "
";
+ print "
";
print "
".__('All')."
";
+ dojoType='dijit.MenuItem'>".__('All')."
";
print "
".__('None')."
";
+ dojoType='dijit.MenuItem'>".__('None')."
";
print "
";
- print "
".
+ print "".
__('Add')." ";
- print "".
+ print "".
__('Delete')." ";
print " ";
@@ -882,74 +879,69 @@ class Pref_Filters extends Handler_Protected {
# print "
No rules ";
print "";
- print "
";
- print "
";
+ print " ";
- print "
".__("Apply actions")."
";
+ print "
";
- print "
";
+ print "
";
- print "";
+ print "
";
- print "
".
+ print "
".
"
" . __('Select')." ";
- print "
";
+ print "
";
print "
".__('All')."
";
+ dojoType='dijit.MenuItem'>".__('All')."
";
print "
".__('None')."
";
+ dojoType='dijit.MenuItem'>".__('None')."
";
print "
";
- print "
".
+ print "".
__('Add')." ";
- print "".
+ print "".
__('Delete')." ";
print " ";
-
print "
";
# print "No actions ";
print " ";
- print "
";
- print "".__("Options")."
";
+ print " ";
- print "
";
+ print "";
+
+ print "
";
+ print "";
-// print "
";
+ print "
";
}
@@ -979,9 +971,9 @@ class Pref_Filters extends Handler_Protected {
$filter_types[$line["id"]] = __($line["description"]);
}
- print "
".__("Match")."
";
+ print "
";
- print "
";
+ print "
";
+ print "";
- print "
";
+ print "";
print "
help ".__("More info...")." ";
@@ -1028,7 +1020,7 @@ class Pref_Filters extends Handler_Protected {
print "".
__('Cancel')." ";
- print "
";
+ print "";
print "";
}
@@ -1046,12 +1038,12 @@ class Pref_Filters extends Handler_Protected {
print "
";
- print "".__("Perform Action")."
";
+ print "";
- print "";
+ print "";
- print "";
+ print "";
$res = $this->pdo->query("SELECT id,description FROM ttrss_filter_actions
ORDER BY name");
@@ -1072,16 +1064,16 @@ class Pref_Filters extends Handler_Protected {
$label_param_hidden = ($action_id == 7) ? "" : "display : none";
$plugin_param_hidden = ($action_id == 9) ? "" : "display : none";
- print "";
+ print "";
print " ";
//print " " . __("with parameters:") . " ";
- print " ";
+ print " ";
print_label_select("action_param_label", $action_param,
- "id=\"filterDlg_actionParamLabel\" style=\"$label_param_hidden\"
- dojoType=\"dijit.form.Select\"");
+ "id='filterDlg_actionParamLabel' style=\"$label_param_hidden\"
+ dojoType='dijit.form.Select'");
$filter_actions = PluginHost::getInstance()->get_filter_actions();
$filter_action_hash = array();
@@ -1104,24 +1096,24 @@ class Pref_Filters extends Handler_Protected {
}
print_select_hash("filterDlg_actionParamPlugin", $action_param, $filter_action_hash,
- "style=\"$plugin_param_hidden\" dojoType=\"dijit.form.Select\" $filter_plugin_disabled",
+ "style=\"$plugin_param_hidden\" dojoType='dijit.form.Select' $filter_plugin_disabled",
"action_param_plugin");
print " ";
print " "; // tiny layout hack
- print "
";
+ print "";
- print "";
+ print "";
- print "".
+ print "".
($action ? __("Save action") : __('Add action'))." ";
- print "".
+ print "".
__('Cancel')." ";
- print "
";
+ print "";
print " ";
}
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 28befe42b..5dadddab4 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -22,9 +22,9 @@ class Pref_Labels extends Handler_Protected {
print "
";
- print "".__("Caption")."
";
+ print "";
- print "";
+ print "";
$fg_color = $line['fg_color'];
$bg_color = $line['bg_color'] ? $line['bg_color'] : '#fff7d5';
@@ -33,53 +33,47 @@ class Pref_Labels extends Handler_Protected {
id='labelEdit_caption' name='caption' dojoType='dijit.form.ValidationTextBox'
required='true' value=\"".htmlspecialchars($line['caption'])."\">";
- print "
";
- print "" . __("Colors") . "
";
- print "";
+ print "";
- print "
";
-
- print "".__("Foreground:")." ".__("Background:").
- " ";
+ print "";
+ print "";
+ print "";
- print "";
+ print " ";
-# print "";
-
- print "";
- print "".
+ print "";
+ print "".
__('Save')." ";
- print "".
+ print "".
__('Cancel')." ";
- print "
";
+ print "";
print "";
}
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index fb1c1db06..acb36580d 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1039,35 +1039,34 @@ class Pref_Prefs extends Handler_Protected {
print_hidden("key", "USER_STYLESHEET");
print "$value ";
+ style='font-size : 12px;' name='value'>$value";
- print "";
- print "";
+ print "".__('Save')." ";
- print "".__('Cancel')." ";
- print "
";
+ print "";
}
function editPrefProfiles() {
- print "";
+ print "
";
- print "
".
+ print "
".
"
" . __('Select')." ";
- print "
";
+ print "
";
print "
".__('All')."
";
+ dojoType='dijit.MenuItem'>".__('All')."
";
print "
".__('None')."
";
+ dojoType='dijit.MenuItem'>".__('None')."
";
print "
";
- print "
";
+ print "
";
- print "
-
+ ".
__('Create profile')."
";
@@ -1113,10 +1112,10 @@ class Pref_Prefs extends Handler_Protected {
$is_active = "";
}
- print "
" . $edit_title .
- "