valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notify fixes

This commit is contained in:
Andrew Dolgov 2014-11-09 20:31:29 +03:00
parent c92af7f57f
commit 0d41fd76d3
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/tt-rss.css
View File

@ -148,11 +148,6 @@ a:hover {
-webkit-transform: translate(0, -35px); -webkit-transform: translate(0, -35px);
-o-transform: translate(0, -35px); -o-transform: translate(0, -35px);
-moz-transform: translate(0, -35px); -moz-transform: translate(0, -35px);
transition: all 0.5s ease-in-out;
-webkit-transition: all 0.5s ease-in-out;
-moz-transition: all 0.5s ease-in-out;
-o-transition: all 0.5s ease-in-out;
} }
#notify { #notify {
@ -167,6 +162,11 @@ a:hover {
z-index : 99; z-index : 99;
padding : 5px; padding : 5px;
box-shadow : 0px -2px 2px rgba(0,0,0,0.1); box-shadow : 0px -2px 2px rgba(0,0,0,0.1);
transition: all 0.5s ease-in-out;
-webkit-transition: all 0.5s ease-in-out;
-moz-transition: all 0.5s ease-in-out;
-o-transition: all 0.5s ease-in-out;
} }
#notify img { #notify img {

23
js/functions.js
View File

@ -212,30 +212,39 @@ function notify_real(msg, no_hide, n_type) {
msg = "<span class=\"msg\"> " + __(msg) + "</span>"; msg = "<span class=\"msg\"> " + __(msg) + "</span>";
if (n_type == 2) { if (n_type == 2) {
n.className = "notify notify_progress visible";
msg = "<span><img src='images/indicator_white.gif'></span>" + msg; msg = "<span><img src='images/indicator_white.gif'></span>" + msg;
no_hide = true; no_hide = true;
} else if (n_type == 3) { } else if (n_type == 3) {
n.className = "notify notify_error visible";
msg = "<span><img src='images/alert.png'></span>" + msg; msg = "<span><img src='images/alert.png'></span>" + msg;
} else if (n_type == 4) { } else if (n_type == 4) {
n.className = "notify notify_info visible";
msg = "<span><img src='images/information.png'></span>" + msg; msg = "<span><img src='images/information.png'></span>" + msg;
} else {
n.className = "notify visible";
} }
msg += " <span><img src=\"images/cross.png\" class=\"close\" title=\"" + msg += " <span><img src=\"images/cross.png\" class=\"close\" title=\"" +
__("Click to close") + "\" onclick=\"notify('')\"></span>"; __("Click to close") + "\" onclick=\"notify('')\"></span>";
// msg = "<img src='images/live_com_loading.gif'> " + msg;
n.innerHTML = msg; n.innerHTML = msg;
window.setTimeout(function() {
// goddamnit firefox
if (n_type == 2) {
n.className = "notify notify_progress visible";
} else if (n_type == 3) {
n.className = "notify notify_error visible";
msg = "<span><img src='images/alert.png'></span>" + msg;
} else if (n_type == 4) {
n.className = "notify notify_info visible";
} else {
n.className = "notify visible";
}
if (!no_hide) { if (!no_hide) {
notify_hide_timerid = window.setTimeout(function() { notify_hide_timerid = window.setTimeout(function() {
n.removeClassName("visible") }, 5*1000); n.removeClassName("visible") }, 5*1000);
} }
}, 10);
} }
function notify(msg, no_hide) { function notify(msg, no_hide) {