diff options
Diffstat (limited to 'classes/pref')
-rwxr-xr-x | classes/pref/feeds.php | 18 | ||||
-rwxr-xr-x | classes/pref/filters.php | 12 | ||||
-rw-r--r-- | classes/pref/prefs.php | 33 |
3 files changed, 37 insertions, 26 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index e0ee82fad..ab5ef7890 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1270,8 +1270,10 @@ class Pref_Feeds extends Handler_Protected { print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('OPML')."\">"; - print_notice(__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . - __("Only main settings profile can be migrated using OPML.")); + print __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . + __("Only main settings profile can be migrated using OPML."); + + print "<p/>"; print "<iframe id=\"upload_iframe\" name=\"upload_iframe\" onload=\"Helpers.OPML.onImportComplete(this)\" @@ -1290,7 +1292,7 @@ class Pref_Feeds extends Handler_Protected { print "</form>"; - print "<p/>"; + print "<hr>"; print "<form dojoType=\"dijit.form.Form\" id=\"opmlExportForm\">"; @@ -1305,11 +1307,13 @@ class Pref_Feeds extends Handler_Protected { print "</form>"; - print "<hr>"; + print "<p/>"; - print_notice(__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.')); + print "<h2>" . __("Published OPML") . "</h2>"; - print_warning("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."); + print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') . + " " . + __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>"; print "<button dojoType=\"dijit.form.Button\" onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">". __('Display published OPML URL')."</button> "; @@ -1321,7 +1325,7 @@ class Pref_Feeds extends Handler_Protected { print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Published & shared articles / Generated feeds')."\">"; - print "<p>" . __('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.') . "</p>"; + print __('Published articles can be subscribed by anyone who knows the following URL:'); $rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() . "/public.php?op=rss&id=-2&view-mode=all_articles");; diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 8fe3bbda6..ef18e8058 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -374,13 +374,13 @@ class Pref_Filters extends Handler_Protected { print_hidden("method", "editSave"); print_hidden("csrf_token", $_SESSION['csrf_token']); - print "<div class=\"dlgSec\">".__("Caption")."</div>"; + print "<div class=\"dlgSecHoriz\">".__("Caption")."</div>"; print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"$title\">"; print "</div>"; - print "<div class=\"dlgSec\">".__("Match")."</div>"; + print "<div class=\"dlgSecHoriz\">".__("Match")."</div>"; print "<div dojoType=\"dijit.Toolbar\">"; @@ -438,7 +438,7 @@ class Pref_Filters extends Handler_Protected { print "</div>"; - print "<div class=\"dlgSec\">".__("Apply actions")."</div>"; + print "<div class=\"dlgSecHoriz\">".__("Apply actions")."</div>"; print "<div dojoType=\"dijit.Toolbar\">"; @@ -863,11 +863,11 @@ class Pref_Filters extends Handler_Protected { print_hidden("method", "add"); print_hidden("csrf_token", $_SESSION['csrf_token']); - print "<div class=\"dlgSec\">".__("Caption")."</div>"; + print "<div class=\"dlgSecHoriz\">".__("Caption")."</div>"; print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"\">"; - print "<div class=\"dlgSec\">".__("Match")."</div>"; + print "<div class=\"dlgSecHoriz\">".__("Match")."</div>"; print "<div dojoType=\"dijit.Toolbar\">"; @@ -894,7 +894,7 @@ class Pref_Filters extends Handler_Protected { print "</div>"; - print "<div class=\"dlgSec\">".__("Apply actions")."</div>"; + print "<div class=\"dlgSecHoriz\">".__("Apply actions")."</div>"; print "<div dojoType=\"dijit.Toolbar\">"; diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 5a787bb0c..161b0acb6 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -351,7 +351,7 @@ class Pref_Prefs extends Handler_Protected { } else if (function_exists("imagecreatefromstring")) { - print_warning(__("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.")); + print "<p>" . __("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.") . "</p>"; print "<p>".__("Scan the following code by the Authenticator application:")."</p>"; @@ -515,7 +515,7 @@ class Pref_Prefs extends Handler_Protected { $active_section = $line["section_id"]; - print "<tr><td colspan=\"3\"><h3>".$section_name."</h3></td></tr>"; + print "<tr><td colspan=\"3\"><h2>".$section_name."</h2></td></tr>"; $lnum = 0; } @@ -681,12 +681,6 @@ class Pref_Prefs extends Handler_Protected { print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Plugins')."\">"; - print_notice(__("You will need to reload Tiny Tiny RSS for plugin changes to take effect.")); - - if (ini_get("open_basedir") && function_exists("curl_init") && !defined("NO_CURL")) { - print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly."); - } - print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">"; print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\"> @@ -709,9 +703,16 @@ class Pref_Prefs extends Handler_Protected { print_hidden("op", "pref-prefs"); print_hidden("method", "setplugins"); + print '<div dojoType="dijit.layout.BorderContainer" gutters="false">'; + print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">'; + + if (ini_get("open_basedir") && function_exists("curl_init") && !defined("NO_CURL")) { + print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly."); + } + print "<table width='100%' class='prefPluginsList'>"; - print "<tr><td colspan='5'><h3>".__("System plugins")."</h3>". + print "<tr><td colspan='5'><h2>".__("System plugins")."</h2>". format_notice(__("System plugins are enabled in <strong>config.php</strong> for all users.")). "</td></tr>"; @@ -769,7 +770,7 @@ class Pref_Prefs extends Handler_Protected { } } - print "<tr><td colspan='4'><h3>".__("User plugins")."</h3></td></tr>"; + print "<tr><td colspan='4'><h2>".__("User plugins")."</h2></td></tr>"; print "<tr class=\"title\"> <td width=\"5%\"> </td> @@ -833,12 +834,18 @@ class Pref_Prefs extends Handler_Protected { print "</table>"; - print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">". - __("Enable selected plugins")."</button></p>"; + //print "<p>" . __("You will need to reload Tiny Tiny RSS for plugin changes to take effect.") . "</p>"; - print "</form>"; + print "</div>"; #content-pane + print '<div dojoType="dijit.layout.ContentPane" region="bottom">'; + print "<button dojoType=\"dijit.form.Button\" type=\"submit\">". + __("Enable selected plugins")."</button>"; + print "</div>"; #pane print "</div>"; #pane + print "</doiv>"; #border-container + + print "</form>"; PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, "hook_prefs_tab", "prefPrefs"); |