diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-03-02 18:25:40 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-03-02 18:25:40 +0100 |
| commit | 9cf6786e758e4e330d8f566b26a8a7a4db6ba687 (patch) | |
| tree | 0c19c2c847192495ad1e665f3c806bb72d45cf2e /addons/project/project_view.xml | |
| parent | 7c8d295a40ccf189a8d9211731a1e4171815cbc8 (diff) | |
| parent | fefb29897272bf0fe6a6e8aca98b1e2c88ae6af5 (diff) | |
[MERGE] forward port of branch saas-6 up to fefb298
Diffstat (limited to 'addons/project/project_view.xml')
| -rw-r--r-- | addons/project/project_view.xml | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 01aaf42e378..7ed6f0593c9 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -258,7 +258,7 @@ <field name="doc_count"/> <templates> <t t-name="kanban-box"> - <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click"> + <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click oe_kanban_no_auto_height"> <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user"> <i class="fa fa-bars fa-lg"/> <ul class="oe_dropdown_menu"> @@ -268,7 +268,7 @@ </ul> </div> <div class="oe_project_kanban_content"> - <div class="row"> + <div class="oe_kanban_content"> <h4 class="text-center"> <field name="name"/> </h4> @@ -279,26 +279,28 @@ </div> </div> <div class="row oe_margin_top_8 oe_kanban_project_list"> - <div class="col-md-6"> - <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> + <div t-if="record.use_tasks.raw_value" class="col-md-6"> + <a name="%(act_project_project_2_project_task_all)d" type="action"> <t t-raw="record.task_count.raw_value" /> <field name="label_tasks"/> </a> </div> - <div class="col-md-6"> - <a t-if="record.doc_count.raw_value" name="attachment_tree_view" type="object"> - <field name="doc_count"/> Documents - </a> - </div> - <div t-if="record.use_tasks.raw_value and record.task_count.raw_value lt 1" class="col-md-12"> + <div t-if="record.use_tasks.raw_value and record.task_count.raw_value == 0" class="col-md-12"> <img src="/project/static/src/img/top_left_arrow.png" style="margin-top: -8px; width: 22px;" /> <span>No activity yet, click to enter in the project.</span> </div> + <div t-if="record.doc_count.raw_value" class="col-md-6"> + <a name="attachment_tree_view" type="object"> + <field name="doc_count"/> Documents + </a> + </div> </div> - <div class="oe_margin_top_8 oe_kanban_project_avatars"> - <t t-foreach="record.members.raw_value.slice(0,12)" t-as="member"> - <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/> - </t> + <div class="row oe_margin_top_8 oe_kanban_project_avatars"> + <div class="col-md-12"> + <t t-foreach="record.members.raw_value.slice(0,12)" t-as="member"> + <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/> + </t> + </div> </div> <div class="clearfix"/> </div> @@ -729,7 +731,7 @@ <field name="legend_priority" nolabel="1"/> <p class="text-muted" colspan="2"> - You can also add a description to help your coworkers understanding the meaning and purpose of the stage. + You can also add a description to help your coworkers understand the meaning and purpose of the stage. </p> <field name="description" placeholder="Add a description..." nolabel="1" colspan="2"/> </group> |