From ad71e2a6809c1a97101cb44160f12bb1daeddfb1 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Thu, 21 Jun 2012 18:18:53 +0200
Subject: [PATCH] [ADD] mail.group form view (from tde's branch)

bzr revid: abo@openerp.com-20120621161853-0vyfyt8rwdh4v8d0
---
 addons/mail/mail_group_view.xml     | 36 +++++++++++------------
 addons/mail/static/src/css/mail.css | 45 +++++++++++++++++++++++++----
 addons/mail/static/src/xml/mail.xml |  6 ++--
 3 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index b2b34da8472..371c84b97b3 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        
-       <!-- Group Kanban View  !-->
+
+        <!-- Group Kanban View  !-->
         <record model="ir.ui.view" id="view_group_kanban">
             <field name="name">mail.group.kanban</field>
             <field name="model">mail.group</field>
@@ -50,29 +50,29 @@
             <field name="type">form</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <form string="Group" version="7.0">
-                    <sheet>
+                <form string="Group Form" version="7.0">
+                    <sheet class="openerp_mail_group_sheet">
                         <group colspan="4" col="8">
-                            <group colspan="6" col="4">
-                                <separator string="General Information" colspan="4"/>
-                                <field name="name" colspan="2"/>
-                                <field name="responsible_id" colspan="2"/>
-                                <newline/>
-                                <field name="description" colspan="4"/>
-                            </group>
                             <group colspan="1" col="2">
-                                <separator string="Group Image" colspan="2"/>
                                 <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
                             </group>
-                            <group colspan="1" col="2">
-                                <separator string="Privacy Settings" colspan="2"/>
-                                <field name="public" nolabel="1"/>
-                                <label string="This group is visible by non members" colspan="2"/>
+                            <group colspan="7" col="6">
+                                <h2><field name="name" nolabel="1" colspan="4"/></h2>
+                                <newline/>
+                                <group colspan="4" col="4">
+                                    <field name="description" colspan="4" nolabel="1"/>
+                                </group>
+                                <group colspan="2" col="2" class="oe_edit_only">
+                                    <field name="responsible_id" colspan="2"/>
+                                    <field name="public" colspan="2"/>
+                                </group>
                             </group>
                         </group>
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
-                                options='{"thread_level": 1}'/>
                     </sheet>
+                    <footer>
+                        <field name="message_ids" colspan="4" widget="ThreadView" 
+                            options='{"thread_level": 1}'/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e9b2b8ebd79..0f1ec8c7dc7 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -207,11 +207,6 @@
     background: white;
     border-top: 1px solid #ccc;
 }
-.openerp .oe_mail_wall_threads > .oe_mail_wall_thread:first-child > .oe_mail_msg_comment, 
-.openerp .oe_mail_wall_threads > .oe_mail_wall_thread:first-child > .oe_mail_msg_email, 
-.openerp .oe_mail_wall_threads > .oe_mail_wall_thread:first-child > .oe_mail_msg_notification {
-    border-top: 0;
-}
 
 .openerp .oe_email_icon {
     width: 50px;
@@ -344,6 +339,14 @@
     border-top: 4px solid #404040;
 }
 
+.openerp .oe_mail_msg_footer li:after {
+    content: " · ";
+}
+
+.openerp .oe_mail_msg_footer li:last-child:after {
+    content: "";
+}
+
 /* Attachments list */
 .openerp ul.oe_mail_msg_attachments {
     display: none;
@@ -359,3 +362,35 @@
     padding: 0;
     list-style-type: square;
 }
+
+
+/* ------------------------------ */
+/* Group Form                     */
+/* ------------------------------ */
+
+div.oe_mail_group_advanced_details {
+  display: none;
+}
+
+.oe_form_sheetbg.openerp_mail_group_sheet {
+  min-height: 0px;
+  max-height: none;
+}
+
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_sheet {
+  min-height: 0px;
+  max-height: none;
+  padding: 0px 18px;
+  max-width: 80%;
+}
+
+/* Resize group logo */
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_image > img {
+  max-width: 100px;
+  max-height: 100px;
+}
+
+/* Resize group description */
+.oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_text > textarea {
+  height: 40px;
+} 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7f74f3f5d80..b005a471cdc 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -94,10 +94,8 @@
             <p class="oe_mail_msg_subtitle">
                 <t t-if="params.thread_level > 0">
                     <a href="#" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}' class="oe_mail_internal_link"><t t-raw="record.record_name"/></a>
-                     · 
                 </t>
                 <span class="oe_mail_msg_author"><a href="#" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}' class="oe_mail_internal_link"><t t-raw="record.user_id[1]"/></a></span>
-                 · 
                 <span class="oe_mail_msg_date" t-att-title="record.date"><t t-raw="record.timerelative"/></span>
             </p>
             
@@ -108,9 +106,9 @@
             
             <ul class="oe_mail_msg_footer">
               <t t-if="display['show_reply']">
-                <li><a href="#" class="oe_mail_msg_reply">Reply</a> · </li>
+                <li><a href="#" class="oe_mail_msg_reply">Reply</a></li>
               </t>
-              <li><a href="#">Like</a> · </li>
+              <li><a href="#">Like</a></li>
               <t t-if="record.attachment_ids.length > 0">
                 <li>
                     <a href="#" class="oe_mail_msg_view_attachments">