From fcef9eeae008bfb921614a55e6c3589a04ec06ec Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 28 Mar 2013 14:01:25 +0400 Subject: [PATCH] remove dialogNotice; tweak dialog appearance a bit --- classes/backend.php | 8 ++++---- classes/dlg.php | 6 ++---- classes/pref/feeds.php | 9 ++++++--- include/functions.php | 6 +++--- plugins/share/init.php | 2 +- tt-rss.css | 18 ++++++++++++------ 6 files changed, 28 insertions(+), 21 deletions(-) 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("". + __("Other interface tips are available in the Tiny Tiny RSS wiki.") . + ""); + print ""; - - print "

". - __("Other interface tips are available in the Tiny Tiny RSS wiki.") . - "

"; } 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 "
" . __("You can view this feed as RSS using the following URL:") . "
"; + print "

".__("You can view this feed as RSS using the following URL:")."

"; print "
"; print "$url_path"; @@ -628,9 +628,7 @@ class Dlg extends Handler_Protected { $value = str_replace("
", "\n", $value); - print "
"; - print T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. This file can be used as a baseline.", "tt-rss.css"); - print "
"; + print_notice(T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. This file can be used as a baseline.", "tt-rss.css")); print ""; print ""; 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 "
" . __("Enable the options you wish to apply using checkboxes on the right:") . "
"; + print_notice("Enable the options you wish to apply using checkboxes on the right:"); + + print "

"; print ""; print ""; @@ -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 "

" . __("These feeds have not been updated with new content for 3 months (oldest first):") . "
"; + print ""; print "
"; print "
". @@ -1586,7 +1588,8 @@ class Pref_Feeds extends Handler_Protected { } function feedsWithErrors() { - print "
" . __("These feeds have not been updated because of errors:") . "
"; + print "

" . __("These feeds have not been updated because of errors:") . + "

"; $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 dcaa67e56..c5017cbce 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2894,19 +2894,19 @@ function format_warning($msg, $id = "") { global $link; return "
- $msg
"; +
$msg
"; } function format_notice($msg, $id = "") { global $link; return "
- $msg
"; +
$msg
"; } function format_error($msg, $id = "") { global $link; return "
- $msg
"; +
$msg
"; } function print_notice($msg) { diff --git a/plugins/share/init.php b/plugins/share/init.php index a3dc35224..4d7e0437c 100644 --- 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 "

". __("You can share this article by the following unique URL:") . "

"; $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 4c900b08c..0affa0582 100644 --- 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;