From fcef9eeae008bfb921614a55e6c3589a04ec06ec Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 28 Mar 2013 14:01:25 +0400
Subject: remove dialogNotice; tweak dialog appearance a bit

---
 classes/backend.php    | 8 ++++----
 classes/dlg.php        | 6 ++----
 classes/pref/feeds.php | 9 ++++++---
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'classes')

diff --git a/classes/backend.php b/classes/backend.php
index 7848b0714..c03d583db 100644
--- a/classes/backend.php
+++ b/classes/backend.php
@@ -29,6 +29,10 @@ class Backend extends Handler {
 			array_push($omap[$action], $sequence);
 		}
 
+		print_notice("<a target=\"_blank\" href=\"http://tt-rss.org/wiki/InterfaceTips\">".
+			__("Other interface tips are available in the Tiny Tiny RSS wiki.") .
+			"</a>");
+
 		print "<ul class='helpKbList' id='helpKbList'>";
 
 		print "<h2>" . __("Keyboard Shortcuts") . "</h2>";
@@ -79,10 +83,6 @@ class Backend extends Handler {
 		}
 
 		print "</ul>";
-
-		print "<p><a target=\"_blank\" href=\"http://tt-rss.org/wiki/InterfaceTips\">".
-			__("Other interface tips are available in the Tiny Tiny RSS wiki.") .
-			"</a></p>";
 	}
 
 	function help() {
diff --git a/classes/dlg.php b/classes/dlg.php
index 23b9c78fa..e03489505 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -557,7 +557,7 @@ class Dlg extends Handler_Protected {
 
 		$url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
 
-		print "<div class=\"dialogNotice\">" .	__("You can view this feed as RSS using the following URL:") . "</div>";
+		print "<h2>".__("You can view this feed as RSS using the following URL:")."</h2>";
 
 		print "<div class=\"tagCloudContainer\">";
 		print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
@@ -628,9 +628,7 @@ class Dlg extends Handler_Protected {
 
 		$value = str_replace("<br/>", "\n", $value);
 
-		print "<div class=\"dialogNotice\">";
-		print T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline.", "tt-rss.css");
-		print "</div>";
+		print_notice(T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline.", "tt-rss.css"));
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"setpref\">";
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index cd208335b..362d046e8 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -739,7 +739,9 @@ class Pref_Feeds extends Handler_Protected {
 
 		$feed_ids = db_escape_string($this->link, $_REQUEST["ids"]);
 
-		print "<div class=\"dialogNotice\">" . __("Enable the options you wish to apply using checkboxes on the right:") . "</div>";
+		print_notice("Enable the options you wish to apply using checkboxes on the right:");
+
+		print "<p>";
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"ids\" value=\"$feed_ids\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-feeds\">";
@@ -1520,7 +1522,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 "<div class=\"dialogNotice\">" . __("These feeds have not been updated with new content for 3 months (oldest first):") . "</div>";
+		print "<h2" .__("These feeds have not been updated with new content for 3 months (oldest first):") . "</h2>";
 
 		print "<div dojoType=\"dijit.Toolbar\">";
 		print "<div dojoType=\"dijit.form.DropDownButton\">".
@@ -1586,7 +1588,8 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function feedsWithErrors() {
-		print "<div class=\"dialogNotice\">" . __("These feeds have not been updated because of errors:") . "</div>";
+		print "<h2>" . __("These feeds have not been updated because of errors:") .
+			"</h2>";
 
 		$result = db_query($this->link, "SELECT id,title,feed_url,last_error,site_url
 		FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
-- 
cgit v1.2.3-54-g00ecf