From a453c09e02adbfb702df51e113d3538b5ac83431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Solard?= <mael.solard@laposte.net>
Date: Tue, 19 Aug 2014 22:39:03 +0200
Subject: [PATCH] Align buttons list with the contain in webmail pages

---
 .../webmail/static/webmail/css/webmail.css         | 14 +++++++++-----
 .../webmail/templatetags/webmail_tags.py           | 11 ++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/modoboa/extensions/webmail/static/webmail/css/webmail.css b/modoboa/extensions/webmail/static/webmail/css/webmail.css
index c25bf4b9c..5a13a2183 100644
--- a/modoboa/extensions/webmail/static/webmail/css/webmail.css
+++ b/modoboa/extensions/webmail/static/webmail/css/webmail.css
@@ -204,11 +204,6 @@ li.droppable li{
     padding-bottom: 5px;
 }
 
-#mailheader input {
-    width: 99%;
-    padding: 2px 0;
-}
-
 #mailheader textarea {
     width: 99%;
     height: 40px;
@@ -329,6 +324,15 @@ td[class*=openable] {
     margin-left:5px;
 }
 
+#menubar .sm-margin-left-back{
+    margin-left: 6px;
+}
+
+#menubar .md-margin-left-back{
+    margin-left: 16px;
+}
+
+
 /*
  *send mail
  */
diff --git a/modoboa/extensions/webmail/templatetags/webmail_tags.py b/modoboa/extensions/webmail/templatetags/webmail_tags.py
index 12ba022ab..1e4565975 100644
--- a/modoboa/extensions/webmail/templatetags/webmail_tags.py
+++ b/modoboa/extensions/webmail/templatetags/webmail_tags.py
@@ -17,7 +17,7 @@ def viewmail_menu(selection, folder, user, mail_id=None):
         {"name": "back",
              "url": "javascript:history.go(-2);",
              "img": "glyphicon glyphicon-arrow-left",
-             "class": "btn-primary",
+             "class": "btn-primary sm-margin-left-back",
              "label": _("Back")},
         {"name": "reply",
          "url": "action=reply&mbox=%s&mailid=%s" % (folder, mail_id),
@@ -53,13 +53,6 @@ def viewmail_menu(selection, folder, user, mail_id=None):
                             {"selection": selection, "entries": entries,
                              "user": user, "extraclasses": "pull-left"})
 
-    entries = [{"name": "close",
-                "title": _("Close this message"),
-                "img": "glyphicon glyphicon-remove"}]
-    menu += render_to_string(
-        'common/buttons_list.html',
-        {"entries": entries, "extraclasses": "pull-right"}
-    )
     return menu
 
 
@@ -69,7 +62,7 @@ def compose_menu(selection, backurl, user):
         {"name": "back",
          "url": "javascript:history.go(-2);",
          "img": "glyphicon glyphicon-arrow-left",
-         "class": "btn-primary",
+         "class": "btn-primary md-margin-left-back",
          "label": _("Back")},
         {"name": "sendmail",
          "url": "",