diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-04-24 14:33:50 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-04-24 14:33:50 +0200 |
| commit | 4bcaa718bd1f45c79a688c1a47d0a69cae0348ae (patch) | |
| tree | 442ae561a39aed547ce95b4a6f47f6fe7c3a50b9 | |
| parent | cc8d4ae4d49cb3102fd6ef069d8d82a02fad9403 (diff) | |
[IMP] display actions
bzr revid: mat@openerp.com-20130424123350-cgx663vd31vvnw7w
| -rw-r--r-- | addons/gamification/goal.py | 3 | ||||
| -rw-r--r-- | addons/gamification/static/src/css/goal.css | 3 | ||||
| -rw-r--r-- | addons/gamification/static/src/xml/gamification.xml | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py index ce830e93f06..3398f094a37 100644 --- a/addons/gamification/goal.py +++ b/addons/gamification/goal.py @@ -388,7 +388,8 @@ class gamification_goal(osv.Model): views = [(view_id, mode)] break action['views'] = views - action['target'] = 'new' + # doesn't seem to work if not in popup + action['target'] = 'new' return action if goal.computation_mode == 'manually': diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index bf73a0273de..1d9aee31500 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -153,7 +153,8 @@ font-size: 25px; } .openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan, -.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_inner_box:hover .oe_goal_action { +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_goal_action, +.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal th:hover > .oe_goal_action { visibility: visible; } .openerp .oe_mail_wall .oe_mail { diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml index 93f81247151..6d6edfbd49a 100644 --- a/addons/gamification/static/src/xml/gamification.xml +++ b/addons/gamification/static/src/xml/gamification.xml @@ -49,7 +49,13 @@ <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&</a> </t> <br/> - (Goal: max <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>) + <t t-if="planline.type_condition == 'higher'"> + (Goal: max + </t> + <t t-if="planline.type_condition == 'lower'"> + (Goal: min + </t> + <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>) </th> </tr> </thead> |