From bba6b55c100d6a8e807b2721df74f4307c783624 Mon Sep 17 00:00:00 2001
From: tonio <devnull@localhost>
Date: Fri, 28 May 2010 14:19:59 +0200
Subject: [PATCH] Bugfixes #54 : I think this is now acceptable...

---
 extensions/amavis_quarantine/main.py      |  2 +-
 extensions/webmail/main.py                |  2 +-
 extensions/webmail/templates/folders.html |  1 +
 extensions/webmail/templates/index.html   | 62 ++++++++++++-----------
 static/stylesheets/default.css            |  1 +
 5 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/extensions/amavis_quarantine/main.py b/extensions/amavis_quarantine/main.py
index 9028ada12..f5b734a6b 100644
--- a/extensions/amavis_quarantine/main.py
+++ b/extensions/amavis_quarantine/main.py
@@ -44,7 +44,7 @@ def menu(**kwargs):
         return [
             {"name" : "quarantine",
              "label" : _("Quarantine"),
-             "url" : reverse(views.index, urlconf='mailng.extensions.amavis_quarantine.exturls'),
+             "url" : reverse(views.index),
              "img" : "/static/pics/quarantine.png"}
             ]
     return []
diff --git a/extensions/webmail/main.py b/extensions/webmail/main.py
index d57eb6e74..c98835d9c 100644
--- a/extensions/webmail/main.py
+++ b/extensions/webmail/main.py
@@ -46,7 +46,7 @@ def menu(**kwargs):
     return [
         {"name" : "webmail",
          "label" : _("Webmail"),
-         "url" : reverse(views.index, urlconf='mailng.urls'),
+         "url" : reverse(views.index),
          "img" : "/static/pics/webmail.png"}
         ]
 
diff --git a/extensions/webmail/templates/folders.html b/extensions/webmail/templates/folders.html
index ed79abce3..844bb8299 100644
--- a/extensions/webmail/templates/folders.html
+++ b/extensions/webmail/templates/folders.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load webextras %}
 <h3>{% trans "Folders" %}</h3>
 <ul>
   {% print_folders folders %}
diff --git a/extensions/webmail/templates/index.html b/extensions/webmail/templates/index.html
index fd5c8fa1e..1021ca568 100644
--- a/extensions/webmail/templates/index.html
+++ b/extensions/webmail/templates/index.html
@@ -20,14 +20,14 @@ html > body #listing {
   width: 150px;
 }
 
-thead tr {
+/*thead tr {
   position: relative;
   top: expression(offsetParent.scrollTop); /*IE5+ only*/
   z-index: 1;
   padding: 0;
-}
+}*/
 
-table#emails > tbody {
+/*table#emails > tbody {
   position: fixed;
   bottom: 35px;
   top: 155px;
@@ -35,15 +35,15 @@ table#emails > tbody {
   right: 0px;
   overflow-x: hidden;
   overflow-y: auto;
-}
+}*/
 
 #emails th {
-  /*text-align: center;*/
+  position: relative;
 }
 
 #emails tr {
   width: 100%;
-  position: relative;
+  /*position: relative;*/
   border-bottom: 1px solid #C8D6E8;
 }
 
@@ -254,35 +254,16 @@ ul.visible {
       if (!tr.hasClass("selected")) {
         tr.addClass("selected");
         selectedRows.include(tr);
+        tr.setStyle("position", "relative");
+        makeRowDraggable(tr);
       } else {
         tr.removeClass("selected");
         selectedRows.erase(tr);
+        tr.setStyle("position", "static");
       }
     });
 
-    buildmarkrequest = function(evt) {
-      evt.stop();
-      if (!selectedRows.length) {
-        return;
-      }
-      var ids = new Array();
-      selectedRows.each(function(item, index) {
-        ids.include(item.get("id"));
-      });
-      new Request.JSON({url : evt.target.get("href"), 
-                        onSuccess : get_callback("folder")}).get({ids : ids.join()});
-    }
-    $$("a[name=mark-read]").addEvent("click", buildmarkrequest);
-    $$("a[name=mark-unread]").addEvent("click", buildmarkrequest);
-
-    $$("a[name=fdaction]").addEvent("click", function(evt) {
-      evt.stop();
-      new Request.JSON({url : evt.target.get("href"), 
-                        onSuccess : get_callback("folder")
-      }).get();
-    });
-
-    $$("tbody>tr").each(function(item) {
+    makeRowDraggable = function(item) {
       new Drag.Move(item, {
         droppables: ".droppable",
       }).addEvents({
@@ -335,7 +316,30 @@ ul.visible {
           ).get({msgset : msgset.join(), to : dest});
         },
       });
+    };
+
+    buildmarkrequest = function(evt) {
+      evt.stop();
+      if (!selectedRows.length) {
+        return;
+      }
+      var ids = new Array();
+      selectedRows.each(function(item, index) {
+        ids.include(item.get("id"));
+      });
+      new Request.JSON({url : evt.target.get("href"), 
+                        onSuccess : get_callback("folder")}).get({ids : ids.join()});
+    }
+    $$("a[name=mark-read]").addEvent("click", buildmarkrequest);
+    $$("a[name=mark-unread]").addEvent("click", buildmarkrequest);
+
+    $$("a[name=fdaction]").addEvent("click", function(evt) {
+      evt.stop();
+      new Request.JSON({url : evt.target.get("href"), 
+                        onSuccess : get_callback("folder")
+      }).get();
     });
+
     if ($("toggleselect")) {
     $("toggleselect").addEvent("click", function(evt) {
        var checked = evt.target.get("checked");
diff --git a/static/stylesheets/default.css b/static/stylesheets/default.css
index 38ffb9c70..864732844 100644
--- a/static/stylesheets/default.css
+++ b/static/stylesheets/default.css
@@ -216,6 +216,7 @@ div.right {
     float: left;
     position: relative;
     z-index: 4;
+    font-size: small;
 }
 
 .dropdown ul li {