From f1f5801031a08195ada8992c9d6079033b02fea3 Mon Sep 17 00:00:00 2001
From: tonio <tonio@ngyn.org>
Date: Thu, 6 Jan 2011 22:07:15 +0100
Subject: [PATCH] * Documentation update * see #38 : reverted work from
 [49b589f08988] * Style update for permissions

---
 INSTALL                                       |  20 +++++++
 extensions/webmail/static/css/webmail.css     |  53 ------------------
 .../webmail/templates/webmail/compose.html    |  10 ----
 .../webmail/templates/webmail/index.html      |  22 --------
 extensions/webmail/views.py                   |  10 ++--
 static/css/default.css                        |  10 ++++
 static/pics/attachment.png                    | Bin 912 -> 0 bytes
 templates/common/parameters.html              |   2 +-
 8 files changed, 36 insertions(+), 91 deletions(-)
 delete mode 100644 static/pics/attachment.png

diff --git a/INSTALL b/INSTALL
index 141de3d76..d50845c98 100644
--- a/INSTALL
+++ b/INSTALL
@@ -117,6 +117,8 @@ existing database.**
 
 #. Update SQL queries used in your environnement (see :ref:`postfix-label` or :ref:`dovecot-label`).
 
+#. Update *postfix* configuration so that he can handle domain aliases (see :ref:`postfix-label`).
+
 
 0.8.2: ckeditor integration and more
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -214,6 +216,14 @@ First, define the following map files on your server (it should work with
   hosts = 127.0.0.1
   query = SELECT name FROM admin_domain WHERE name='%s' AND enabled='1'
 
+``/etc/postfix/sql-domain-aliases.cf``::
+
+  user = <user>
+  password = <password>
+  dbname = <database>
+  hosts = 127.0.0.1
+  query = SELECT t2.name FROM admin_domainalias AS t1, admin_domain AS t2 WHERE t1.target_id=t2.id AND t1.enabled=1 AND t2.enabled=1 AND t1.name='%s'
+
 ``/etc/postfix/sql-mailboxes.cf``::
 
   user = <user>
@@ -230,6 +240,14 @@ First, define the following map files on your server (it should work with
   hosts = 127.0.0.1
   query = SELECT concat(t3.address, '@', t4.name) FROM admin_alias AS t1, admin_alias_mboxes AS t2, admin_mailbox AS t3, admin_domain AS t4 WHERE t1.enabled='1' AND t1.address='%u' AND t1.id=t2.alias_id AND t2.mailbox_id=t3.id AND t3.domain_id=t4.id AND t4.name='%d'
 
+``/etc/postfix/sql-domain-aliases-mailboxes.cf``::
+
+  user = <user>
+  password = <password>
+  dbname = <database>
+  hosts = 127.0.0.1
+  query = SELECT concat(t2.address, '@', t3.name) FROM admin_domainaliases AS t1, admin_mailbox AS t2, admin_domain AS t3 WHERE t1.target_id=t2.domain_id AND t2.domain_id=t3.id AND t2.enabled=1 AND t1.name='%d' AND t2.address='%u'
+
 Then, use the following configuration in the */etc/postfix/main.cf* file
 (this is just one possible configuration)::
 
@@ -244,7 +262,9 @@ Then, use the following configuration in the */etc/postfix/main.cf* file
 
   relay_domains = 
   virtual_mailbox_domains = mysql:/etc/postfix/sql-domains.cf
+  virtual_alias_domains = mysql:/etc/postfix/sql-domain-aliases.cf
   virtual_mailbox_maps = mysql:/etc/postfix/sql-mailboxes.cf
+    mysql:/etc/postfix/sql-domain-aliases-mailboxes.cf
   virtual_alias_maps = mysql:/etc/postfix/sql-aliases.cf
   # Stuff after
 
diff --git a/extensions/webmail/static/css/webmail.css b/extensions/webmail/static/css/webmail.css
index d32643284..b87973c89 100644
--- a/extensions/webmail/static/css/webmail.css
+++ b/extensions/webmail/static/css/webmail.css
@@ -179,60 +179,7 @@ textarea:hover {
 }
 
 #mailheader {
-    width: 70%;
     padding-bottom: 5px;
-    float: left;
-}
-
-#attachments {
-    width: 29%;
-    float: left;
-}
-
-#attachments h3 {
-    float: left;
-    font-size: 1em;
-    margin: 0;
-    margin-right: 10px;
-}
-
-#attachments img {
-    float: left;
-    margin-right: 5px;
-}
-
-#attachments a:link, a:visited {
-    background: transparent;
-    color: black;
-    text-decoration: none;
-}
-
-#finput_container {
-    display: block; 
-    width: 100px; 
-    height: 20px; 
-    overflow: hidden
-}
-
-#upload_input {
-    font-size: 50px; 
-    width: 120px; 
-    opacity: 0; 
-    filter: alpha(opacity: 0);
-    position: relative; 
-    top: -40px;
-    left: -20px;
-}
-
-#attachments ul {
-    list-style: none;
-    padding: 5px 5px;
-    margin: 0;
-}
-
-#attachments li {
-    margin-bottom: 4px;
-    padding-left: 10px;
 }
 
 /* Progress bar */
