dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

closeflash patch, thanks Paolo, issue 1191

Browse Source
This commit is contained in:
mdipierro
2012-12-03 16:06:27 -06:00
parent b92e169b69
commit 3a05be49f6
7 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.2.1 (2012-12-03 14:41:44) stable Version 2.2.1 (2012-12-03 16:05:41) stable
applications/admin/static/css/web2py.css
+2 -2
View File
@@ -116,8 +116,8 @@ div.flash {
} }
div.flash #closeflash{color:inherit; float:right;} div.flash #closeflash{color:inherit; float:right;}
.ie-lte7 div.flash .ie-lte7 div.flash #closeflash
#closeflash{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} {color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;}
div.flash:hover { opacity:0.25; } div.flash:hover { opacity:0.25; }
applications/admin/static/js/web2py.js
+6 -2
View File
@@ -102,8 +102,12 @@ function web2py_ajax_page(method, action, data, target) {
web2py_ajax_init('#'+target); web2py_ajax_init('#'+target);
if(command) if(command)
eval(decodeURIComponent(command)); eval(decodeURIComponent(command));
if(flash) if(flash) {
jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); jQuery('.flash')
.html(decodeURIComponent(flash))
.append('<span id="closeflash">&times;</span>')
.slideDown();
}
} }
}); });
} }
applications/examples/static/css/web2py.css
+2 -2
View File
@@ -116,8 +116,8 @@ div.flash {
} }
div.flash #closeflash{color:inherit; float:right;} div.flash #closeflash{color:inherit; float:right;}
.ie-lte7 div.flash .ie-lte7 div.flash #closeflash
#closeflash{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} {color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;}
div.flash:hover { opacity:0.25; } div.flash:hover { opacity:0.25; }
applications/examples/static/js/web2py.js
+6 -2
View File
@@ -102,8 +102,12 @@ function web2py_ajax_page(method, action, data, target) {
web2py_ajax_init('#'+target); web2py_ajax_init('#'+target);
if(command) if(command)
eval(decodeURIComponent(command)); eval(decodeURIComponent(command));
if(flash) if(flash) {
jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); jQuery('.flash')
.html(decodeURIComponent(flash))
.append('<span id="closeflash">&times;</span>')
.slideDown();
}
} }
}); });
} }
applications/welcome/static/css/web2py.css
+2 -2
View File
@@ -116,8 +116,8 @@ div.flash {
} }
div.flash #closeflash{color:inherit; float:right;} div.flash #closeflash{color:inherit; float:right;}
.ie-lte7 div.flash .ie-lte7 div.flash #closeflash
#closeflash{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} {color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;}
div.flash:hover { opacity:0.25; } div.flash:hover { opacity:0.25; }
applications/welcome/static/js/web2py.js
+6 -2
View File
@@ -102,8 +102,12 @@ function web2py_ajax_page(method, action, data, target) {
web2py_ajax_init('#'+target); web2py_ajax_init('#'+target);
if(command) if(command)
eval(decodeURIComponent(command)); eval(decodeURIComponent(command));
if(flash) if(flash) {
jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); jQuery('.flash')
.html(decodeURIComponent(flash))
.append('<span id="closeflash">&times;</span>')
.slideDown();
}
} }
}); });
} }