diff --git a/VERSION b/VERSION index b9dec6b5..27a95d3e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.2.1 (2012-12-03 14:41:44) stable +Version 2.2.1 (2012-12-03 16:05:41) stable diff --git a/applications/admin/static/css/web2py.css b/applications/admin/static/css/web2py.css index 947648ad..a09407fe 100644 --- a/applications/admin/static/css/web2py.css +++ b/applications/admin/static/css/web2py.css @@ -116,8 +116,8 @@ div.flash { } div.flash #closeflash{color:inherit; float:right;} -.ie-lte7 div.flash -#closeflash{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} +.ie-lte7 div.flash #closeflash +{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} div.flash:hover { opacity:0.25; } diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js index 8824a79e..2f87a801 100644 --- a/applications/admin/static/js/web2py.js +++ b/applications/admin/static/js/web2py.js @@ -102,8 +102,12 @@ function web2py_ajax_page(method, action, data, target) { web2py_ajax_init('#'+target); if(command) eval(decodeURIComponent(command)); - if(flash) - jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); + if(flash) { + jQuery('.flash') + .html(decodeURIComponent(flash)) + .append('×') + .slideDown(); + } } }); } diff --git a/applications/examples/static/css/web2py.css b/applications/examples/static/css/web2py.css index 947648ad..a09407fe 100644 --- a/applications/examples/static/css/web2py.css +++ b/applications/examples/static/css/web2py.css @@ -116,8 +116,8 @@ div.flash { } div.flash #closeflash{color:inherit; float:right;} -.ie-lte7 div.flash -#closeflash{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} +.ie-lte7 div.flash #closeflash +{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} div.flash:hover { opacity:0.25; } diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js index 8824a79e..2f87a801 100644 --- a/applications/examples/static/js/web2py.js +++ b/applications/examples/static/js/web2py.js @@ -102,8 +102,12 @@ function web2py_ajax_page(method, action, data, target) { web2py_ajax_init('#'+target); if(command) eval(decodeURIComponent(command)); - if(flash) - jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); + if(flash) { + jQuery('.flash') + .html(decodeURIComponent(flash)) + .append('×') + .slideDown(); + } } }); } diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index 947648ad..a09407fe 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -116,8 +116,8 @@ div.flash { } div.flash #closeflash{color:inherit; float:right;} -.ie-lte7 div.flash -#closeflash{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} +.ie-lte7 div.flash #closeflash +{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;} div.flash:hover { opacity:0.25; } diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js index 8824a79e..2f87a801 100644 --- a/applications/welcome/static/js/web2py.js +++ b/applications/welcome/static/js/web2py.js @@ -102,8 +102,12 @@ function web2py_ajax_page(method, action, data, target) { web2py_ajax_init('#'+target); if(command) eval(decodeURIComponent(command)); - if(flash) - jQuery('.flash').html(decodeURIComponent(flash)).slideDown(); + if(flash) { + jQuery('.flash') + .html(decodeURIComponent(flash)) + .append('×') + .slideDown(); + } } }); }