From 11334fdf6cfa72ff78abb4434a8dcdee99c119a2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 12 May 2013 12:36:25 +0400
Subject: [PATCH] make appearance of some preference panes more similar

---
 classes/pref/feeds.php         | 25 ++++++++++++-------------
 classes/pref/prefs.php         |  4 +---
 plugins/bookmarklets/init.php  | 10 ++++++++--
 plugins/import_export/init.php |  6 ++++--
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 7d050f13..ffe7410f 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1408,9 +1408,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('OPML')."\">";
 
-		print "<p>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . " ";
-
-		print __("Only main settings profile can be migrated using OPML.") . "</p>";
+		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 "<iframe id=\"upload_iframe\"
 			name=\"upload_iframe\" onload=\"opmlImportComplete(this)\"
@@ -1453,7 +1451,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Firefox integration')."\">";
 
-			print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.') . "</p>";
+			print_notice(__('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.'));
 
 			print "<p>";
 
@@ -1470,26 +1468,30 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Published & shared articles / Generated feeds')."\">";
 
-		print "<h3>" . __("Published articles and generated feeds") . "</h3>";
-
-		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_notice(__('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.'));
 
 		$rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
 				"/public.php?op=rss&id=-2&view-mode=all_articles");;
 
+		print "<p>";
+
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('".__("View as RSS")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
 
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return clearFeedAccessKeys()\">".
 			__('Clear all generated URLs')."</button> ";
 
-		print "<h3>" . __("Articles shared by URL") . "</h3>";
+		print "</p>";
 
-		print "<p>" . __("You can disable all articles shared by unique URLs here.") . "</p>";
+		print_warning(__("You can disable all articles shared by unique URLs here."));
+
+		print "<p>";
 
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return clearArticleAccessKeys()\">".
 			__('Unshare all articles')."</button> ";
 
+		print "</p>";
+
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
 			"hook_prefs_tab_section", "prefFeedsPublishedGenerated");
 
@@ -1563,7 +1565,7 @@ class Pref_Feeds extends Handler_Protected {
 			GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url
 			ORDER BY last_article");
 
-		print "<h2" .__("These feeds have not been updated with new content for 3 months (oldest first):") . "</h2>";
+		print "<p" .__("These feeds have not been updated with new content for 3 months (oldest first):") . "</p>";
 
 		print "<div dojoType=\"dijit.Toolbar\">";
 		print "<div dojoType=\"dijit.form.DropDownButton\">".
@@ -1628,9 +1630,6 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function feedsWithErrors() {
-		print "<h2>" . __("These feeds have not been updated because of errors:") .
-			"</h2>";
-
 		$result = $this->dbh->query("SELECT id,title,feed_url,last_error,site_url
 		FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index fb679595..425d4b0a 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -366,7 +366,7 @@ class Pref_Prefs extends Handler_Protected {
 
 				} else if (function_exists("imagecreatefromstring")) {
 
-					print "<p>".__("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.") . "</p>";
+					print_warning(__("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP."));
 
 					print "<p>".__("Scan the following code by the Authenticator application:")."</p>";
 
@@ -705,8 +705,6 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Plugins')."\">";
 
-		print "<h2>".__("Plugins")."</h2>";
-
 		print "<p>" . __("You will need to reload Tiny Tiny RSS for plugin changes to take effect.") . "</p>";
 
 		print_notice(__("Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."));
diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php
index e4560555..4c4d95d4 100644
--- a/plugins/bookmarklets/init.php
+++ b/plugins/bookmarklets/init.php
@@ -19,7 +19,7 @@ class Bookmarklets extends Plugin {
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Bookmarklets')."\">";
 
-		print "<p>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</p>";
+		print_notice(__("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."));
 
 		$bm_subscribe_url = str_replace('%s', '', add_feed_url());
 
@@ -27,14 +27,20 @@ class Bookmarklets extends Plugin {
 
 		$bm_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+window.location.href}");
 
+		print "<p>";
 		print "<a href=\"$bm_url\" class='bookmarklet'>" . __('Subscribe in Tiny Tiny RSS'). "</a>";
+		print "</p>";
 
-		print "<p>" . __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") . "</p>";
+		print_notice(__("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"));
+
+		print "<p>";
 
 		$bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".SELF_URL_PATH."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
 
 		print "<a href=\"$bm_url\" class='bookmarklet'>" . __('Share with Tiny Tiny RSS'). "</a>";
 
+		print "</p>";
+
 		print "</div>"; #pane
 
 	 }
diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php
index 15c7dea9..d4bdec82 100644
--- a/plugins/import_export/init.php
+++ b/plugins/import_export/init.php
@@ -57,9 +57,9 @@ class Import_Export extends Plugin implements IHandler {
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Import and export')."\">";
 
-		print "<h3>" . __("Article archive") . "</h3>";
+		print_notice(__("You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."));
 
-		print "<p>" . __("You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances.") . "</p>";
+		print "<p>";
 
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return exportData()\">".
 			__('Export my data')."</button> ";
@@ -82,6 +82,8 @@ class Import_Export extends Plugin implements IHandler {
 
 		print "</form>";
 
+		print "</p>";
+
 		print "</div>"; # pane
 	}
 
-- 
2.39.2