From 95437e9e0756edacb835843074c12632c11a64b1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 10:50:46 +0400 Subject: [PATCH] tweak notify layout/display --- index.php | 2 +- js/functions.js | 44 ++++++++++++++------------------------------ prefs.php | 2 +- tt-rss.css | 27 +++++++++++++++++---------- 4 files changed, 33 insertions(+), 42 deletions(-) diff --git a/index.php b/index.php index 2fa85663..066b25fa 100644 --- a/index.php +++ b/index.php @@ -138,7 +138,7 @@ -

diff --git a/js/functions.js b/js/functions.js index 9336433c..e0276750 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1,8 +1,8 @@ -var notify_silent = false; var loading_progress = 0; var sanity_check_done = false; var init_params = {}; var _label_base_index = -1024; +var notify_hide_timerid = false; Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap( function (callOriginal, options) { @@ -147,42 +147,28 @@ function param_unescape(arg) { return unescape(arg); } -var notify_hide_timerid = false; function hide_notify() { - var n = $("notify"); - if (n) { - n.style.display = "none"; - } -} - -function notify_silent_next() { - notify_silent = true; + Element.hide('notify'); } function notify_real(msg, no_hide, n_type) { - if (notify_silent) { - notify_silent = false; - return; - } - var n = $("notify"); - var nb = $("notify_body"); - if (!n || !nb) return; + if (!n) return; if (notify_hide_timerid) { window.clearTimeout(notify_hide_timerid); } if (msg == "") { - if (n.style.display == "block") { + if (Element.visible(n)) { notify_hide_timerid = window.setTimeout("hide_notify()", 0); } return; } else { - n.style.display = "block"; + Element.show(n); } /* types: @@ -194,33 +180,31 @@ function notify_real(msg, no_hide, n_type) { */ - msg = __(msg); + msg = " " + __(msg) + ""; if (n_type == 1) { n.className = "notify"; } else if (n_type == 2) { n.className = "notify progress"; - msg = "

" + msg; + msg = "

" + msg; + no_hide = true; } else if (n_type == 3) { n.className = "notify error"; - msg = "

" + msg; + msg = "

" + msg; } else if (n_type == 4) { n.className = "notify info"; - msg = "

" + msg; - } - - if (no_hide) { - msg += " (" + - __("close") + ")"; + msg = "

" + msg; } + msg += " $\""$ "; // msg = "

" + msg; - nb.innerHTML = msg; + n.innerHTML = msg; if (!no_hide) { - notify_hide_timerid = window.setTimeout("hide_notify()", 3000); + notify_hide_timerid = window.setTimeout("hide_notify()", 5*1000); } } diff --git a/prefs.php b/prefs.php index a047931c..e3b62da7 100644 --- a/prefs.php +++ b/prefs.php @@ -93,7 +93,7 @@ -

diff --git a/tt-rss.css b/tt-rss.css index d2e854d8..8e87d659 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -132,14 +132,12 @@ a:hover { } #notify { - top : 25px; + bottom : 10px; right : 10px; border-width : 1px; border-style : solid; position : absolute; - display : none; - float : right; - font-size : 11px; + font-size : 12px; z-index : 99; padding : 5px; min-width : 200px; @@ -148,7 +146,21 @@ a:hover { #notify img { vertical-align : middle; - margin-right : 4px; + max-height : 14px; +} + +#notify span.msg { + width : 100%; +} + +#notify span.close { + text-align : right; +} + +#notify span { + display : table-cell; + vertical-align : middle; + padding : 4px; } .notify { @@ -171,11 +183,6 @@ a:hover { border-color : #ff0000; } -.notify.error span:hover { - color : red; - cursor : pointer; -} - .hl.Unread div.hlTitle { font-weight : bold; } -- 2.39.5