diff --git a/extensions/webmail/templates/webmail/compose.html b/extensions/webmail/templates/webmail/compose.html
index 8ec2d79bc..b2988713d 100644
--- a/extensions/webmail/templates/webmail/compose.html
+++ b/extensions/webmail/templates/webmail/compose.html
@@ -4,16 +4,6 @@
     <div id="mailheader">
       {% include "common/genericform.html" %}
     </div>
-    <div id="attachments">
-      <h3><img src="{{ MEDIA_URL }}pics/attachment.png" /> {% trans "Attachments" %}</h3>
-      <div id="finput_container">
-        <a href="javascript: void(0)"><img src="{{ MEDIA_URL }}pics/add.png" />
-        {% trans "Add" %}</a>
-        <input type="file" id="upload_input" name="upload" />
-      </div>
-      <ul id="files2upload">
-      </ul>
-    </div>
     <div class="spacer"></div>
     {% if body %}
     <textarea id="id_body" name="id_body" class="editor">{% if bodyheader %}{{ bodyheader }}{% endif %}
diff --git a/extensions/webmail/templates/webmail/index.html b/extensions/webmail/templates/webmail/index.html
index 44e4354e8..08e07a62a 100644
--- a/extensions/webmail/templates/webmail/index.html
+++ b/extensions/webmail/templates/webmail/index.html
@@ -130,28 +130,6 @@
       }
       $("composemail").send();
     });
-
-    var files2upload = new Array();
-
-    delete_attachment = function(evt) {
-      var litag = evt.target.getParents("li");
-      var attachment = litag.get("text");
-
-      files2upload.erase(attachment);
-      litag.destroy();
-    };
-
-    $("upload_input").addEvent("change", function(evt) {
-      var atag = new Element("a").set("name", "delete_attachment");
-      var imgtag = new Element("img").set("src", "{{ MEDIA_URL }}pics/remove.png");
-      var litag = new Element("li").set("text", evt.target.value);
-
-      files2upload.include(evt.target.value);
-      imgtag.inject(atag);
-      atag.inject(litag);
-      litag.inject($("files2upload"));
-      atag.addEvent("click", delete_attachment);
-    });
   };
 
   loadCompose = function(event) {
diff --git a/extensions/webmail/views.py b/extensions/webmail/views.py
index 2c652a7cb..bc1b0d7bd 100644
--- a/extensions/webmail/views.py
+++ b/extensions/webmail/views.py
@@ -55,11 +55,11 @@ def __render_common_components(request, folder, lst=None, content=None, menu=Non
     if page:
         navbar = EmailListing.render_navbar(page)
         if lst:
-            listing = lst.fetch(request, page.id_start, page.id_stop)
+            content = lst.fetch(request, page.id_start, page.id_stop)
     else:
         navbar = ""
         if lst:
-            listing = "<div class='info'>%s</div>" \
+            content = "<div class='info'>%s</div>" \
                 % _("This folder contains no messages")
         
     ret = {
@@ -68,7 +68,7 @@ def __render_common_components(request, folder, lst=None, content=None, menu=Non
                 "folders" : mbc.getfolders(request.user)
                 }),
         "menu" : menu,
-        "listing" : listing,
+        "listing" : content,
         "navbar" : navbar,
         "quota" : ImapListing.computequota(mbc)
         }
@@ -149,7 +149,7 @@ def viewmail(request, folder, mail_id=None):
     mbc = IMAPconnector(user=request.user.username, 
                         password=request.session["password"])
     ctx = getctx("ok", **__render_common_components(request, folder, 
-                                                    menu=menu, listing=content))
+                                                    menu=menu, content=content))
     return HttpResponse(simplejson.dumps(ctx), mimetype="application/json")
 
 @login_required
