[MERGE] Merged lp:openobject-addons.
authorParamjit Singh Sahota <psa@tinyerp.com>
Fri, 5 Apr 2013 13:30:30 +0000 (19:00 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Fri, 5 Apr 2013 13:30:30 +0000 (19:00 +0530)
bzr revid: psa@tinyerp.com-20130405133030-u1lr42lly3dqvr37

1  2 
addons/mail/mail_group.py
addons/mail/mail_thread.py
addons/mail/static/src/css/mail.css
addons/mail/static/src/xml/mail_followers.xml

Simple merge
Simple merge
Simple merge
@@@ -30,8 -30,7 +30,8 @@@
          -->
      <div t-name="mail.followers.partner" class='oe_partner'>
          <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
-         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
+         <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
 +        <img t-if="widget.session.debug" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
          <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
      </div>