From 8b400f7e883a0bcee2cd29c7539f786a084b40f5 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 22 Apr 2013 15:33:55 +0200
Subject: [IMP] remove many2many display and clean ups

bzr revid: mat@openerp.com-20130422133355-ffhglxrkdia2hz4j
---
 addons/gamification/static/src/xml/gamification.xml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'addons/gamification/static/src/xml/gamification.xml')

diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index e3782a7d22b..c83862af829 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -11,13 +11,12 @@
 
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <div class="oe_goals_list">
-                    <div class="oe_goal_outer_box" t-foreach="plan.goals" t-as="goal" t-attf-style="width: #{goal.completeness}%;">
+                    <div t-attf-class="#{goal.type_display == 'progress' ? 'oe_goal_outer_box' : ''}" t-foreach="plan.goals" t-as="goal" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : ''}">
                     <div class="oe_goal_inner_box">
-                        <!-- <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span> -->
-                        <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
+                        <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
                         <t t-if="goal.computation_mode == 'manually' or goal.type_action">
                             <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
-                        </t>
+                        </t><br/>
 
                         <t t-if="goal.type_display == 'progress'">
                             <t t-if="goal.type_condition == 'higher'">
@@ -38,11 +37,11 @@
                 </div>
             </t>
             <t t-if="plan.visibility_mode == 'board'">
-                <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
+                <table t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
                     <thead>
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
-                            <t t-esc="planline.type_name"/>
+                            <strong><t t-esc="planline.type_name"/></strong><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_computation_mode == 'manually' or planline.type_action">
                                 <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
@@ -55,11 +54,10 @@
                         <div style="background: #fff;">
                             <th class="col0"><t t-esc="goal.rank" /></th>
                             <td><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
-                            <td class="col1" style="width:200px;">
+                            <td class="col1" style="width:180px;">
                                 <div class="oe_goal_outer_box" t-attf-style="width: #{goal.completeness}%;">
                                 <div class="oe_goal_inner_box">
-                                    <!-- <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span> -->
-                                    <t t-esc="goal.user_name"/>
+                                    <t t-esc="goal.user_name"/><br/>
                                     <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
                                 </div>
                                 </div>
@@ -77,7 +75,7 @@
         <em>You have been invited to the following challenges:</em>
         <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_challenge">
             <li>
-                <strong><t t-esc="challenge.name"/></strong> <a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}">accept?</a>
+                <strong><a class="oe_challenge_reply" t-attf-title="#{challenge.description.value ? challenge.description.value : ''}" t-attf-id="{challenge.id}" title="more details..."><t t-esc="challenge.name"/></a></strong>
             </li>
         </ul>
     </t>
-- 
cgit v1.2.3