odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] mail, email_template: chatter: added forgotton images for links/buttons, cleaned a bit the CSS for the composer. 

bzr revid: tde@openerp.com-20120718133234-p933jg1y8658i5ah
This commit is contained in:
Thibault Delavallée 2012-07-18 15:32:34 +02:00
parent 63e046da63
commit 56e6186ad9
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
addons/email_template/static/src/img/email_template.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
addons/email_template/static/src/img/email_template_save.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

21
addons/email_template/wizard/email_compose_message_view.xml
View File

@ -41,21 +41,12 @@
on_change="on_change_template(use_template, template_id, False, False, context)"/> on_change="on_change_template(use_template, template_id, False, False, context)"/>
</xpath> </xpath>
<xpath expr="//a[@class='oe_mail_compose_message_checklist']" position="before"> <xpath expr="//a[@class='oe_mail_compose_message_checklist']" position="before">
<!-- <button icon="../../../../../email_template/static/src/img/email_template"
<a href="#" class="oe_mail_compose_message_template"> type="object" name="template_toggle" string=""
<img src='/mail/static/src/img/template.png/' alt='Use template' help="Use a message template"/>
title='Use a message template'/> <button icon="../../../../../email_template/static/src/img/email_template_save"
</a> type="object" name="save_as_template" string=""
<a href="#" class="oe_mail_compose_message_template_save"> help="Save as a new template"/>
<img src='/mail/static/src/img/template.png/' alt='Save as template'
title='Use a message template'/>
</a> -->
<button icon="gtk-paste" type="object" name="template_toggle"
class="oe_mail_compose_message_template_toggle"
string="" help="Use a message template" />
<button icon="gtk-save" type="object" name="save_as_template"
class="oe_mail_compose_message_template_save"
string="" help="Save as a new template"/>
</xpath> </xpath>
</data> </data>
</field> </field>

4
addons/mail/static/src/css/mail.css
View File

@ -325,6 +325,10 @@
width: 472px; width: 472px;
} }
/* buttons */
.openerp .oe_mail_msg_content .oe_mail_compose_message_icons button.oe_form_button {
padding: 1px;
}
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/* Messages layout /* Messages layout

2
addons/mail/static/src/css/mail_compose_message.css
View File

@ -13,4 +13,4 @@
.openerp .oe_mail_compose_message_icons img { .openerp .oe_mail_compose_message_icons img {
width: 20px; width: 20px;
height: 20px; height: 20px;
} }

BIN
addons/mail/static/src/img/attachment.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
addons/mail/static/src/img/checklist.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 976 B

BIN
addons/mail/static/src/img/formatting.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

7
addons/mail/wizard/mail_compose_message_view.xml
View File

@ -45,6 +45,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Compose Email" version="7.0" > <form string="Compose Email" version="7.0" >
<group> <group>
<!-- <field name="type" invisible="1"/>
<field name="content_subtype" invisible="1"/> -->
<field name="subject" colspan="2" nolabel="1" placeholder="Subject..." <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/> class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
<field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?" <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
@ -55,10 +57,13 @@
placeholder="Add contacts to notify..." placeholder="Add contacts to notify..."
class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/> class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
<div> <div>
<button icon="gtk-ok" name="send_mail" string="Post" type="object"/> <button name="send_mail" string="Post" type="object"/>
or <a href="#" class="oe_mail_compose_message_email">Send an Email</a> or <a href="#" class="oe_mail_compose_message_email">Send an Email</a>
</div> </div>
<div class='oe_mail_compose_message_icons'> <div class='oe_mail_compose_message_icons'>
<!-- <button icon="../../../../../mail/static/src/img/checklist"
type="object" name="checklist" string=""
help="Add a checklist"/> -->
<a href="#" class="oe_mail_compose_message_checklist"> <a href="#" class="oe_mail_compose_message_checklist">
<img src='/mail/static/src/img/checklist.png/' alt='Checklist' <img src='/mail/static/src/img/checklist.png/' alt='Checklist'
title='Add a checklist'/> title='Add a checklist'/>