pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] crm,project,mail: css for alias

Browse Source 
bzr revid: chm@openerp.com-20130201115642-n1wijg4exsibju84
This commit is contained in:
Christophe Matthieu
2013-02-01 12:56:42 +01:00
parent ffa9a978c4
commit 18da8cdc5b
7 changed files with 60 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/__openerp__.py
+1
View File
@@ -116,6 +116,7 @@ Dashboard for CRM will include:
'test/ui/delete_lead.yml',
],
'css': ['static/src/css/crm.css'],
'js': ['static/src/js/crm.js'],
'installable': True,
'application': True,
'auto_install': False,
addons/crm/crm_salesteams.xml
+10 -21
View File
@@ -59,7 +59,7 @@
<field name="name">crm.case.section.kanban</field>
<field name="model">crm.case.section</field>
<field name="arch" type="xml">
<kanban version="7.0">
<kanban version="7.0" class="oe_background_grey">
<field name="name"/>
<field name="user_id"/>
<field name="member_ids"/>
@@ -70,29 +70,24 @@
<field name="number_opportunity"/>
<templates>
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_card oe_kanban_project oe_kanban_global_click oe_kanban_crm_salesteams" style="width:200px;">
<div t-attf-class="oe_kanban_card oe_kanban_crm_salesteams oe_kanban_global_click oe_kanban_crm_salesteams" style="width:220px;">
<div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
<span class="oe_e">í</span>
<ul class="oe_dropdown_menu">
<t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Project Settings</a></li></t>
<t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Sales Teams Settings</a></li></t>
<t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
</ul>
</div>
<div class="oe_kanban_content">
<h4>
<field name="name"/>
<div class="oe_kanban_crm_salesteams_leader">
<small>
<t t-if="record.user_id.raw_value">(<field name="user_id"/>)</t>
<t t-if="!record.user_id.raw_value"><br/></t>
</small>
</div>
</h4>
<h4><field name="name"/></h4>
<div class="oe_kanban_crm_salesteams_alias" t-if="record.alias_id.raw_value and record.alias_id.value.match(/@.+/)">
<span class="oe_e">%%</span><small><field name="alias_id"/></small>
</div>
<div class="oe_kanban_crm_salesteams_list">
<a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">
<a name="%(crm_case_form_view_salesteams_opportunity)d" type="action" style="margin-right: 10px">
<field name="number_opportunity"/>
<t t-if="record.number_opportunity.raw_value &gt; 1">Opportunities</t><t t-if="record.number_opportunity.raw_value &lt;= 1">Opportunity</t></a>,
<a name="%(crm_case_form_view_salesteams_lead)d" type="action">
<t t-if="record.number_opportunity.raw_value &gt; 1">Opportunities</t><t t-if="record.number_opportunity.raw_value &lt;= 1">Opportunity</t></a>
<a name="%(crm_case_form_view_salesteams_lead)d" type="action" style="margin-right: 10px">
<field name="number_lead"/>
<t t-if="record.number_lead.raw_value &gt; 1">Leads</t><t t-if="record.number_lead.raw_value &lt;= 1">Lead</t></a>
</div>
@@ -101,12 +96,6 @@
<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
</t>
</div>
<t t-if="record.alias_domain.raw_value">
<br/>
<small style="position: absolute; bottom: 5px;">
<field name="alias_id"/>
</small>
</t>
</div>
</div>
</t>
addons/crm/static/src/css/crm.css
+17
View File
@@ -19,4 +19,21 @@
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
}
.oe_kanban_crm_salesteams_alias {
margin: -8px 0 8px 0;
}
.oe_kanban_crm_salesteams_alias .oe_e {
font-size: 30px;
line-height: 6px;
vertical-align: top;
margin-right: 3px;
color: white;
text-shadow: 0px 0px 2px rgba(0, 0, 0, 1);
float: left;
}
.oe_kanban_crm_salesteams_alias small {
display: block;
margin-left: 20px;
}
addons/crm/static/src/js/crm.js
+11
View File
@@ -0,0 +1,11 @@
openerp.crm = function(openerp) {
openerp.web_kanban.KanbanRecord.include({
on_card_clicked: function() {
if (this.view.dataset.model === 'crm.case.section') {
this.$('.oe_kanban_crm_salesteams_list a').first().click();
} else {
this._super.apply(this, arguments);
}
},
});
};
addons/mail/mail_group_view.xml
+1 -2
View File
@@ -75,11 +75,10 @@
<label for="name" string="Group Name"/>
</div>
<h1><field name="name" readonly="0"/></h1>
<div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
<field name="alias_id" invisible="1" required="0"/>
<label for="alias_name" class="oe_edit_only"/>
<field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
<field name="alias_name" nolabel="1" class="oe_inline" style="padding-right:0;" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline" style="padding-left:0;"/>
</div>
</div>
<field name="description" placeholder="Topics discussed in this group..."/>
addons/project/project_view.xml
+3 -7
View File
@@ -246,8 +246,10 @@
</ul>
</div>
<div class="oe_kanban_content">
<h4><field name="name"/></h4>
<div class="oe_kanban_project_alias" t-if="record.alias_id.raw_value and record.alias_id.value.match(/@.+/)">
<span class="oe_e">%%</span><small><field name="alias_id"/></small>
</div>
<div class="oe_kanban_project_list">
<a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px">
<span t-if="record.task_count.raw_value gt 1"><field name="task_count"/> Tasks</span>
@@ -272,12 +274,6 @@
<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
</t>
</div>
<t t-if="record.alias_domain.raw_value">
<br/>
<small style="position: absolute; bottom: 5px;">
<field name="alias_id"/>
</small>
</t>
</div>
</div>
</t>
addons/project/static/src/css/project.css
+17
View File
@@ -62,4 +62,21 @@
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
}
.oe_kanban_project_alias {
margin: -8px 0 8px 0;
}
.oe_kanban_project_alias .oe_e {
font-size: 30px;
line-height: 6px;
vertical-align: top;
margin-right: 3px;
color: white;
text-shadow: 0px 0px 2px rgba(0, 0, 0, 1);
float: left;
}
.oe_kanban_project_alias small {
display: block;
margin-left: 20px;
}