diff --git a/classes/article.php b/classes/article.php index fd693a4fe..028901368 100755 --- a/classes/article.php +++ b/classes/article.php @@ -211,8 +211,6 @@ class Article extends Handler_Protected { function editArticleTags() { - print __("Tags for this article (separated by commas):")."
"; - $param = clean($_REQUEST['param']); $tags = Article::get_article_tags($param); @@ -223,23 +221,22 @@ class Article extends Handler_Protected { print_hidden("op", "article"); print_hidden("method", "setArticleTags"); - print "
"; + print "
" . __("Tags for this article (separated by commas):")."
"; - print " -
"; + "; + print ""; - print "
"; - - print "
"; - - print " "; - print " "; + print ""; - print "
"; + print ""; } diff --git a/classes/backend.php b/classes/backend.php index bd6b1ff19..1e1165517 100644 --- a/classes/backend.php +++ b/classes/backend.php @@ -149,13 +149,13 @@ class Backend extends Handler { print ""; } - print "
"; + print "
"; + print ""; } } diff --git a/classes/dlg.php b/classes/dlg.php index 89b88825e..4489af51a 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -14,7 +14,7 @@ class Dlg extends Handler_Protected { } function importOpml() { - print __("If you have imported labels and/or filters, you might need to reload preferences to see your new data.") . "

"; + print_notice("If you have imported labels and/or filters, you might need to reload preferences to see your new data."); print "
"; @@ -24,11 +24,11 @@ class Dlg extends Handler_Protected { print "
"; - print "
"; - print ""; - print "
"; + print ""; print ""; @@ -38,25 +38,25 @@ class Dlg extends Handler_Protected { function pubOPMLUrl() { $url_path = Opml::opml_publish_url(); - print "
" . __("Your Public OPML URL is:") . "
"; + print "
" . __("Your Public OPML URL is:") . "
"; - print "
"; + print "
"; print "
"; print "$url_path"; print "
"; - print "
"; + print ""; - print "
"; + print "
"; + print ""; //return; } @@ -84,12 +84,10 @@ class Dlg extends Handler_Protected { print ""; - print "
"; - + print "
"; + print ""; //return; } @@ -149,11 +147,11 @@ class Dlg extends Handler_Protected { print ""; - print "
"; - print ""; - print "
"; + print ""; } @@ -169,15 +167,15 @@ class Dlg extends Handler_Protected { $feed_title = Feeds::getFeedTitle($feed_id, $is_cat); - print "
".T_sprintf("%s can be accessed via the following secret URL:", $feed_title)."
"; + print "
".T_sprintf("%s can be accessed via the following secret URL:", $feed_title)."
"; - print "
"; + print "
"; print "
"; print "$url_path"; print "
"; - print "
"; + print ""; - print "
"; + print "
"; + print ""; //return; } @@ -197,12 +195,12 @@ class Dlg extends Handler_Protected { print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication).")); - print "
"; - print " "; - print ""; - print "
"; + print ""; } } diff --git a/classes/feeds.php b/classes/feeds.php index aac9b627f..a8908e519 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -645,18 +645,13 @@ class Feeds extends Handler_Protected { print_notice("Provided URL is a HTML page referencing multiple feeds, please select required feed from the dropdown menu below."); print "

"; - //print "

