[MERGE] Chatter: added a small explanation text when logging a note. Also removed custom placeholders in various views, because they do not make much sense anymore, default message should be sufficient.

bzr revid: tde@openerp.com-20130304135935-hjafhalyp94mona6
This commit is contained in:
Thibault Delavallée
2013-03-04 14:59:35 +01:00
7 changed files with 10 additions and 7 deletions
+1 -1
View File
@@ -437,7 +437,7 @@
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
<field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
<field name="message_ids" widget="mail_thread"/>
</div>
</form>
</field>
+1 -1
View File
@@ -168,7 +168,7 @@
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
<field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
<field name="message_ids" widget="mail_thread"/>
</div>
</form>
</field>
+1 -1
View File
@@ -95,7 +95,7 @@
</notebook>
</sheet>
<div class="oe_chatter">
<field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
<field name="message_ids" widget="mail_thread"/>
<field name="message_follower_ids" widget="mail_followers"/>
</div>
</form>
+2 -2
View File
@@ -168,7 +168,7 @@
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
<field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
<field name="message_ids" widget="mail_thread"/>
</div>
</form>
</field>
@@ -405,7 +405,7 @@
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
<field name="message_ids" widget="mail_thread"/>
</div>
</form>
</field>
@@ -151,7 +151,7 @@
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
<field name="message_ids" widget="mail_thread"/>
</div>
</form>
</field>
+3
View File
@@ -150,6 +150,9 @@
</label>
</t>
</div>
<div t-if="widget.is_log">
<span>Attach a note that will not be send to the followers</span>
</div>
</t>
<!--
+1 -1
View File
@@ -274,7 +274,7 @@
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
<field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
<field name="message_ids" widget="mail_thread"/>
</div>
</form>
</field>