From ca6a0741b4819207e19d1afca02044db9885b94d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 14 Jun 2012 21:23:09 +0400
Subject: [PATCH] tweak dialog topmost notices; add an explanation for the
 batch feed editor

---
 classes/dlg.php        | 8 +++++---
 classes/pref_feeds.php | 2 ++
 tt-rss.css             | 5 +++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/classes/dlg.php b/classes/dlg.php
index 345e0c3ef..0a5412fb5 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -590,7 +590,7 @@ class Dlg extends Protected_Handler {
 			GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url
 			ORDER BY last_article");
 
-		print __("These feeds have not been updated with new content for 3 months (oldest first):");
+		print "<div class=\"dialogNotice\">" . __("These feeds have not been updated with new content for 3 months (oldest first):") . "</div>";
 
 		print "<div dojoType=\"dijit.Toolbar\">";
 		print "<div dojoType=\"dijit.form.DropDownButton\">".
@@ -656,7 +656,7 @@ class Dlg extends Protected_Handler {
 	}
 
 	function feedsWithErrors() {
-		print __("These feeds have not been updated because of errors:");
+		print "<div class=\"dialogNotice\">" . __("These feeds have not been updated because of errors:") . "</div>";
 
 		$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"]);
@@ -871,7 +871,7 @@ class Dlg extends Protected_Handler {
 
 		$url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
 
-		print __("You can view this feed as RSS using the following URL:");
+		print "<div class=\"dialogNotice\">" .	__("You can view this feed as RSS using the following URL:") . "</div>";
 
 		print "<div class=\"tagCloudContainer\">";
 		print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
@@ -924,7 +924,9 @@ class Dlg extends Protected_Handler {
 
 		$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 "<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 257c1f9c3..6c34c2712 100644
--- a/classes/pref_feeds.php
+++ b/classes/pref_feeds.php
@@ -544,6 +544,8 @@ class Pref_Feeds extends Protected_Handler {
 
 		$feed_ids = db_escape_string($_REQUEST["ids"]);
 
+		print "<div class=\"dialogNotice\">" . __("Enable the options you wish to apply using checkboxes on the right:") . "</div>";
+
 		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\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"batchEditSave\">";
diff --git a/tt-rss.css b/tt-rss.css
index f87ef7cfe..ff48914c0 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1411,3 +1411,8 @@ a.bookmarklet {
 td.error { 
 	color : red;
 }
+
+div.dialogNotice {
+	margin-bottom : 5px;
+	color : gray;
+}