remove dialogNotice; tweak dialog appearance a bit

diff --git a/classes/backend.php b/classes/backend.php
index 7848b071435037ad436782bdeb616b14caccc155..c03d583dba6bd355cb6f4d4b2f51c0049726f8f2 100644 (file)
--- 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 23b9c78fa6d07809df80b8e5ac009b66a00a812d..e03489505a8bab301ad8af2f73c37196d1a6e1e7 100644 (file)
--- 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 cd208335bb5be546eb64aea8caaab7ebfa4b6d73..362d046e8793fad42a900ef5343bdb112cb073b3 100644 (file)
--- 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"]);

diff --git a/include/functions.php b/include/functions.php
index dcaa67e569dcf708978b3881ed80ccde0d67fdc0..c5017cbcea892263b6114b297827659df441261d 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -2894,19 +2894,19 @@
        function format_warning($msg, $id = "") {
                global $link;
                return "<div class=\"warning\" id=\"$id\">
-                       <img src=\"images/sign_excl.svg\">$msg</div>";
+                       <img src=\"images/sign_excl.svg\"><div class='inner'>$msg</div></div>";
        }
 
        function format_notice($msg, $id = "") {
                global $link;
                return "<div class=\"notice\" id=\"$id\">
-                       <img src=\"images/sign_info.svg\">$msg</div>";
+                       <img src=\"images/sign_info.svg\"><div class='inner'>$msg</div></div>";
        }
 
        function format_error($msg, $id = "") {
                global $link;
                return "<div class=\"error\" id=\"$id\">
-                       <img src=\"images/sign_excl.svg\">$msg</div>";
+                       <img src=\"images/sign_excl.svg\"><div class='inner'>$msg</div></div>";
        }
 
        function print_notice($msg) {

diff --git a/plugins/share/init.php b/plugins/share/init.php
index a3dc3522461450b74ef255ba81063be98dad0c89..4d7e0437c5457b17bd5c523d2375918da45c1947 100644 (file)
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -46,7 +46,7 @@ class Share extends Plugin {
                                        AND owner_uid = " . $_SESSION['uid']);
                        }
 
-                       print __("You can share this article by the following unique URL:");
+                       print "<h2>". __("You can share this article by the following unique URL:") . "</h2>";
 
                        $url_path = get_self_url_prefix();
                        $url_path .= "/public.php?op=share&key=$uuid";

diff --git a/tt-rss.css b/tt-rss.css
index 4c900b08c79aa4bb1306a0251daf6ca01329f932..0affa0582463270018e0e3e1d352567f9f2d727c 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -299,11 +299,15 @@ div.filterTestHolder {
 div.notice, div.warning, div.error {
        padding : 4px 10px 4px 4px;
        display : inline-block;
-       margin : 2px 0px 2px 0px;
+       margin : 2px 0px 4px 0px;
        font-size : 12px;
        box-shadow : 0px 0px 2px #ccc;
 }
 
+div.notice div.inner, div.warning div.inner, div.error div.inner {
+       vertical-align : middle;
+}
+
 div.notice {
        background : #ecf4ff;
 }
@@ -318,6 +322,7 @@ div.error {
 
 div.warning img, div.notice img, div.error img {
        margin-right : 4px;
+       float : left;
        vertical-align : middle;
 }
 
@@ -899,6 +904,12 @@ img.feedIcon, img.tinyFeedIcon {
        border : 1px solid #c0c0c0;
 }
 
+.dijitDialog h2 {
+       margin-top : 0px;
+       margin-bottom : 4px;
+       border-width : 0px;
+}
+
 .player {
        display : inline-block;
        color : gray;
@@ -930,11 +941,6 @@ img.feedIcon, img.tinyFeedIcon {
        color : gray;
 }
 
-div.dialogNotice {
-       margin-bottom : 5px;
-       color : gray;
-}
-
 ul#filterDlg_Matches, ul#filterDlg_Actions {
        max-height : 100px;
        overflow : auto;