@@ -276,7 +276,7 @@ def render_compose(request, form, posturl, email=None, insert_signature=False):
                         password=request.session["password"])
     ctx = getctx("ok", level=2, editor=editor, 
                  **__render_common_components(request, request.session["folder"], 
-                                              menu=menu, listing=content))
+                                              menu=menu, content=content))
     return HttpResponse(simplejson.dumps(ctx), mimetype="application/json")
 
 def __html2plaintext(content):
diff --git a/static/css/default.css b/static/css/default.css
index 40ca79bf6..49cdc5178 100644
--- a/static/css/default.css
+++ b/static/css/default.css
@@ -130,6 +130,7 @@ div#footer {
     width: 300px;
 }
 
+
 .uibar {
     background: #153F65;
     padding: 0;
@@ -444,3 +445,12 @@ div.row label {
     width: 90px;
     margin: 2px;
 }
+
+/* Permission tables */
+#accordion {
+    margin: 5px;
+}
+
+.element {
+    margin: 10px 5px 10px 5px;
+}
\ No newline at end of file
diff --git a/static/pics/attachment.png b/static/pics/attachment.png
deleted file mode 100644
index c3029297d2925780b45008ce502939d5b61bea4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FZT01FZU(%pXi00007bV*G`2igiB
z3JV3JvSJee00R(7L_t(I%XN}nY*bYgh1WTAZ#y$BN*jGK)bLPrfCd64K)^5oeSowH
zBrQz~O!>89d}|^GB^Z4H5-`COt!<?gglRidDE$%8QlQ~SG&PEe#E_au4Apcx!o<#<
zbI&<@^8ks6bSL|5uWzknFEMiSC$OfHa457R7z!@XzP>v-IoXuHpB{OA#Y(<*^;;}m
zwggj+RN352A@H@3BI<eGFf#=m*BJ~4!|z|acq6cM*%DkHzA`m{jBW5dZ|sZqBhk5Y
zX77tcUf!6=WY!Q-oeh}1!`Huaqsw2#g$oy-3UIX1ix_A*uy?-&fWg6`QrC4$b6&2E
zn5x;+bnAzkyJjz($4^b*`#S9_KLP-KeFJ3$1qDNn<J1R(!3Jw7tBr~MKK|DS0MI{h
z_WuB5%;(0KSpUG;SwhP4iFEqcR~9Z<Jf2FeQaM#(jJa*C-PPCs)$WS&)c}A*vgcpG
z*hH$=7~Ab@)26ivXl-UCPo0@rQNDUa8&l`|x<vW@C1dRFQ>S}BYHdu2byaH-???au
z1ORl#lX=1oG!pSkQo><IAz52nTeI#~qPu4m5jBGO4<SS;F&}q;Jyq3}y8ZY`h-7yU
zsw&qa-kA&&(Lo}+Tnaf#%rAmyb1b(0$9P8~YOOuNz_<{YM#NnVe7I?2tr7sx(bbKb
z>PmE-?h8!b|N9U@R108;84-ZjZ`)G$OZ%}C^DNn3Fm6DI2!NeRsq+E=PR6@ni4faR
z0|01lZTp0oYXE!?h!+^VX2%;_@3bCif0miS#Ek%c25?Y3`IhF^Hq>w5g2SIRf6QP3
z79oHZd7f91zL)v)x#FVd^YZdKq?DaP%4X+D0MWy~y!}>v0{}F&w73(g%u$ugedBxC
z#6-%@4~4_|0Vi<oy?5Us@lZsNQcl_TXmn-%+_JLmOf+9eIYw;1Z2I)@?Z;f{KLTc!
z%$(26?xS^>S&WYU7G`Gm@mry_hU>au<{3(<H+^5fmd*YXR!Tjilq&SH9{XAY%zzLC
maJsNynkp_X8l7HL6n_BV)2n(}yX_AE0000<MNUMnLSTa44W38<

diff --git a/templates/common/parameters.html b/templates/common/parameters.html
index 41092cad2..50102aa16 100644
--- a/templates/common/parameters.html
+++ b/templates/common/parameters.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load admin_extras %}
 {% if gparams %}
-  <p><input type="submit" name="update" value="{% trans 'Save' %}" /></p>
+  <p><input style="margin: 5px" type="submit" name="update" value="{% trans 'Save' %}" /></p>
   <div id="accordion">
     {% for app in gparams %}
     <h3 class="toggler atStart">{{ app.name }}</h3>