diff --git a/classes/dlg.php b/classes/dlg.php index fa2b01156..cd8de206b 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -38,12 +38,16 @@ 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 "$url_path"; print "
"; + print "
"; + print "
"; print ""; print "
"; } -} \ No newline at end of file +} diff --git a/classes/feeds.php b/classes/feeds.php index 820be9929..058ac0215 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -652,45 +652,55 @@ class Feeds extends Handler_Protected { "; - print ""; + + print ""; - print "
"; + print ""; + + print "
"; if (get_pref('ENABLE_FEED_CATS')) { - print __('Place in category:') . " "; + print " "; print_feed_cat_select("cat", false, 'dojoType="dijit.form.Select"'); } + print "
"; + print ""; print ''; +
+
+ +
+
'; print ""; @@ -594,20 +605,27 @@ class Pref_Feeds extends Handler_Protected { $update_interval = $row["update_interval"]; + print "
"; + print_select_hash("update_interval", $update_interval, $update_intervals, 'dojoType="dijit.form.Select"'); + print "
"; + /* Purge intl */ $purge_interval = $row["purge_interval"]; - print "
"; - print __('Article purging:') . " "; + print "
"; + + print " "; print_select_hash("purge_interval", $purge_interval, $purge_intervals, 'dojoType="dijit.form.Select" ' . ((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"')); + print "
"; + print ""; $auth_login = htmlspecialchars($row["auth_login"]); @@ -620,19 +638,26 @@ class Pref_Feeds extends Handler_Protected { print "
".__("Authentication")."
"; print "
"; + print "
"; + print "
"; + placeHolder=\"".__("Login")."\" + autocomplete=\"new-password\" + name=\"auth_login\" value=\"$auth_login\">"; + + print "
"; + print "
"; print ""; + autocomplete=\"new-password\" + placeHolder=\"".__("Password")."\" + value=\"$auth_pass\">"; print "
- ".__('Hint: you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')." -
"; + ".__('Hint: you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')." +
"; + + print ""; print ""; @@ -656,8 +681,12 @@ class Pref_Feeds extends Handler_Protected { $checked = ""; } - print " "; + print "
"; + + print ""; + + print "
"; $include_in_digest = $row["include_in_digest"]; @@ -667,10 +696,13 @@ class Pref_Feeds extends Handler_Protected { $checked = ""; } - print "
 "; + print "
"; + print ""; + + print "
"; $always_display_enclosures = $row["always_display_enclosures"]; @@ -680,9 +712,13 @@ class Pref_Feeds extends Handler_Protected { $checked = ""; } - print "
 "; + print "
"; + + print ""; + + print "
"; $hide_images = $row["hide_images"]; @@ -692,10 +728,13 @@ class Pref_Feeds extends Handler_Protected { $checked = ""; } - print "
 "; + print "
"; + + print ""; + + print "
"; $cache_images = $row["cache_images"]; @@ -705,10 +744,13 @@ class Pref_Feeds extends Handler_Protected { $checked = ""; } - print "
 "; + print "
"; + + print ""; + + print "
"; $mark_unread_on_update = $row["mark_unread_on_update"]; @@ -718,9 +760,13 @@ class Pref_Feeds extends Handler_Protected { $checked = ""; } - print "
 "; + print "
"; + + print ""; + + print "
"; print ""; @@ -757,7 +803,6 @@ class Pref_Feeds extends Handler_Protected { PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED, "hook_prefs_edit_feed", $feed_id); - print ""; $title = htmlspecialchars($title, ENT_QUOTES); @@ -796,25 +841,30 @@ class Pref_Feeds extends Handler_Protected { if (get_pref('ENABLE_FEED_CATS')) { - print __('Place in category:') . " "; + print "
"; + + print " "; print_feed_cat_select("cat_id", false, 'disabled="1" dojoType="dijit.form.Select"'); $this->batch_edit_cbox("cat_id"); + print "
"; } /* FTS Stemming Language */ if (DB_TYPE == "pgsql") { - print "
"; + print "
"; - print __('Language:') . " "; + print " "; print_select("feed_language", "", $this::$feed_languages, 'disabled="1" dojoType="dijit.form.Select"'); $this->batch_edit_cbox("feed_language"); + + print "
"; } print ""; @@ -824,29 +874,37 @@ class Pref_Feeds extends Handler_Protected { /* Update Interval */ + print "
"; + print_select_hash("update_interval", "", $update_intervals, 'disabled="1" dojoType="dijit.form.Select"'); $this->batch_edit_cbox("update_interval"); + print "
"; + /* Purge intl */ if (FORCE_ARTICLE_PURGE == 0) { - print "
"; + print "
"; - print __('Article purging:') . " "; + print " "; print_select_hash("purge_interval", "", $purge_intervals, 'disabled="1" dojoType="dijit.form.Select"'); $this->batch_edit_cbox("purge_interval"); + + print "
"; } print ""; print "
".__("Authentication")."
"; print "
"; + print "
"; + print "batch_edit_cbox("auth_login"); - print "
"; + print "
"; + + print ""; $this->batch_edit_cbox("auth_pass"); + print "
"; + print "
"; print "
".__("Options")."
"; print "
"; - print " "; + print "
"; + print ""; print " "; $this->batch_edit_cbox("private", "private_l"); - print "
"; + + print ""; print " "; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l"); - print "
"; + + print ""; print " "; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l"); - print "
"; + + print ""; print " "; $this->batch_edit_cbox("hide_images", "hide_images_l"); - print "
"; + + print ""; print " "; $this->batch_edit_cbox("cache_images", "cache_images_l"); - print "
"; + + print ""; print " "; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l"); + print "
"; + print "
"; print "
-