diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-04-23 15:20:34 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-04-23 15:20:34 +0200 |
| commit | 99505e351d8f3b38e2adc3bdfa5f09f0e58fb896 (patch) | |
| tree | 6c218f58d961ce140b71f83d1e07a20dad3ba952 /addons | |
| parent | 1419b2fa974e4fbad7294f87be03ab01a9417122 (diff) | |
[IMP] better kanban view
bzr revid: mat@openerp.com-20130423132034-fgblz5f4658n2i8g
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/gamification/badge_view.xml | 18 | ||||
| -rw-r--r-- | addons/gamification/static/src/css/goal.css | 4 |
2 files changed, 13 insertions, 9 deletions
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml index 6b7b4f2628b..8d4db8dff8e 100644 --- a/addons/gamification/badge_view.xml +++ b/addons/gamification/badge_view.xml @@ -140,16 +140,10 @@ <div t-attf-class="#{record.stat_my.raw_value ? 'oe_kanban_color_5' : 'oe_kanban_color_white'} oe_kanban_card oe_kanban_global_click oe_kanban_badge"> <div class="oe_kanban_content"> <div class="oe_kanban_left"> - <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="110" height="110" /></a> + <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="90" height="90" /></a> </div> - <div> + <div class="oe_no_overflow"> <h4><field name="name"/></h4> - <t t-if="record.description.value"> - <em><field name="description"/></em> - </t> - <p> - Total: <t t-esc="record.stat_count.raw_value"/> (<t t-esc="record.stat_this_month.raw_value"/> this month) - </p> <t t-if="record.remaining_sending.value != 0"> <button type="action" name="%(action_grant_wizard)d" class="oe_highlight">Grant</button> <span class="oe_grey"> @@ -164,8 +158,16 @@ <t t-if="record.remaining_sending.value == 0"> <div class="oe_grey">Can not grant</div> </t> + <p> + <strong>Stats</strong><br/> + Total: <t t-esc="record.stat_count.raw_value"/><br/> + This month: <t t-esc="record.stat_this_month.raw_value"/> + </p> </div> <div class="oe_kanban_badge_avatars"> + <t t-if="record.description.value"> + <p><em><field name="description"/></em></p> + </t> <a type="object" name="get_granted_employees"> <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner"> <img t-att-src="kanban_image('res.users', 'image_small', owner)" t-att-data-member_id="owner"/> diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index f4b064ef074..bf73a0273de 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -42,7 +42,9 @@ .oe_kanban_goal .oe_kanban_content .oe_goal_gauge svg { margin-top: -20px; } - +.openerp .oe_no_overflow { + overflow: hidden; +} .openerp .oe_red { color: red; } |