diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-03-25 17:52:35 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-03-25 17:52:35 +0100 |
| commit | bfcf26bf19610e70b41954ff4e2c3818c1e53a77 (patch) | |
| tree | e617b4467de4fc07705311cd77adc3504a14db04 /addons/gamification/static | |
| parent | 0aa973b9f024ebefaa2f2ec9f47060e721a5c54a (diff) | |
[IMP] use help to show goal description
bzr revid: mat@openerp.com-20130325165235-q0wwyrdfrak5utkr
Diffstat (limited to 'addons/gamification/static')
| -rw-r--r-- | addons/gamification/static/src/js/gamification.js | 8 | ||||
| -rw-r--r-- | addons/gamification/static/src/xml/gamification.xml | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js index 08b6155a4f1..01004d94edd 100644 --- a/addons/gamification/static/src/js/gamification.js +++ b/addons/gamification/static/src/js/gamification.js @@ -27,10 +27,10 @@ openerp.gamification = function(instance) { self.get_goal_todo_info(); }); }, - 'click a.oe_show_description': function(event) { - var goal_id = parseInt(event.currentTarget.id); - this.$el.find('.oe_type_description_'+goal_id).toggle(10); - }, + // 'click a.oe_show_description': function(event) { + // var goal_id = parseInt(event.currentTarget.id); + // this.$el.find('.oe_type_description_'+goal_id).toggle(10); + // }, 'click a.oe_goal_action': function(event) { var self = this; var goal_id = parseInt(event.currentTarget.id); diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml index 70a47eeb6df..d68b7320e90 100644 --- a/addons/gamification/static/src/xml/gamification.xml +++ b/addons/gamification/static/src/xml/gamification.xml @@ -5,17 +5,17 @@ <t t-name="gamification.goal_list_to_do"> <div t-foreach="widget.goals_info.info" t-as="plan"> <em><a class="oe_update_plan" rol="button" t-attf-id="{plan.id}">refresh</a></em> - <h3><t t-esc="plan.name"/></h3> + <h3><t t-esc="plan.name" /></h3> <t t-if="plan.visibility_mode == 'progressbar'"> <ul class="oe_goals_list"> <li t-foreach="plan.goals" t-as="goal"> - <a class="oe_goal_action" t-att-id="goal.id"> + <a class="oe_goal_action" t-att-id="goal.id" t-att-title="goal.type_description"> <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}"><t t-esc="goal.type_name" /></strong> </a> - <t t-if="goal.type_description"> + <!-- <t t-if="goal.type_description"> <a class="oe_show_description" t-att-id="goal.id">?</a> <p t-att-class="'oe_type_description oe_type_description_' + goal.id"><t t-esc="goal.type_description" /></p> - </t> + </t> --> <p> <t t-if="goal.type_condition == 'higher'"> <progress t-att-value="goal.completeness" max="100"/> @@ -33,7 +33,8 @@ <t t-if="plan.visibility_mode == 'board'"> <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline"> <tr> - <th colspan="4"><t t-esc="planline.goal_type"/></th> + <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}"><t t-esc="planline.type_name"/> + </th> </tr> <tr> <th>#</th> |