diff --git a/extensions/webmail/main.py b/extensions/webmail/main.py index d6c97efac..0460c1e14 100644 --- a/extensions/webmail/main.py +++ b/extensions/webmail/main.py @@ -202,8 +202,9 @@ def mark(request, name): @login_required def empty(request, name): - mbc = IMAPconnector(request) - mbc.empty(name) + if name == "Trash": + mbc = IMAPconnector(request) + mbc.empty(name) return folder(request, name, False) @login_required diff --git a/extensions/webmail/templates/index.html b/extensions/webmail/templates/index.html index a15dd4eaf..33ef12db3 100644 --- a/extensions/webmail/templates/index.html +++ b/extensions/webmail/templates/index.html @@ -25,6 +25,7 @@ thead tr { position: relative; top: expression(offsetParent.scrollTop); /*IE5+ only*/ z-index: 1; + padding: 0; } table#emails > tbody { @@ -43,6 +44,12 @@ table#emails > tbody { #emails tr { width: 100%; + position: relative; + border-bottom: 1px solid #C8D6E8; +} + +tr.selected { + background: #ffffcc; } .box h3 { @@ -102,15 +109,6 @@ th.selected { background: #6AB0C5; } -tr { - position: relative; - border-bottom: 1px solid #C8D6E8; -} - -tr.selected { - background: #ffffcc; -} - ul.hidden { display: none; } diff --git a/static/js/common.js b/static/js/common.js index cc9e17566..7018ca02f 100644 --- a/static/js/common.js +++ b/static/js/common.js @@ -170,7 +170,7 @@ function HashWrapper(deflocation) { parse_menubar = function(id) { if ($(id)) { - var first = true; + //var first = true; $(id).getElements('li.dropdown').each(function(elem){ var list = elem.getElement('ul.links'); @@ -192,11 +192,11 @@ parse_menubar = function(id) { myFx.slideOut(); } }); - if (!first) { + /*if (!first) { elem.setStyle("margin-left", "10em"); } else { first = false; - } + }*/ }); SqueezeBox.assign($$('a.boxed'), { parse: 'rel', @@ -316,5 +316,5 @@ searchbox_init = function() { $("searchfield").set("value", "Search..."); } }); - $("searchbox").setStyle("float", "right"); + $("searchbox").setStyle("float", "left"); } \ No newline at end of file diff --git a/static/stylesheets/default.css b/static/stylesheets/default.css index 61e1b46e2..56a4b68f0 100644 --- a/static/stylesheets/default.css +++ b/static/stylesheets/default.css @@ -192,10 +192,11 @@ div.right { } .dropdown { - position: absolute; - clear: both; + /*position: absolute;*/ + position: relative; + /*clear: both;*/ z-index: 2; - width: 250px; + /*width: 250px;*/ } .dropdown li { diff --git a/static/stylesheets/searchbar.css b/static/stylesheets/searchbar.css index c3e3dc2cb..c9a87f6d7 100644 --- a/static/stylesheets/searchbar.css +++ b/static/stylesheets/searchbar.css @@ -1,9 +1,8 @@ #searchbox { - /*float: left;*/ /* Marche pas ici?! obligé de le faire en JS sous FF */ - margin-right: 10px; - z-index: 2; - position: relative; - margin-left: 10px; + margin-right: 10px; + /*margin-left: 10px;*/ + z-index: 2; + position: relative; } #searchbox img { diff --git a/templates/common/table_head.html b/templates/common/table_head.html index 7599d54cf..caa989f03 100644 --- a/templates/common/table_head.html +++ b/templates/common/table_head.html @@ -7,7 +7,7 @@