From 86fe9e48b82642ce0abc9e1c5b609032d4908255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 12:03:27 +0200
Subject: [IMP] mail.thread: improvement taken from trunk-form-v2-fme.
 mail.group: added demo data. thread widget: updated css and html structure.
 mail security: now for every users, not only employees. This will need to be
 reviewed in details.

bzr revid: tde@openerp.com-20120413100327-2uimy9c1crnfzm6u
---
 addons/mail/static/src/css/mail.css         |  73 ++++++++++++++++++++--------
 addons/mail/static/src/img/groupdefault.png | Bin 19910 -> 3092 bytes
 addons/mail/static/src/js/mail.js           |  20 ++++----
 addons/mail/static/src/xml/mail.xml         |  29 ++++++++---
 4 files changed, 84 insertions(+), 38 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d920455537f..260b4a230cd 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -4,17 +4,23 @@
 
 div.oe_mail_wall {
     overflow: auto;
-    padding: 5px;
+    padding: 0;
+    background: white;
 }
 
-div.oe_mail_wall_search {
-    width: 55%;
+/*div.oe_mail_wall_search {*/
+    /*width: 550px;*/
+/*}*/
+
+.oe_mail_wall_button_comment {
+    float: right;
 }
 
 /* 2 columns view */
 div.oe_mail_wall_left {
     float: left;
-    width: 65%;
+    width: 560px;
+    margin: 8px;
 }
 
 div.oe_mail_wall_right {
@@ -22,6 +28,10 @@ div.oe_mail_wall_right {
     width: 34%;
 }
 
+.oe_mail_wall_threads {
+    margin-top: 8px;
+}
+
 .oe_mail_wall_thread div.oe_mail_thread_act .oe_mail_action_textarea, div.oe_mail_thread_subthread .oe_mail_action_textarea {
     height: 20px;
     padding: 2px;
@@ -47,16 +57,15 @@ div.oe_mail_wall_more {
 
 .oe_mail_recthread {
     overflow: auto;
-    padding: 5px 5px 5px 5px;
 }
 
 /* Left-side CSS */
 .oe_mail_recthread_actions {
-    margin-bottom: 10px;
+    margin-bottom: 8px;
 }
 
 .oe_mail_recthread_followers {
-    margin-bottom: 10px;
+    margin-bottom: 8px;
 }
 
 .oe_mail_followers_action, .oe_mail_followers_display {
@@ -70,21 +79,16 @@ div.oe_mail_wall_more {
 
 .oe_mail_recthread_right {
     float: right;
-    width: 25%;
-    margin-right: 5%;
+    width: 240px;
 }
 
 .oe_mail_button_follow, .oe_mail_button_unfollow {
-    width: 120px;
+    /*width: 120px;*/
 }
 
 .oe_mail_button_followers {
-    display: inline;
-    width: 120px;
-}
-
-.oe_mail_followers h4 {
-    margin: 0 0 8px;
+    display: inline-block;
+    width: 240px;
 }
 
 /* ------------------------------ */
@@ -99,7 +103,7 @@ div.oe_mail_thread_act {
 
 div.oe_mail_thread_display {
     white-space: normal;
-    margin-bottom: 5px;
+    /*margin-bottom: 5px;*/
 }
 
 div.oe_mail_thread_subthread {
@@ -116,8 +120,7 @@ li.oe_mail_thread_msg {
     padding: 1px;
 }
 
-.notification, .email {
-    background: #E0E0E0;
+.notification, .comment {
     padding: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -126,8 +129,16 @@ li.oe_mail_thread_msg {
     border-radius: 4px;
 }
 
-.comment {
-    padding: 4px;
+.oe_mail_thread_msg > .comment {
+    background: #eee;
+}
+
+.oe_mail_thread_subthread .comment {
+    background: white;
+}
+
+.notification {
+    background: #eee;
 }
 
 .notification:after, .email:after, .comment:after {
@@ -215,6 +226,14 @@ input.oe_mail, textarea.oe_mail {
     border-radius: 3px;
 }
 
+.oe_mail_wall .oe_mail_wall_act textarea {
+    width: 550px;
+}
+
+textarea.oe_mail {
+    height: 60px;
+}
+
 input.oe_mail:focus, textarea.oe_mail:focus {
     outline: 0;
     border-color: rgba(82, 168, 236, 0.8);
@@ -246,6 +265,10 @@ p.oe_mail_msg {
     font-weight: bold;
 }
 
+.oe_mail_msg_reply, .oe_mail_msg_delete {
+    margin-right: 4px;
+}
+
 a.oe_mail_oe_intlink {
     color: #8786b7;
 }
@@ -257,3 +280,11 @@ a.oe_mail_oe_intlink {
 .oe_mail_oe_space {
     margin-left: 15px;
 }
+
+
+
+
+.oe_mail_recthread_actions button {
+    width: 120px;
+}
+
diff --git a/addons/mail/static/src/img/groupdefault.png b/addons/mail/static/src/img/groupdefault.png
index fd826837266..cf160022470 100644
Binary files a/addons/mail/static/src/img/groupdefault.png and b/addons/mail/static/src/img/groupdefault.png differ
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index fbe817c2c81..dc6bd74c345 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -58,10 +58,8 @@ openerp.mail = function(session) {
     }
 
     /* Add ThreadDisplay widget to registry */
-    session.web.form.widgets.add(
-        'Thread', 'openerp.mail.Thread');
-    session.web.page.readonly.add(
-        'Thread', 'openerp.mail.Thread');
+    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
+    session.web.page.readonly.add( 'Thread', 'openerp.mail.Thread');
 
     /** 
      * ThreadDisplay widget: this widget handles the display of a thread of
@@ -464,10 +462,8 @@ openerp.mail = function(session) {
 
 
     /* Add ThreadView widget to registry */
-    session.web.form.widgets.add(
-        'ThreadView', 'openerp.mail.RecordThread');
-    session.web.page.readonly.add(
-        'ThreadView', 'openerp.mail.RecordThread');
+    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
+    session.web.page.readonly.add( 'ThreadView', 'openerp.mail.RecordThread');
 
     /* ThreadView widget: thread of comments */
     mail.RecordThread = session.web.form.Field.extend({
@@ -489,9 +485,11 @@ openerp.mail = function(session) {
             // bind buttons
             this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }).hide();
             this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
-                .mouseover(function () { $(this).html('Follow'); }).mouseleave(function () { $(this).html('Not following'); });
+                .mouseover(function () { $(this).html('Follow').addClass('following'); })
+                .mouseleave(function () { $(this).html('Not following').removeClass('following'); });
             this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
-                .mouseover(function () { $(this).html('Unfollow'); }).mouseleave(function () { $(this).html('Following'); });
+                .mouseover(function () { $(this).html('Unfollow').removeClass('following').addClass('unfollow'); })
+                .mouseleave(function () { $(this).html('Following').removeClass('unfollow').addClass('following'); });
             this.reinit();
         },
 
@@ -642,7 +640,7 @@ openerp.mail = function(session) {
         load_search_view: function (view_id, defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.appendTo(this.$element.find('div.oe_mail_wall_search'));
+            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_row'));
             return $.when(search_view_loaded).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
             });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 0f49902b6b3..d97f0738629 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,13 +2,17 @@
 <template>
 
     <div t-name="Wall" class="oe_mail_wall">
-        <div class="oe_mail_wall_search">
+        <div class="oe_view_manager_header">
+            <div class="oe_view_manager_row">
+                <h2 class="oe_view_title">All Feeds</h2>
+            </div>
         </div>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
-                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/><br />
+                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>
                 <button class="oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
+            <div class="oe_clear"></div>
             <div class="oe_mail_wall_threads">
             </div>
             <div class="oe_mail_wall_more">
@@ -28,7 +32,7 @@
         <div class="oe_mail_recthread_right">
             <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow">Not following</button>
-                <button type="button" class="oe_mail_button_unfollow">Following</button>
+                <button type="button" class="oe_mail_button_unfollow following">Following</button>
                 <button type="button" class="oe_mail_button_followers">Display followers</button>
             </div>
             <div class="oe_mail_recthread_followers">
@@ -65,7 +69,9 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
-            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+            <t t-if="params.thread_level > 0">
+                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+            </t>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
             <br />
@@ -73,9 +79,9 @@
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 on <t t-raw="record.date"/>
             </span>
-            <t t-if="display['show_reply']"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a></span></t>
+            <t t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
             <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a></span></t>
+                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
             </t>
             <t t-if="display['show_hide']">
                 <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
@@ -85,6 +91,10 @@
     
     <t t-name="EmailDisplay">
         <p class="oe_mail_msg oe_mail_msg_p_email_header">
+            <t t-if="params.thread_level > 0">
+                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+            </t>
+            <br />
             <span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
             <span class="oe_mail_oe_bold">To:</span> <t t-esc="record.email_to"/><br />
             <span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br />
@@ -92,6 +102,13 @@
         <p class="oe_mail_msg">
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
+            <br />
+            <t t-if="display['show_delete']">
+                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
+            </t>
+            <t t-if="display['show_hide']">
+                <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
+            </t>
         </p>
     </t>
 
-- 
cgit v1.2.3


From 77ded11094688a8624e0a21b61d376d33534625c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 13:41:26 +0200
Subject: [CLEAN] Thrad widget: cleaned CSS file.

bzr revid: tde@openerp.com-20120413114126-4rls0wlbpe71m8ao
---
 addons/mail/static/src/css/mail.css | 188 ++++++++++++++++++------------------
 addons/mail/static/src/js/mail.js   |   8 +-
 addons/mail/static/src/xml/mail.xml |  14 +--
 3 files changed, 103 insertions(+), 107 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 260b4a230cd..e496c0b3990 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -2,125 +2,159 @@
 /* Wall                           */
 /* ------------------------------ */
 
-div.oe_mail_wall {
+.openerp div.oe_mail_wall {
     overflow: auto;
     padding: 0;
     background: white;
 }
 
-/*div.oe_mail_wall_search {*/
-    /*width: 550px;*/
-/*}*/
-
-.oe_mail_wall_button_comment {
-    float: right;
-}
-
 /* 2 columns view */
-div.oe_mail_wall_left {
+.openerp div.oe_mail_wall_left {
     float: left;
     width: 560px;
     margin: 8px;
 }
 
-div.oe_mail_wall_right {
-    float: right;
-    width: 34%;
+.openerp div.oe_mail_wall_right {
+    margin-left: 565px;
+    margin: 8px;
 }
 
-.oe_mail_wall_threads {
+.openerp div.oe_mail_wall_threads {
     margin-top: 8px;
 }
 
-.oe_mail_wall_thread div.oe_mail_thread_act .oe_mail_action_textarea, div.oe_mail_thread_subthread .oe_mail_action_textarea {
+.openerp textarea.oe_mail_wall_action_textarea {
+    width: 550px;
+    height: 60px;
+    padding: 5px;
+}
+
+.openerp div.oe_mail_wall_threads textarea {
     height: 20px;
     padding: 2px;
 }
 
-.oe_mail_thread_subthread div.oe_mail_thread_act .oe_mail_msg_image, .oe_mail_thread_subthread div.oe_mail_thread_display .oe_mail_msg_image {
+.openerp div.oe_mail_thread_subthread img {
     width: 30px;
     height: 30px;
 }
 
-.oe_mail_thread_subthread .oe_mail_msg_content, .oe_mail_thread_subthread .oe_mail_msg_content {
+.openerp div.oe_mail_thread_subthread div.oe_mail_msg_content {
     margin-left: 40px;
 }
 
-div.oe_mail_wall_more {
+.openerp div.oe_mail_wall_more {
     text-align: center;
     display: none;
 }
 
+
 /* ------------------------------ */
 /* RecordThread                   */
 /* ------------------------------ */
 
-.oe_mail_recthread {
+.openerp div.oe_mail_recthread {
     overflow: auto;
 }
 
 /* Left-side CSS */
-.oe_mail_recthread_actions {
+.openerp div.oe_mail_recthread_actions {
     margin-bottom: 8px;
 }
 
-.oe_mail_recthread_followers {
+.openerp div.oe_mail_recthread_followers {
     margin-bottom: 8px;
 }
 
-.oe_mail_followers_action, .oe_mail_followers_display {
-}
-
 /* RecordThread: 2 columns view */
-.oe_mail_recthread_left {
+.openerp div.oe_mail_recthread_left {
     float: left;
     width: 55%;
 }
 
-.oe_mail_recthread_right {
+.openerp div.oe_mail_recthread_right {
     float: right;
     width: 240px;
 }
 
-.oe_mail_button_follow, .oe_mail_button_unfollow {
-    /*width: 120px;*/
+.openerp div.oe_mail_recthread_actions button {
+    width: 120px;
 }
 
-.oe_mail_button_followers {
+.openerp button.oe_mail_button_followers {
     display: inline-block;
-    width: 240px;
+}
+
+.openerp button.oe_mail_button_mouseout {
+  color: white;
+  background-color: #8a89ba;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
+  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);
+}
+
+.openerp button.oe_mail_button_mouseover {
+  display: none;
+  color: white;
+  background-color: #dc5f59;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630));
+  background-image: -webkit-linear-gradient(top, #dc5f59, #b33630);
+  background-image: -moz-linear-gradient(top, #dc5f59, #b33630);
+  background-image: -ms-linear-gradient(top, #dc5f59, #b33630);
+  background-image: -o-linear-gradient(top, #dc5f59, #b33630);
+  background-image: linear-gradient(to bottom, #dc5f59, #b33630);
+}
+
+.openerp textarea.oe_mail_action_textarea {
+    height: 60px;
+    padding: 5px;
 }
 
 /* ------------------------------ */
 /* ThreadDisplay                  */
 /* ------------------------------ */
 
-div.oe_mail_thread_act {
+.openerp div.oe_mail_thread_act {
     white-space: normal;
     margin-bottom: 5px;
     padding: 4px;
 }
 
-div.oe_mail_thread_display {
+.openerp div.oe_mail_thread_act:after {
+    content: "";
+    display: block;
+    clear: both; 
+}
+
+.openerp div.oe_mail_thread_display {
     white-space: normal;
-    /*margin-bottom: 5px;*/
 }
 
-div.oe_mail_thread_subthread {
+.openerp div.oe_mail_thread_subthread {
     margin-top: 8px;
     padding-left: 5%;
 }
 
-div.oe_mail_thread_more {
+.openerp div.oe_mail_thread_more {
     display: none;
     border-bottom: 1px solid #D2D9E7;
 }
 
-li.oe_mail_thread_msg {
+.openerp li.oe_mail_thread_msg {
     padding: 1px;
 }
 
-.notification, .comment {
+.openerp li.oe_mail_thread_msg:after {
+    content: "";
+    display: block;
+    clear: both; 
+}
+
+.openerp .notification, .openerp .comment.openerp .notification, .openerp .email {
     padding: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -129,46 +163,35 @@ li.oe_mail_thread_msg {
     border-radius: 4px;
 }
 
-.oe_mail_thread_msg > .comment {
+.openerp li.oe_mail_thread_msg > .comment {
     background: #eee;
 }
 
-.oe_mail_thread_subthread .comment {
+.openerp div.oe_mail_thread_subthread .comment {
     background: white;
 }
 
-.notification {
+.openerp .notification {
     background: #eee;
 }
 
-.notification:after, .email:after, .comment:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-li.oe_mail_thread_msg:after, div.oe_mail_thread_act:after {
+.openerp .notification:after, .openerp .comment:after, .openerp .email:after {
     content: "";
     display: block;
     clear: both; 
 }
 
-.oe_mail_msg_content {
+.openerp .oe_mail_msg_content {
     margin-left: 60px;
 }
 
-.oe_mail_msg_content:after {
+.openerp .oe_mail_msg_content:after {
     content: "";
     display: block;
     clear: both; 
 }
 
-.oe_mail_action_textarea {
-    height: 50px;
-    padding: 5px;
-}
-
-.oe_mail_msg_image {
+.openerp img.oe_mail_msg_image {
     margin-right: 8px;
     width: 45px;
     height: 45px;
@@ -186,11 +209,11 @@ li.oe_mail_thread_msg:after, div.oe_mail_thread_act:after {
     clip: rect(5px, 40px, 45px, 0px);
 }
 
-p.oe_mail_msg_p_email_header {
+.openerp p.oe_mail_msg_p_email_header {
     border-bottom: 1px solid #D2D9E7;
 }
 
-.oe_mail_msg_body a.reduce, .oe_mail_msg_body_short a.expand {
+.openerp span.oe_mail_msg_body a.reduce, .openerp span.oe_mail_msg_body_short a.expand {
     color: #4E43E7;
 }
 
@@ -198,17 +221,17 @@ p.oe_mail_msg_p_email_header {
 /* Styling (should be openerp)    */
 /* ------------------------------ */
 
-ul.oe_mail {
+.openerp ul.oe_mail {
     padding: 0;
     margin: 0;
 }
 
-li.oe_mail {
+.openerp li.oe_mail {
     list-style-type: none;
     margin-bottom: 2px;
 }
 
-input.oe_mail, textarea.oe_mail {
+.openerp input.oe_mail, textarea.oe_mail {
     width: 100%;
     padding: 4px;
     font-size: 12px;
@@ -226,15 +249,7 @@ input.oe_mail, textarea.oe_mail {
     border-radius: 3px;
 }
 
-.oe_mail_wall .oe_mail_wall_act textarea {
-    width: 550px;
-}
-
-textarea.oe_mail {
-    height: 60px;
-}
-
-input.oe_mail:focus, textarea.oe_mail:focus {
+.openerp input.oe_mail:focus, textarea.oe_mail:focus {
     outline: 0;
     border-color: rgba(82, 168, 236, 0.8);
     -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
@@ -242,49 +257,30 @@ input.oe_mail:focus, textarea.oe_mail:focus {
     -box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
 }
 
-p.oe_mail_msg {
+.openerp p.oe_mail_msg {
     padding: 0;
     margin: 0;
 }
 
-.oe_mail_oe_right {
+.openerp .oe_mail_oe_right {
     float: right;
     margin-right: 8px;
 }
 
-.oe_mail_oe_left {
+.openerp .oe_mail_oe_left {
     float: left;
     margin-right: 8px;
 }
 
-.oe_mail_oe_fade {
-    color: #888888;
-}
-
-.oe_mail_oe_bold {
-    font-weight: bold;
-}
-
-.oe_mail_msg_reply, .oe_mail_msg_delete {
-    margin-right: 4px;
-}
-
-a.oe_mail_oe_intlink {
+.openerp a.oe_mail_oe_intlink {
     color: #8786b7;
 }
 
-.oe_mail_oe_warning, .oe_mail_oe_warning a {
-    color: #C03000;
+.openerp .oe_mail_oe_bold {
+    font-weight: bold;
 }
 
-.oe_mail_oe_space {
+.openerp .oe_mail_oe_space {
     margin-left: 15px;
+    margin-right: 4px;
 }
-
-
-
-
-.oe_mail_recthread_actions button {
-    width: 120px;
-}
-
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index dc6bd74c345..c29b81fc097 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -485,11 +485,11 @@ openerp.mail = function(session) {
             // bind buttons
             this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }).hide();
             this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
-                .mouseover(function () { $(this).html('Follow').addClass('following'); })
-                .mouseleave(function () { $(this).html('Not following').removeClass('following'); });
+                .mouseover(function () { $(this).html('Follow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
+                .mouseleave(function () { $(this).html('Not following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
             this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
-                .mouseover(function () { $(this).html('Unfollow').removeClass('following').addClass('unfollow'); })
-                .mouseleave(function () { $(this).html('Following').removeClass('unfollow').addClass('following'); });
+                .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
+                .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
             this.reinit();
         },
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index d97f0738629..6505b2cd88b 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -10,7 +10,7 @@
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
                 <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>
-                <button class="oe_mail_wall_button_comment" type="button">Post comment</button>
+                <button class="oe_mail_oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
             <div class="oe_clear"></div>
             <div class="oe_mail_wall_threads">
@@ -31,8 +31,8 @@
         </div>
         <div class="oe_mail_recthread_right">
             <div class="oe_mail_recthread_actions">
-                <button type="button" class="oe_mail_button_follow">Not following</button>
-                <button type="button" class="oe_mail_button_unfollow following">Following</button>
+                <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
+                <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
                 <button type="button" class="oe_mail_button_followers">Display followers</button>
             </div>
             <div class="oe_mail_recthread_followers">
@@ -47,7 +47,7 @@
         <div class="oe_mail_thread_act">
             <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
-                <textarea class="oe_mail_action_textarea oe_mail" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
+                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
             </div>
         </div>
         <div class="oe_mail_thread_display"></div>
@@ -79,12 +79,12 @@
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 on <t t-raw="record.date"/>
             </span>
-            <t t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
+            <t t-if="display['show_reply']"><a href="#" class="oe_mail_oe_space oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
             <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
+                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
             </t>
             <t t-if="display['show_hide']">
-                <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
+                <t t-if="!(thread._is_author(record.user_id[0]))"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></t>
             </t>
         </p>
     </t>
-- 
cgit v1.2.3


From 8184c0da0bc82376fc8d00f2cfd5379a96a588d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 14:00:10 +0200
Subject: [FIX] Wall: fixed post button exceeding its parent container due to
 unknown oe_clear class in trunk. Added :after to clear the view.

bzr revid: tde@openerp.com-20120413120010-3s6mvkql0wy8kn9n
---
 addons/mail/static/src/css/mail.css | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e496c0b3990..ca6f1f3e70a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -8,6 +8,12 @@
     background: white;
 }
 
+.openerp div.oe_mail_wall_act:after {
+    content: "";
+    display: block;
+    clear: both; 
+}
+
 /* 2 columns view */
 .openerp div.oe_mail_wall_left {
     float: left;
-- 
cgit v1.2.3


From 9dc1810e644fa72dcef4bf7228342608172c1cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 14:25:30 +0200
Subject: [IMP] mail.thread: cleaned css class name; cleaned a small bug in
 message display.

bzr revid: tde@openerp.com-20120413122530-kst3ho792hymr4p6
---
 addons/mail/static/src/css/mail.css | 16 +++++++++++-----
 addons/mail/static/src/xml/mail.xml |  6 +++---
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index ca6f1f3e70a..4ba5deba040 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -160,7 +160,13 @@
     clear: both; 
 }
 
-.openerp .notification, .openerp .comment.openerp .notification, .openerp .email {
+.openerp li.oe_mail_thread_msg > div:after {
+    content: "";
+    display: block;
+    clear: both; 
+}
+
+.openerp .oe_mail_msg_notification, .openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email {
     padding: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -169,19 +175,19 @@
     border-radius: 4px;
 }
 
-.openerp li.oe_mail_thread_msg > .comment {
+.openerp li.oe_mail_thread_msg > .oe_mail_msg_comment {
     background: #eee;
 }
 
-.openerp div.oe_mail_thread_subthread .comment {
+.openerp div.oe_mail_thread_subthread .oe_mail_msg_comment {
     background: white;
 }
 
-.openerp .notification {
+.openerp .oe_mail_msg_notification {
     background: #eee;
 }
 
-.openerp .notification:after, .openerp .comment:after, .openerp .email:after {
+.openerp .oe_mail_msg_notification:after, .openerp .oe_mail_msg_comment:after, .openerp .oe_mail_msg_email:after {
     content: "";
     display: block;
     clear: both; 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 6505b2cd88b..f034b04311d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -43,7 +43,7 @@
         </div>
     </div>
 
-    <ul t-name="Thread" class="oe_mail_thread oe_mail">
+    <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
             <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
@@ -56,8 +56,8 @@
         </div>
     </ul>
 
-    <li t-name="ThreadMsg" t-attf-class="oe_mail_thread_msg oe_mail">
-        <div t-attf-class="{record.type}">
+    <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
+        <div t-attf-class="oe_mail_msg_#{record.type}">
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
                 <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
-- 
cgit v1.2.3


From c83f54289d23978927bde3e5fc04a3c7bfb602ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 17:01:22 +0200
Subject: [FIX] share: invite button added to mail.thread has the same style as
 '(un)follow' button.

bzr revid: tde@openerp.com-20120413150122-zdkzu9cmzpq8xors
---
 addons/mail/static/src/css/mail.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 4ba5deba040..7f0cc6f222c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -81,7 +81,7 @@
 
 .openerp div.oe_mail_recthread_right {
     float: right;
-    width: 240px;
+    width: 250px;
 }
 
 .openerp div.oe_mail_recthread_actions button {
@@ -89,7 +89,7 @@
 }
 
 .openerp button.oe_mail_button_followers {
-    display: inline-block;
+    display: inline;
 }
 
 .openerp button.oe_mail_button_mouseout {
-- 
cgit v1.2.3


From 0912faef4c4a122bcb3f4b48050e44cf7ef903c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Apr 2012 10:18:05 +0200
Subject: [DOC] Small doc update.

bzr revid: tde@openerp.com-20120416081805-wz85d6sxd90n472b
---
 addons/mail/static/src/js/mail.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index c29b81fc097..326225b6b24 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -388,6 +388,11 @@ openerp.mail = function(session) {
             return this.fetch_comments(this.params.limit, this.params.offset, domain);
         },
         
+        /**
+         *
+         * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
+         * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
+         */
         do_replace_internal_links: function (string) {
             var self = this;
             var icon_list = ['al', 'pinky']
@@ -427,7 +432,6 @@ openerp.mail = function(session) {
         
         /**
          *
-         * var regex_login = new RegExp(/(^|\s)@(\w*[a-zA-Z_.]+\w*\s)/g);
          * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
          * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
          */
-- 
cgit v1.2.3


From 68185632ba9251109f0db942a35e655052ce5a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Apr 2012 13:00:43 +0200
Subject: [FIX] mail: fixed error with icon and icon_web_hover. also resized
 icons.

bzr revid: tde@openerp.com-20120417110043-zrywu5ag4fat6onz
---
 addons/mail/static/src/img/feeds-hover.png | Bin 41761 -> 15696 bytes
 addons/mail/static/src/img/feeds.png       | Bin 13316 -> 5647 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/img/feeds-hover.png b/addons/mail/static/src/img/feeds-hover.png
index 81f098d35c2..67070d3e7df 100644
Binary files a/addons/mail/static/src/img/feeds-hover.png and b/addons/mail/static/src/img/feeds-hover.png differ
diff --git a/addons/mail/static/src/img/feeds.png b/addons/mail/static/src/img/feeds.png
index 5ca849e168c..ac2293c0bf5 100644
Binary files a/addons/mail/static/src/img/feeds.png and b/addons/mail/static/src/img/feeds.png differ
-- 
cgit v1.2.3


From 8ef72c59e67d811119030b4c13afc92a2b09ee54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Apr 2012 10:58:38 +0200
Subject: [FIX] Dates on message are now displayed according to the user
 timezone.

bzr revid: tde@openerp.com-20120419085838-awmxdqjbsb8qyi38
---
 addons/mail/static/src/js/mail.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8e507416a37..d99674f98a7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -275,6 +275,8 @@ openerp.mail = function(session) {
             record.tr_body = this.do_truncate_string(record.body, this.params.msg_more_limit);
             record.body = this.do_replace_internal_links(record.body);
             if (record.tr_body) record.tr_body = this.do_replace_internal_links(record.tr_body);
+            // format date according to the user timezone
+            record.date = session.web.format_value(record.date, {type:"datetime"});
             // render
             $(session.web.qweb.render('ThreadMsg', {'record': record, 'thread': this, 'params': this.params, 'display': this.display})
                     ).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
-- 
cgit v1.2.3