".__("Feed or site URL")."
"; - print "
"; - - print "
-
"; + print "
"; print "
"; - - print "
"; + print ""; + dojoType='dijit.form.ValidationTextBox' required='1' name='feed' id='feedDlg_feedUrl'>"; print ""; @@ -669,12 +664,11 @@ class Feeds extends Handler_Protected { print ""; - print ""; + print ""; print ''; + + '; print ""; - - - print "
- -
"; - - print "
- "; - - if (!(defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER)) { - print ""; - } - - print " +
"; - print ""; + print "
"; + print "
"; - //return; + print ""; + + print ""; } function feedBrowser() { @@ -737,19 +730,19 @@ class Feeds extends Handler_Protected {
- - +
"; - print " "; print __("limit:"); - print " "; 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 "
- - -
"; + print ""; } @@ -781,18 +775,15 @@ class Feeds extends Handler_Protected { print "
"; - //print "
".__('Look for')."
"; - - print "
"; + print "
"; print "
"; - print "getFeedTitle($active_feed_id, $is_cat))."\" - required=\"1\" name=\"query\" type=\"search\" value=''>"; + required='1' name='query' type='search' value=''>"; print "
"; - if (DB_TYPE == "pgsql") { print "
"; print ""; @@ -801,18 +792,19 @@ class Feeds extends Handler_Protected { print "
"; } - print "
"; + print ""; - print "
"; + print "
"; if (count(PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH)) == 0) { print ""; } - print " - -
"; + print " + "; + + print ""; 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 "
".__("Feed")."
"; + print "
"; /* Title */ print "
"; - print ""; + style='font-size : 16px; width: 500px' name='title' value=\"$title\">"; print "
"; @@ -551,10 +551,10 @@ class Pref_Feeds extends Handler_Protected { print "
"; print " "; - print ""; + regExp='^(http|https)://.*' style='width : 300px' + name='feed_url' value=\"$feed_url\">"; $last_error = $row["last_error"]; @@ -588,10 +588,10 @@ class Pref_Feeds extends Handler_Protected { print "
"; print " "; - print ""; + regExp='^(http|https)://.*' style='width : 300px' + name='site_url' value=\"$site_url\">"; print "
"; @@ -609,10 +609,10 @@ class Pref_Feeds extends Handler_Protected { print "
"; } - print "
"; + print ""; - print "
".__("Update")."
"; - print "
"; + print "
".__("Update")."
"; + 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 "
".__("Authentication")."
"; + print "
"; print "
"; - print ""; + print ""; - print "
"; - print "
"; + print "
"; - print ""; - print "
+ print "
".__('Hint: you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')."
"; print "
"; - print "
"; + print ""; $auth_checked = $auth_enabled ? 'checked' : ''; - print "
- + -
"; + ".__('This feed requires authentication.').""; print '
'; - //print "
".__("Options")."
"; - print "
"; - $private = $row["private"]; if ($private) { @@ -745,9 +740,8 @@ class Pref_Feeds extends Handler_Protected { print "
"; - print ""; + print ""; print "
"; @@ -761,9 +755,8 @@ class Pref_Feeds extends Handler_Protected { print "
"; - print ""; + print ""; print "
"; @@ -777,42 +770,35 @@ class Pref_Feeds extends Handler_Protected { print "
"; - print ""; + print ""; print "
"; - print "
"; - 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 "
"; - - print " - -
"; + print ""; } } @@ -849,8 +831,8 @@ class Pref_Feeds extends Handler_Protected { print_hidden("op", "pref-feeds"); print_hidden("method", "batchEditSave"); - print "
".__("Feed")."
"; - print "
"; + print "
".__("Feed")."
"; + print "
"; /* Category */ @@ -882,10 +864,10 @@ class Pref_Feeds extends Handler_Protected { print ""; } - print "
"; + print ""; - print "
".__("Update")."
"; - print "
"; + print "
".__("Update")."
"; + print "
"; /* Update Interval */ @@ -916,93 +898,85 @@ class Pref_Feeds extends Handler_Protected { print ""; } - print "
"; - print "
".__("Authentication")."
"; - print "
"; + print ""; + print "
".__("Authentication")."
"; + print "
"; print "
"; - print ""; + print ""; $this->batch_edit_cbox("auth_login"); - print "
"; - print "
"; - - print ""; + print ""; $this->batch_edit_cbox("auth_pass"); print "
"; - print "
"; - print "
".__("Options")."
"; - print "
"; + print ""; + print "
".__("Options")."
"; + print "
"; print "
"; - print ""; + print ""; print " "; $this->batch_edit_cbox("private", "private_l"); print "
"; - print ""; + print ""; print " "; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l"); print "
"; - print ""; + print ""; print " "; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l"); print "
"; - print ""; + print ""; print " "; $this->batch_edit_cbox("hide_images", "hide_images_l"); print "
"; - print ""; + print ""; print " "; $this->batch_edit_cbox("cache_images", "cache_images_l"); print "
"; - print ""; + print ""; print " "; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l"); print "
"; - print "
"; + print ""; - print "
- - -
"; + "; 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 "
"; - print " "; - print "
"; - - print ""; - - print "
"; + print ""; } @@ -1607,16 +1575,14 @@ class Pref_Feeds extends Handler_Protected { print ""; print "
"; - print "
"; - print "
"; - print " "; - 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 ""; + style='font-size : 12px;' name='value'>$value"; - print "
"; - print " "; - print ""; - 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 " -
"; @@ -1113,10 +1112,10 @@ class Pref_Prefs extends Handler_Protected { $is_active = ""; } - print "" . $edit_title . - "