From 24edc5615ba7e20f465e4b1b8e11fcabb81fdb79 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Mar 2013 12:01:52 +0100
Subject: [ADD] basic widget for goal list

bzr revid: mat@openerp.com-20130321110152-0wa9b3uuyk2qvk0d
---
 .../gamification/static/src/xml/gamification.xml   | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 addons/gamification/static/src/xml/gamification.xml

(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
new file mode 100644
index 00000000000..6ee32e0c9e2
--- /dev/null
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-extend="mail.Root">
+        <t t-jquery="div" t-operation="after">
+            <div class="oe_user_sidebar" />
+        </t>
+    </t>
+    <t t-name="user_wall">
+        <div class="oe_gamification_goal"/>
+    </t>
+    <t t-name="goal_list_to_do">
+        <div t-foreach="widget.goals_info.info" t-as="plan">
+            <h3><t t-esc="plan.name"/></h3>
+            <ul class="oe_goals_list">
+                <li t-foreach="plan.goals" t-as="goal">
+                    <strong><t t-esc="goal.type_name" /></strong>
+                    <t t-if="goal.type_description">
+                        <p><t t-esc="goal.type_description" /></p>
+                    </t>
+                    <p><progress t-att-value="goal.completeness" max="100"/></p>
+                    <t t-if="goal.computation_mode == 'manually'">
+                        <a href="#">done!</a>
+                    </t>
+                </li>
+            </ul>
+        </div>
+    </t>
+
+</templates>
-- 
cgit v1.2.3


From c4f2c671839c5d1d5b2922724c01d5d170aa0639 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 21 Mar 2013 17:48:02 +0100
Subject: [IMP] goal look based on state

bzr revid: mat@openerp.com-20130321164802-qzndxa29utwxtdoh
---
 addons/gamification/static/src/xml/gamification.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(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 6ee32e0c9e2..2b3934d1181 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -13,7 +13,9 @@
             <h3><t t-esc="plan.name"/></h3>
             <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
-                    <strong><t t-esc="goal.type_name" /></strong>
+                    <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}">
+                        <t t-esc="goal.type_name" />
+                    </strong>
                     <t t-if="goal.type_description">
                         <p><t t-esc="goal.type_description" /></p>
                     </t>
-- 
cgit v1.2.3


From f691d138103ec351be61855d226239d47054b7d4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Mar 2013 09:51:51 +0100
Subject: [IMP] skip plans with all goals finished

bzr revid: mat@openerp.com-20130322085151-r6sse6383z6ya9by
---
 addons/gamification/static/src/xml/gamification.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 2b3934d1181..64568403ab8 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -6,7 +6,7 @@
         </t>
     </t>
     <t t-name="user_wall">
-        <div class="oe_gamification_goal"/>
+        <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <t t-name="goal_list_to_do">
         <div t-foreach="widget.goals_info.info" t-as="plan">
-- 
cgit v1.2.3


From 80541abdbf27d77014dec403d562f616408061c5 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Mar 2013 12:13:44 +0100
Subject: [IMP] update button with refresh

bzr revid: mat@openerp.com-20130322111344-7qs3o2tvbx7h4qln
---
 addons/gamification/static/src/xml/gamification.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 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 64568403ab8..c47e5896a83 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -19,10 +19,17 @@
                     <t t-if="goal.type_description">
                         <p><t t-esc="goal.type_description" /></p>
                     </t>
-                    <p><progress t-att-value="goal.completeness" max="100"/></p>
-                    <t t-if="goal.computation_mode == 'manually'">
-                        <a href="#">done!</a>
-                    </t>
+                    <p>
+                        <t t-if="goal.type_condition == 'higher'">
+                            <progress t-att-value="goal.completeness" max="100"/>
+                        </t>
+                        <t t-if="goal.type_condition == 'lower'">
+                            <t t-esc="goal.current" /> (less than <t t-esc="goal.target_goal"/>)
+                        </t>
+                        <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
+                            <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMWCRMG1/sI6gAAAR1JREFUKM910T9L1nEUBfCPP39S4pAuba0FDoEhbc6CLkEUvQMb7hKFDU29gCYPNFUoiH9WRwedhBB8CS1Bg7WEKKH12PJ94GnoTJfDOece7h3TkGQCk+hxVVVnjZ/Gz6q6TqJLMvTcxRG+4l0T38MXPE0yVlW6qhoa5jCLG/jQuEXM4BOWk+hb0n2sYQVdVX1uhvc4xRbe4rBPMo4n+I7NqroYqXmFXTzEC9zpcbOt3m8CIzVhkGSvGR50GMdtDPwfZzjHoGvCUyygH9YZqQW3MIXjHr9wgFU8axdRVZJMocNjHONbV1W/sYMf+Ig3SSZb8kts4xFeV9VF19JO8GpEdNnmFSxhv6oO8M+n1zGP51X1J8lsS1/FRpIe/gIpymSOkJCtuQAAAABJRU5ErkJggg==" alt="update" />
+                        </a>
+                    </p>
                 </li>
             </ul>
         </div>
-- 
cgit v1.2.3


From 391947f7cc94c237d05f970872fdbec02f56fc65 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Mar 2013 16:18:03 +0100
Subject: [IMP] using sidebar and better javascript

bzr revid: mat@openerp.com-20130322151803-nzb41s0mxvaidrel
---
 addons/gamification/static/src/xml/gamification.xml | 12 +++---------
 1 file changed, 3 insertions(+), 9 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 c47e5896a83..5ce77e9835c 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -1,14 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates id="template" xml:space="preserve">
-    <t t-extend="mail.Root">
-        <t t-jquery="div" t-operation="after">
-            <div class="oe_user_sidebar" />
-        </t>
-    </t>
-    <t t-name="user_wall">
+<templates>
+    <t t-name="gamification.user_wall_sidebar" class="oe_gamification_user_wall_sidebar">
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
-    <t t-name="goal_list_to_do">
+    <t t-name="gamification.goal_list_to_do">
         <div t-foreach="widget.goals_info.info" t-as="plan">
             <h3><t t-esc="plan.name"/></h3>
             <ul class="oe_goals_list">
-- 
cgit v1.2.3


From 0b0ecfa3f8474480e850fec7a64c6cd5207054e6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Mar 2013 16:41:30 +0100
Subject: [IMP] css width for kanban badge

bzr revid: mat@openerp.com-20130322154130-nmudmkp5vskcgxol
---
 addons/gamification/static/src/xml/gamification.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(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 5ce77e9835c..8e548c17bfe 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -9,9 +9,10 @@
                 <li t-foreach="plan.goals" t-as="goal">
                     <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}">
                         <t t-esc="goal.type_name" />
+                        <a class="oe_">?</a>
                     </strong>
                     <t t-if="goal.type_description">
-                        <p><t t-esc="goal.type_description" /></p>
+                        <p class="oe_type_description"><t t-esc="goal.type_description" /></p>
                     </t>
                     <p>
                         <t t-if="goal.type_condition == 'higher'">
-- 
cgit v1.2.3


From 632a9d4bcbd89398e9d165422a35779902552039 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 22 Mar 2013 17:05:20 +0100
Subject: [IMP] show description button

bzr revid: mat@openerp.com-20130322160520-pq9eaoqtnsvwvj7d
---
 addons/gamification/static/src/xml/gamification.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 8e548c17bfe..768000ba74e 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -9,10 +9,10 @@
                 <li t-foreach="plan.goals" t-as="goal">
                     <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}">
                         <t t-esc="goal.type_name" />
-                        <a class="oe_">?</a>
                     </strong>
                     <t t-if="goal.type_description">
-                        <p class="oe_type_description"><t t-esc="goal.type_description" /></p>
+                        <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>
                     <p>
                         <t t-if="goal.type_condition == 'higher'">
-- 
cgit v1.2.3


From 02725e359daca7936b0b3a8109ecf1f16f98032b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Sun, 24 Mar 2013 14:46:58 +0100
Subject: [FIX] call correct method for cron

bzr revid: mat@openerp.com-20130324134658-0kx6v1st048gkm1r
---
 addons/gamification/static/src/xml/gamification.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 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 768000ba74e..2019a9f86c8 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -7,9 +7,9 @@
             <h3><t t-esc="plan.name"/></h3>
             <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
-                    <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}">
-                        <t t-esc="goal.type_name" />
-                    </strong>
+                    <a class="oe_goal_action" t-att-id="goal.id">
+                        <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">
                         <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>
-- 
cgit v1.2.3


From 364612d0be52e6677a26f8a083d58b52d81c7f0a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 25 Mar 2013 16:39:53 +0100
Subject: [IMP] use board view for sidebar

bzr revid: mat@openerp.com-20130325153953-zch12sfx62s5i6xc
---
 .../gamification/static/src/xml/gamification.xml   | 25 ++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 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 2019a9f86c8..be287bdccaf 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -5,7 +5,8 @@
     <t t-name="gamification.goal_list_to_do">
         <div t-foreach="widget.goals_info.info" t-as="plan">
             <h3><t t-esc="plan.name"/></h3>
-            <ul class="oe_goals_list">
+            <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">
                         <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}"><t t-esc="goal.type_name" /></strong>
@@ -26,7 +27,27 @@
                         </a>
                     </p>
                 </li>
-            </ul>
+                </ul>
+            </t>
+            <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>
+                    </tr>
+                    <tr>
+                        <th>#</th>
+                        <th>Pers.</th>
+                        <th>compl.</th>
+                        <th>Current</th>
+                    </tr>
+                    <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.completness >= 100 ? 'oe_bold' : ''}">
+                        <td><t t-esc="goal.rank" /></td>
+                        <td><t t-esc="goal.user_name" /></td>
+                        <td><progress t-att-value="goal.completeness" max="100" /></td>
+                        <td><t t-esc="goal.current" />/<t t-esc="goal.target_goal" /></td>
+                    </tr>
+                </table>
+            </t>
         </div>
     </t>
 
-- 
cgit v1.2.3


From 0aa973b9f024ebefaa2f2ec9f47060e721a5c54a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 25 Mar 2013 17:15:27 +0100
Subject: [IMP] refresh button for plan

bzr revid: mat@openerp.com-20130325161527-qes3lqpzevdmdsx6
---
 addons/gamification/static/src/xml/gamification.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 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 be287bdccaf..70a47eeb6df 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -4,6 +4,7 @@
     </t>
     <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>
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <ul class="oe_goals_list">
@@ -22,9 +23,9 @@
                         <t t-if="goal.type_condition == 'lower'">
                             <t t-esc="goal.current" /> (less than <t t-esc="goal.target_goal"/>)
                         </t>
-                        <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
+                        <!-- <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
                             <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMWCRMG1/sI6gAAAR1JREFUKM910T9L1nEUBfCPP39S4pAuba0FDoEhbc6CLkEUvQMb7hKFDU29gCYPNFUoiH9WRwedhBB8CS1Bg7WEKKH12PJ94GnoTJfDOece7h3TkGQCk+hxVVVnjZ/Gz6q6TqJLMvTcxRG+4l0T38MXPE0yVlW6qhoa5jCLG/jQuEXM4BOWk+hb0n2sYQVdVX1uhvc4xRbe4rBPMo4n+I7NqroYqXmFXTzEC9zpcbOt3m8CIzVhkGSvGR50GMdtDPwfZzjHoGvCUyygH9YZqQW3MIXjHr9wgFU8axdRVZJMocNjHONbV1W/sYMf+Ig3SSZb8kts4xFeV9VF19JO8GpEdNnmFSxhv6oO8M+n1zGP51X1J8lsS1/FRpIe/gIpymSOkJCtuQAAAABJRU5ErkJggg==" alt="update" />
-                        </a>
+                        </a> -->
                     </p>
                 </li>
                 </ul>
-- 
cgit v1.2.3


From bfcf26bf19610e70b41954ff4e2c3818c1e53a77 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 25 Mar 2013 17:52:35 +0100
Subject: [IMP] use help to show goal description

bzr revid: mat@openerp.com-20130325165235-q0wwyrdfrak5utkr
---
 addons/gamification/static/src/xml/gamification.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 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>
-- 
cgit v1.2.3


From 635df4028a8cf9d5185e31d21df67daf609506b3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 26 Mar 2013 16:45:53 +0100
Subject: [ADD] monetary field

bzr revid: mat@openerp.com-20130326154553-t8cacle6s1oll4r9
---
 .../gamification/static/src/xml/gamification.xml   | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 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 d68b7320e90..bbd005e5c2a 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -9,19 +9,25 @@
             <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" 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>
+                    <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>
+                    <t t-if="goal.computation_mode == 'manually'">
+                        <a class="oe_goal_action" t-att-id="goal.id">modify</a>
+                    </t>
                     <!-- <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> -->
                     <p>
                         <t t-if="goal.type_condition == 'higher'">
+                            <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                            <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
                             <progress t-att-value="goal.completeness" max="100"/>
                         </t>
                         <t t-if="goal.type_condition == 'lower'">
-                            <t t-esc="goal.current" /> (less than <t t-esc="goal.target_goal"/>)
+                            <t t-esc="goal.current" /> (less than 
+                                <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                            )
                         </t>
                         <!-- <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
                             <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMWCRMG1/sI6gAAAR1JREFUKM910T9L1nEUBfCPP39S4pAuba0FDoEhbc6CLkEUvQMb7hKFDU29gCYPNFUoiH9WRwedhBB8CS1Bg7WEKKH12PJ94GnoTJfDOece7h3TkGQCk+hxVVVnjZ/Gz6q6TqJLMvTcxRG+4l0T38MXPE0yVlW6qhoa5jCLG/jQuEXM4BOWk+hb0n2sYQVdVX1uhvc4xRbe4rBPMo4n+I7NqroYqXmFXTzEC9zpcbOt3m8CIzVhkGSvGR50GMdtDPwfZzjHoGvCUyygH9YZqQW3MIXjHr9wgFU8axdRVZJMocNjHONbV1W/sYMf+Ig3SSZb8kts4xFeV9VF19JO8GpEdNnmFSxhv6oO8M+n1zGP51X1J8lsS1/FRpIe/gIpymSOkJCtuQAAAABJRU5ErkJggg==" alt="update" />
@@ -33,7 +39,11 @@
             <t t-if="plan.visibility_mode == 'board'">
                 <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline">
                     <tr>
-                    <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}"><t t-esc="planline.type_name"/>
+                        <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
+                            <t t-esc="planline.type_name"/>
+                            <t t-if="planline.type_computation_mode == 'manually'">
+                                <a class="oe_goal_action" t-att-id="goal.id">modify</a>
+                            </t>
                         </th>
                     </tr>
                     <tr>
@@ -46,7 +56,10 @@
                         <td><t t-esc="goal.rank" /></td>
                         <td><t t-esc="goal.user_name" /></td>
                         <td><progress t-att-value="goal.completeness" max="100" /></td>
-                        <td><t t-esc="goal.current" />/<t t-esc="goal.target_goal" /></td>
+                        <td>
+                            <t t-esc="goal.current" />/<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                            <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
+                        </td>
                     </tr>
                 </table>
             </t>
-- 
cgit v1.2.3


From 6674de3e04d258d9408034f15270ac98f4e31c9e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 26 Mar 2013 17:43:15 +0100
Subject: [IMP] better css

bzr revid: mat@openerp.com-20130326164315-c917of9zp771loz0
---
 addons/gamification/static/src/xml/gamification.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 bbd005e5c2a..31664f4c4f4 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -37,7 +37,8 @@
                 </ul>
             </t>
             <t t-if="plan.visibility_mode == 'board'">
-                <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline">
+                <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline" class="oe_list_content">
+                    <thead>
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <t t-esc="planline.type_name"/>
@@ -52,8 +53,10 @@
                         <th>compl.</th>
                         <th>Current</th>
                     </tr>
+                    </thead>
+                    <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.completness >= 100 ? 'oe_bold' : ''}">
-                        <td><t t-esc="goal.rank" /></td>
+                        <th><t t-esc="goal.rank" /></th>
                         <td><t t-esc="goal.user_name" /></td>
                         <td><progress t-att-value="goal.completeness" max="100" /></td>
                         <td>
@@ -61,6 +64,7 @@
                             <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
                         </td>
                     </tr>
+                </tbody>
                 </table>
             </t>
         </div>
-- 
cgit v1.2.3


From b08a2f2bbc8f615b778ec75e4b8f410626c52800 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Mar 2013 11:50:40 +0100
Subject: [ADD] user defined action for goal update

bzr revid: mat@openerp.com-20130327105040-ezlg1ml0xvoe5z58
---
 addons/gamification/static/src/xml/gamification.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 31664f4c4f4..6eca4093084 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -10,7 +10,7 @@
                 <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
                     <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>
-                    <t t-if="goal.computation_mode == 'manually'">
+                    <t t-if="goal.computation_mode == 'manually' or goal.type_action">
                         <a class="oe_goal_action" t-att-id="goal.id">modify</a>
                     </t>
                     <!-- <t t-if="goal.type_description">
@@ -42,7 +42,7 @@
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <t t-esc="planline.type_name"/>
-                            <t t-if="planline.type_computation_mode == 'manually'">
+                            <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
                                 <a class="oe_goal_action" t-att-id="goal.id">modify</a>
                             </t>
                         </th>
-- 
cgit v1.2.3


From c7fc486809cfda927699efeed005dcb764f937c4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Mar 2013 12:16:36 +0100
Subject: [FIX] correct goal id action buttons

bzr revid: mat@openerp.com-20130327111636-dbg162rd4pvgok0k
---
 addons/gamification/static/src/xml/gamification.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 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 6eca4093084..481330b7aaa 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -6,6 +6,7 @@
         <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>
+
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
@@ -43,7 +44,7 @@
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <t t-esc="planline.type_name"/>
                             <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
-                                <a class="oe_goal_action" t-att-id="goal.id">modify</a>
+                                <a class="oe_goal_action" t-att-id="planline.own_goal_id">modify</a>
                             </t>
                         </th>
                     </tr>
@@ -55,7 +56,7 @@
                     </tr>
                     </thead>
                     <tbody>
-                    <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.completness >= 100 ? 'oe_bold' : ''}">
+                    <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <th><t t-esc="goal.rank" /></th>
                         <td><t t-esc="goal.user_name" /></td>
                         <td><progress t-att-value="goal.completeness" max="100" /></td>
-- 
cgit v1.2.3


From 6c20a6a5277ec47258aba04da109c4259522987d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Mar 2013 14:27:06 +0100
Subject: [IMP] css tweaks

bzr revid: mat@openerp.com-20130327132706-bqw9h1oqzh09bj50
---
 addons/gamification/static/src/xml/gamification.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 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 481330b7aaa..06dc0292ccd 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -58,9 +58,9 @@
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <th><t t-esc="goal.rank" /></th>
-                        <td><t t-esc="goal.user_name" /></td>
-                        <td><progress t-att-value="goal.completeness" max="100" /></td>
-                        <td>
+                        <td class="col1"><t t-esc="goal.user_name" /></td>
+                        <td class="col2"><progress t-att-value="goal.completeness" max="100" /></td>
+                        <td class="col3">
                             <t t-esc="goal.current" />/<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                             <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
                         </td>
-- 
cgit v1.2.3


From 84b2b3411ac27aafc15c55c0d6c0c76416375df4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 12:52:15 +0100
Subject: [IMP] render progressbar

bzr revid: mat@openerp.com-20130329115215-bpm450x04kp0os9z
---
 addons/gamification/static/src/xml/gamification.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 06dc0292ccd..fd607fd09f1 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -22,7 +22,7 @@
                         <t t-if="goal.type_condition == 'higher'">
                             <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                             <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                            <progress t-att-value="goal.completeness" max="100"/>
+                            <progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/>
                         </t>
                         <t t-if="goal.type_condition == 'lower'">
                             <t t-esc="goal.current" /> (less than 
@@ -59,7 +59,7 @@
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <th><t t-esc="goal.rank" /></th>
                         <td class="col1"><t t-esc="goal.user_name" /></td>
-                        <td class="col2"><progress t-att-value="goal.completeness" max="100" /></td>
+                        <td class="col2"><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100" /></td>
                         <td class="col3">
                             <t t-esc="goal.current" />/<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                             <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
-- 
cgit v1.2.3


From 00d76ef66600e5127175b6e5e1dc19b434453ad6 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 14:14:54 +0100
Subject: [IMP] template and css

bzr revid: mat@openerp.com-20130329131454-1eyyt4mw75p1s6i2
---
 addons/gamification/static/src/xml/gamification.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 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 fd607fd09f1..9dfebe14f62 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -18,22 +18,24 @@
                         <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> -->
-                    <p>
-                        <t t-if="goal.type_condition == 'higher'">
+                    <t t-if="goal.type_condition == 'higher'">
+                        <p>
                             <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                             <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                            <progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/>
-                        </t>
-                        <t t-if="goal.type_condition == 'lower'">
+                        </p>
+                        <p><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/></p>
+                    </t>
+                    <t t-if="goal.type_condition == 'lower'">
+                        <p>
                             <t t-esc="goal.current" /> (less than 
                                 <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                                 <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
                             )
-                        </t>
+                        </p>
+                    </t>
                         <!-- <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
                             <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMWCRMG1/sI6gAAAR1JREFUKM910T9L1nEUBfCPP39S4pAuba0FDoEhbc6CLkEUvQMb7hKFDU29gCYPNFUoiH9WRwedhBB8CS1Bg7WEKKH12PJ94GnoTJfDOece7h3TkGQCk+hxVVVnjZ/Gz6q6TqJLMvTcxRG+4l0T38MXPE0yVlW6qhoa5jCLG/jQuEXM4BOWk+hb0n2sYQVdVX1uhvc4xRbe4rBPMo4n+I7NqroYqXmFXTzEC9zpcbOt3m8CIzVhkGSvGR50GMdtDPwfZzjHoGvCUyygH9YZqQW3MIXjHr9wgFU8axdRVZJMocNjHONbV1W/sYMf+Ig3SSZb8kts4xFeV9VF19JO8GpEdNnmFSxhv6oO8M+n1zGP51X1J8lsS1/FRpIe/gIpymSOkJCtuQAAAABJRU5ErkJggg==" alt="update" />
                         </a> -->
-                    </p>
                 </li>
                 </ul>
             </t>
-- 
cgit v1.2.3


From f70b0017f63fa9baef330e05e67517d2127e798e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 10 Apr 2013 12:14:54 +0200
Subject: [IMP] fixing and UI

bzr revid: mat@openerp.com-20130410101454-nkt8mbt8qb13zrge
---
 addons/gamification/static/src/xml/gamification.xml | 5 +----
 1 file changed, 1 insertion(+), 4 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 9dfebe14f62..3a068dab045 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -10,14 +10,11 @@
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
+                    <span class="oe_goal_sparkline_piechart"></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>
                     <t t-if="goal.computation_mode == 'manually' or goal.type_action">
                         <a class="oe_goal_action" t-att-id="goal.id">modify</a>
                     </t>
-                    <!-- <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 t-if="goal.type_condition == 'higher'">
                         <p>
                             <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-- 
cgit v1.2.3


From b18bc579197837ddcc97d9f7292d8cec3bc05d49 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 17:21:50 +0200
Subject: [ADD] use sparklines

bzr revid: mat@openerp.com-20130412152150-8679huigt6cfmool
---
 .../gamification/static/src/xml/gamification.xml   | 45 ++++++++++++----------
 1 file changed, 24 insertions(+), 21 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 3a068dab045..540cd2287ac 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -10,29 +10,28 @@
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
-                    <span class="oe_goal_sparkline_piechart"></span>
+                    <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>
                     <t t-if="goal.computation_mode == 'manually' or goal.type_action">
                         <a class="oe_goal_action" t-att-id="goal.id">modify</a>
                     </t>
-                    <t t-if="goal.type_condition == 'higher'">
-                        <p>
-                            <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                            <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                        </p>
-                        <p><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/></p>
-                    </t>
-                    <t t-if="goal.type_condition == 'lower'">
-                        <p>
-                            <t t-esc="goal.current" /> (less than 
-                                <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                    <t t-if="!goal.type_ponctual">
+                        <t t-if="goal.type_condition == 'higher'">
+                            <p>
+                                <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                                 <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                            )
-                        </p>
+                            </p>
+                            <!-- <p><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/></p> -->
+                        </t>
+                        <t t-if="goal.type_condition == 'lower'">
+                            <p>
+                                <t t-esc="goal.current" /> (less than 
+                                    <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                    <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                )
+                            </p>
+                        </t>
                     </t>
-                        <!-- <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
-                            <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMWCRMG1/sI6gAAAR1JREFUKM910T9L1nEUBfCPP39S4pAuba0FDoEhbc6CLkEUvQMb7hKFDU29gCYPNFUoiH9WRwedhBB8CS1Bg7WEKKH12PJ94GnoTJfDOece7h3TkGQCk+hxVVVnjZ/Gz6q6TqJLMvTcxRG+4l0T38MXPE0yVlW6qhoa5jCLG/jQuEXM4BOWk+hb0n2sYQVdVX1uhvc4xRbe4rBPMo4n+I7NqroYqXmFXTzEC9zpcbOt3m8CIzVhkGSvGR50GMdtDPwfZzjHoGvCUyygH9YZqQW3MIXjHr9wgFU8axdRVZJMocNjHONbV1W/sYMf+Ig3SSZb8kts4xFeV9VF19JO8GpEdNnmFSxhv6oO8M+n1zGP51X1J8lsS1/FRpIe/gIpymSOkJCtuQAAAABJRU5ErkJggg==" alt="update" />
-                        </a> -->
                 </li>
                 </ul>
             </t>
@@ -42,6 +41,7 @@
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <t t-esc="planline.type_name"/>
+                            (Goal: <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" t-att-id="planline.own_goal_id">modify</a>
                             </t>
@@ -50,19 +50,22 @@
                     <tr>
                         <th>#</th>
                         <th>Pers.</th>
-                        <th>compl.</th>
-                        <th>Current</th>
+                        <th>current</th>
                     </tr>
                     </thead>
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <th><t t-esc="goal.rank" /></th>
                         <td class="col1"><t t-esc="goal.user_name" /></td>
-                        <td class="col2"><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100" /></td>
+                        <td class="col2">
+                            <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span>
+                            <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>
+                        </td>
+<!--                             <progress class="oe_goal_progress" t-att-value="goal.completeness" max="100" /></td>
                         <td class="col3">
                             <t t-esc="goal.current" />/<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                             <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
-                        </td>
+                        </td> -->
                     </tr>
                 </tbody>
                 </table>
-- 
cgit v1.2.3


From f8f4734cff3132b2362810d52d213221198ede6c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 17:24:51 +0200
Subject: [IMP] goal data are ponctual

bzr revid: mat@openerp.com-20130412152451-8rt8le5kmm5yv8hw
---
 addons/gamification/static/src/xml/gamification.xml | 1 +
 1 file changed, 1 insertion(+)

(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 540cd2287ac..42e95cf44df 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -46,6 +46,7 @@
                                 <a class="oe_goal_action" t-att-id="planline.own_goal_id">modify</a>
                             </t>
                         </th>
+                        <th></th><th></th>
                     </tr>
                     <tr>
                         <th>#</th>
-- 
cgit v1.2.3


From 7b8b0ed4672690dd4346236ec1a42e6815193c9f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 15 Apr 2013 16:04:01 +0200
Subject: [IMP] adding features

bzr revid: mat@openerp.com-20130415140401-qzg3f0lz2i9b6kki
---
 addons/gamification/static/src/xml/gamification.xml | 3 +--
 1 file changed, 1 insertion(+), 2 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 42e95cf44df..27e726697ca 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -41,12 +41,11 @@
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <t t-esc="planline.type_name"/>
-                            (Goal: <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>)
+                            (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" t-att-id="planline.own_goal_id">modify</a>
                             </t>
                         </th>
-                        <th></th><th></th>
                     </tr>
                     <tr>
                         <th>#</th>
-- 
cgit v1.2.3


From 0222ae2a211667f9f38e173ff3211615cd5dc7af Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 15 Apr 2013 17:50:14 +0200
Subject: [IMP] better data

bzr revid: mat@openerp.com-20130415155014-y6bdafhnmb5g7kqj
---
 addons/gamification/static/src/xml/gamification.xml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 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 27e726697ca..ff0c6056172 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -3,8 +3,8 @@
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <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>
+        <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
+            <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
             <h3><t t-esc="plan.name" /></h3>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
@@ -13,7 +13,7 @@
                     <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>
                     <t t-if="goal.computation_mode == 'manually' or goal.type_action">
-                        <a class="oe_goal_action" t-att-id="goal.id">modify</a>
+                        <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
                     </t>
                     <t t-if="!goal.type_ponctual">
                         <t t-if="goal.type_condition == 'higher'">
@@ -43,7 +43,7 @@
                             <t t-esc="planline.type_name"/>
                             (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" t-att-id="planline.own_goal_id">modify</a>
+                                <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
                             </t>
                         </th>
                     </tr>
@@ -61,11 +61,6 @@
                             <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span>
                             <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>
                         </td>
-<!--                             <progress class="oe_goal_progress" t-att-value="goal.completeness" max="100" /></td>
-                        <td class="col3">
-                            <t t-esc="goal.current" />/<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                            <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
-                        </td> -->
                     </tr>
                 </tbody>
                 </table>
-- 
cgit v1.2.3


From 8d23c604d91b0180f0dca25b3a907aa642d12c5a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 16 Apr 2013 12:27:24 +0200
Subject: [IMP] switch to challenges

bzr revid: mat@openerp.com-20130416102724-0ejrlecls30xhol3
---
 addons/gamification/static/src/xml/gamification.xml | 7 +------
 1 file changed, 1 insertion(+), 6 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 ff0c6056172..adcd6fa37b0 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -15,7 +15,7 @@
                     <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 t-if="!goal.type_ponctual">
+                    <t t-if="goal.type_display == 'progress'">
                         <t t-if="goal.type_condition == 'higher'">
                             <p>
                                 <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
@@ -47,11 +47,6 @@
                             </t>
                         </th>
                     </tr>
-                    <tr>
-                        <th>#</th>
-                        <th>Pers.</th>
-                        <th>current</th>
-                    </tr>
                     </thead>
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-- 
cgit v1.2.3


From 06159a516abb7203d997d2dcb77b0fcc849c2b5a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 18 Apr 2013 12:32:29 +0200
Subject: [IMP] show suggested threads

bzr revid: mat@openerp.com-20130418103229-xkyu6qyzdola03hn
---
 addons/gamification/static/src/xml/gamification.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(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 adcd6fa37b0..22c1233d336 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -1,5 +1,6 @@
 <templates>
     <t t-name="gamification.user_wall_sidebar" class="oe_gamification_user_wall_sidebar">
+        <div class="oe_gamification_suggestion"><em>No challenge suggestions</em></div>
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <t t-name="gamification.goal_list_to_do">
@@ -63,4 +64,17 @@
         </div>
     </t>
 
+    <t t-name="gamification.challenge_suggestions">
+        <h3>Suggested challenges</h3>
+        <div t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_challenge">
+            <p>
+                <strong><t t-esc="challenge.name"/></strong> <a class="oe_challenge_reply">reply</a>
+                <t t-if="challenge.description.value">
+                    <br/>
+                    <em><t t-esc="challenge.description.value"/></em>
+                </t>
+            </p>
+        </div>
+    </t>
+
 </templates>
-- 
cgit v1.2.3


From 8a95c92353868f4a1a53ddc27eb6bc5943c06188 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 18 Apr 2013 18:05:12 +0200
Subject: [ADD] wizard to accept challenges

bzr revid: mat@openerp.com-20130418160512-v9tw81ddki79kwv5
---
 .../gamification/static/src/xml/gamification.xml   | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 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 22c1233d336..29114897153 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -51,12 +51,19 @@
                     </thead>
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <th><t t-esc="goal.rank" /></th>
-                        <td class="col1"><t t-esc="goal.user_name" /></td>
-                        <td class="col2">
-                            <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span>
-                            <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>
-                        </td>
+                        <div style="background:#fff;">
+                            <th class="col0"><t t-esc="goal.rank" /></th>
+                            <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
+                            <td class="col2" style="width:150px;">
+                                <div class="oe_goal_progress" t-attf-style="width: #{goal.completeness}%;">
+                                    <div style="width:150px;">
+                                    <!-- <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span> -->
+                                    <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>
+                            </td>
+                        </div>
                     </tr>
                 </tbody>
                 </table>
@@ -68,11 +75,7 @@
         <h3>Suggested challenges</h3>
         <div t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_challenge">
             <p>
-                <strong><t t-esc="challenge.name"/></strong> <a class="oe_challenge_reply">reply</a>
-                <t t-if="challenge.description.value">
-                    <br/>
-                    <em><t t-esc="challenge.description.value"/></em>
-                </t>
+                <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}">reply</a>
             </p>
         </div>
     </t>
-- 
cgit v1.2.3


From 4fb6e9b682901e02e615936c75bbe8ca6cee8b8b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 19 Apr 2013 17:48:17 +0200
Subject: [IMP] display user's badges on employee

bzr revid: mat@openerp.com-20130419154817-rq09s1f5nl6ryhka
---
 addons/gamification/static/src/xml/gamification.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 29114897153..c6946d6397d 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -51,7 +51,7 @@
                     </thead>
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div style="background:#fff;">
+                        <div style="background: #fff;">
                             <th class="col0"><t t-esc="goal.rank" /></th>
                             <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
                             <td class="col2" style="width:150px;">
-- 
cgit v1.2.3


From 0ea778bc0da0c074406ac3a1adc1856b846ae63f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 19 Apr 2013 17:53:42 +0200
Subject: [IMP] display progressbar in indivial mode

bzr revid: mat@openerp.com-20130419155342-776hyozede04zgz7
---
 addons/gamification/static/src/xml/gamification.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 c6946d6397d..428342e08b6 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -9,9 +9,10 @@
             <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">
-                    <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span>
+                <ul class="oe_goals_list" style="width:200px;">
+                <li t-foreach="plan.goals" t-as="goal" t-attf-style="width: #{goal.completeness}%;" class="oe_goal_progress">
+                    <div style="width:200px;">
+                    <!-- <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>
                     <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>
@@ -33,6 +34,7 @@
                             </p>
                         </t>
                     </t>
+                    </div>
                 </li>
                 </ul>
             </t>
-- 
cgit v1.2.3


From 38f205ef32a1acd3d5712d203c5f18d2d0805c95 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 22 Apr 2013 11:32:36 +0200
Subject: [IMP] more consistent display of challenges

bzr revid: mat@openerp.com-20130422093236-y76ad91yoyemejxa
---
 .../gamification/static/src/xml/gamification.xml   | 76 +++++++++++-----------
 1 file changed, 38 insertions(+), 38 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 428342e08b6..e3782a7d22b 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -4,42 +4,41 @@
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <t t-name="gamification.goal_list_to_do">
+        <h3>Challenges</h3>
         <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
             <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
-            <h3><t t-esc="plan.name" /></h3>
+            <h4><t t-esc="plan.name" /></h4>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
-                <ul class="oe_goals_list" style="width:200px;">
-                <li t-foreach="plan.goals" t-as="goal" t-attf-style="width: #{goal.completeness}%;" class="oe_goal_progress">
-                    <div style="width:200px;">
-                    <!-- <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>
-                    <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 t-if="goal.type_display == 'progress'">
-                        <t t-if="goal.type_condition == 'higher'">
-                            <p>
-                                <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                            </p>
-                            <!-- <p><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/></p> -->
+                <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 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>
+                        <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 t-if="goal.type_condition == 'lower'">
-                            <p>
-                                <t t-esc="goal.current" /> (less than 
-                                    <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+
+                        <t t-if="goal.type_display == 'progress'">
+                            <t t-if="goal.type_condition == 'higher'">
+                                    <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                                     <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                                )
-                            </p>
+                            </t>
+                            <t t-if="goal.type_condition == 'lower'">
+                                
+                                    <t t-esc="goal.current" /> (less than 
+                                        <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                        <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                    )
+                                
+                            </t>
                         </t>
-                    </t>
                     </div>
-                </li>
-                </ul>
+                    </div>
+                </div>
             </t>
             <t t-if="plan.visibility_mode == 'board'">
-                <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline" class="oe_list_content">
+                <table width="100%" border="1" 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 : ''}">
@@ -55,14 +54,14 @@
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <div style="background: #fff;">
                             <th class="col0"><t t-esc="goal.rank" /></th>
-                            <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
-                            <td class="col2" style="width:150px;">
-                                <div class="oe_goal_progress" t-attf-style="width: #{goal.completeness}%;">
-                                    <div style="width:150px;">
+                            <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;">
+                                <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"/><br/>
+                                    <t t-esc="goal.user_name"/>
                                     <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>
                                 </div>
                             </td>
                         </div>
@@ -74,12 +73,13 @@
     </t>
 
     <t t-name="gamification.challenge_suggestions">
-        <h3>Suggested challenges</h3>
-        <div t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_challenge">
-            <p>
-                <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}">reply</a>
-            </p>
-        </div>
+        <h3>Suggestions</h3>
+        <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>
+            </li>
+        </ul>
     </t>
 
 </templates>
-- 
cgit v1.2.3


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


From c76b9fb8e874e18fe9f2f34436125a94d944569e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 22 Apr 2013 15:55:40 +0200
Subject: [IMP] remove unused sparklines and display actions

bzr revid: mat@openerp.com-20130422135540-9ozlret4qjz6ivcq
---
 addons/gamification/static/src/xml/gamification.xml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 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 c83862af829..65643e1c219 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -6,8 +6,14 @@
     <t t-name="gamification.goal_list_to_do">
         <h3>Challenges</h3>
         <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
-            <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
-            <h4><t t-esc="plan.name" /></h4>
+            <div class="oe_clear">
+                <div class="oe_left">
+                    <h4><t t-esc="plan.name" /></h4>
+                </div>
+                <div class="oe_left">
+                    <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
+                </div>
+            </div>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <div class="oe_goals_list">
@@ -41,11 +47,12 @@
                     <thead>
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
-                            <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>)
+                            <strong><t t-esc="planline.type_name"/></strong>
                             <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>
                             </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>)
                         </th>
                     </tr>
                     </thead>
@@ -54,7 +61,7 @@
                         <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:180px;">
+                            <td class="col1">
                                 <div class="oe_goal_outer_box" t-attf-style="width: #{goal.completeness}%;">
                                 <div class="oe_goal_inner_box">
                                     <t t-esc="goal.user_name"/><br/>
@@ -72,8 +79,7 @@
 
     <t t-name="gamification.challenge_suggestions">
         <h3>Suggestions</h3>
-        <em>You have been invited to the following challenges:</em>
-        <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_challenge">
+        <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
             <li>
                 <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>
-- 
cgit v1.2.3


From c1d645e2cd0ecf6d7ce1e653ec524bb91596c9f5 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 22 Apr 2013 17:41:22 +0200
Subject: [FIX] css tweak

bzr revid: mat@openerp.com-20130422154122-yv99mjhpcrn7dwd4
---
 addons/gamification/static/src/xml/gamification.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 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 65643e1c219..93f81247151 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -6,16 +6,13 @@
     <t t-name="gamification.goal_list_to_do">
         <h3>Challenges</h3>
         <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
-            <div class="oe_clear">
-                <div class="oe_left">
-                    <h4><t t-esc="plan.name" /></h4>
-                </div>
-                <div class="oe_left">
-                    <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
-                </div>
+            <div>
+                <h4 style="display:inline-block;"><t t-esc="plan.name" /></h4>
+                <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
             </div>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
+
                 <div class="oe_goals_list">
                     <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">
-- 
cgit v1.2.3


From 4bcaa718bd1f45c79a688c1a47d0a69cae0348ae Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 24 Apr 2013 14:33:50 +0200
Subject: [IMP] display actions

bzr revid: mat@openerp.com-20130424123350-cgx663vd31vvnw7w
---
 addons/gamification/static/src/xml/gamification.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(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 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">&amp;</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>
-- 
cgit v1.2.3


From 5794e60f148fc0a3500be3d7082eff4fa8366854 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 25 Apr 2013 10:52:17 +0200
Subject: [IMP] better design

bzr revid: mat@openerp.com-20130425085217-bmt8tsdbtrfn7j7d
---
 .../gamification/static/src/xml/gamification.xml   | 74 ++++++++++++----------
 1 file changed, 41 insertions(+), 33 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 6d6edfbd49a..9e35b2d51bf 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -4,7 +4,6 @@
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <t t-name="gamification.goal_list_to_do">
-        <h3>Challenges</h3>
         <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
             <div>
                 <h4 style="display:inline-block;"><t t-esc="plan.name" /></h4>
@@ -13,31 +12,39 @@
 
             <t t-if="plan.visibility_mode == 'progressbar'">
 
-                <div class="oe_goals_list">
-                    <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">
-                        <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><br/>
-
-                        <t t-if="goal.type_display == 'progress'">
-                            <t t-if="goal.type_condition == 'higher'">
-                                    <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                    <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                            </t>
-                            <t t-if="goal.type_condition == 'lower'">
-                                
-                                    <t t-esc="goal.current" /> (less than 
-                                        <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                        <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                                    )
-                                
-                            </t>
-                        </t>
-                    </div>
-                    </div>
-                </div>
+                <ul class="oe_goals_list">
+                    <li t-foreach="plan.goals" t-as="goal" t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''}">
+                        <div class="oe_goal_outer_box">
+                            <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                            <div class="oe_goal_inner_box">
+                                <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
+                                    <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
+                                </t>
+                                <t t-if="goal.type_action">
+                                    <span t-att-title="goal.type_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.type_name" /></a></span>
+                                </t>
+                                <t t-if="goal.computation_mode == 'manually' and !goal.type_action">
+                                    <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
+                                    <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
+                                </t>
+                                <t t-if="goal.type_display == 'progress'">
+                                    <t t-if="goal.type_condition == 'higher'">
+                                            <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                            <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                    </t>
+                                    <t t-if="goal.type_condition == 'lower'">
+                                        
+                                            <t t-esc="goal.current" /> (less than 
+                                                <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                                <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                            )
+                                        
+                                    </t>
+                                </t>
+                            </div>
+                        </div>
+                    </li>
+                </ul>
             </t>
             <t t-if="plan.visibility_mode == 'board'">
                 <table t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
@@ -63,13 +70,14 @@
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <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">
-                                <div class="oe_goal_outer_box" t-attf-style="width: #{goal.completeness}%;">
-                                <div class="oe_goal_inner_box">
-                                    <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>
+                            <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
+                            <td class="col2">
+                                <div class="oe_goal_outer_box">
+                                    <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                    <div class="oe_goal_inner_box">
+                                        <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>
                             </td>
                         </div>
-- 
cgit v1.2.3


From e920347b012d0e88cf59ae34d5f3ba1d347863f9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 25 Apr 2013 12:17:59 +0200
Subject: [IMP] make it beautiful

bzr revid: mat@openerp.com-20130425101759-y3cwymvey8i9mwie
---
 .../gamification/static/src/xml/gamification.xml   | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 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 9e35b2d51bf..1f9649a9198 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -15,7 +15,10 @@
                 <ul class="oe_goals_list">
                     <li t-foreach="plan.goals" t-as="goal" t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''}">
                         <div class="oe_goal_outer_box">
-                            <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                            <t t-if="goal.type_display == 'progress'">
+                                <div class="oe_goal_progress_background"></div>
+                                <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                            </t>
                             <div class="oe_goal_inner_box">
                                 <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
                                     <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
@@ -50,9 +53,15 @@
                 <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 : ''}">
-                            <strong><t t-esc="planline.type_name"/></strong>
-                            <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
+                        <th colspan="3" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
+                            <t t-if="planline.computation_mode != 'manually' and !planline.type_action">
+                                <strong><t t-esc="planline.type_name"/></strong>
+                            </t>
+                            <t t-if="planline.type_action">
+                                <strong><a class="oe_goal_action" t-att-id="planline.own_goal_id"><t t-esc="planline.type_name"/></a></strong>
+                            </t>
+                            <t t-if="planline.computation_mode == 'manually' and !planline.type_action">
+                                <strong><t t-esc="planline.type_name"/></strong>
                                 <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
                             </t>
                             <br/>
@@ -68,12 +77,15 @@
                     </thead>
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div style="background: #fff;">
+                        <div>
                             <th class="col0"><t t-esc="goal.rank" /></th>
                             <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
                             <td class="col2">
                                 <div class="oe_goal_outer_box">
-                                    <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                    <t t-if="planline.type_display == 'progress'">
+                                        <div class="oe_goal_progress_background"></div>
+                                        <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                    </t>
                                     <div class="oe_goal_inner_box">
                                         <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>
-- 
cgit v1.2.3


From d14496e578149f76ad612add11b623dfcc2bd195 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 25 Apr 2013 17:40:28 +0200
Subject: [IMP] tweak css

bzr revid: mat@openerp.com-20130425154028-rt3uv8mtykl9ff2g
---
 .../gamification/static/src/xml/gamification.xml   | 61 ++++++++++------------
 1 file changed, 29 insertions(+), 32 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 1f9649a9198..27a4a46108d 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -11,65 +11,53 @@
             </div>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
-
                 <ul class="oe_goals_list">
-                    <li t-foreach="plan.goals" t-as="goal" t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''}">
+                    <li t-foreach="plan.goals" t-as="goal" t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
+                        <t t-if="goal.type_display == 'progress'"><span class="oe_goal_current"><t t-esc="goal.current" /></span></t>
                         <div class="oe_goal_outer_box">
                             <t t-if="goal.type_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
-                            <div class="oe_goal_inner_box">
+                            <div t-attf-class="oe_goal_inner_box #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
                                 <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
                                     <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
                                 </t>
-                                <t t-if="goal.type_action">
+                                <t t-if="goal.type_action or goal.computation_mode == 'manually'">
                                     <span t-att-title="goal.type_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.type_name" /></a></span>
                                 </t>
-                                <t t-if="goal.computation_mode == 'manually' and !goal.type_action">
-                                    <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
-                                    <a class="oe_goal_action oe_e" t-att-id="goal.id">&amp;</a>
-                                </t>
                                 <t t-if="goal.type_display == 'progress'">
                                     <t t-if="goal.type_condition == 'higher'">
-                                            <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                            <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                            (target:
                                     </t>
                                     <t t-if="goal.type_condition == 'lower'">
-                                        
-                                            <t t-esc="goal.current" /> (less than 
-                                                <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                                <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                                            )
-                                        
+                                            (target less than:
                                     </t>
+                                    <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                    <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>)
                                 </t>
                             </div>
                         </div>
                     </li>
                 </ul>
             </t>
+
             <t t-if="plan.visibility_mode == 'board'">
                 <table t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
                     <thead>
                     <tr>
                         <th colspan="3" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
-                            <t t-if="planline.computation_mode != 'manually' and !planline.type_action">
-                                <strong><t t-esc="planline.type_name"/></strong>
-                            </t>
-                            <t t-if="planline.type_action">
-                                <strong><a class="oe_goal_action" t-att-id="planline.own_goal_id"><t t-esc="planline.type_name"/></a></strong>
-                            </t>
+                            <strong><t t-esc="planline.type_name"/></strong>
+
                             <t t-if="planline.computation_mode == 'manually' and !planline.type_action">
                                 <strong><t t-esc="planline.type_name"/></strong>
                                 <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
                             </t>
-                            <br/>
                             <t t-if="planline.type_condition == 'higher'">
-                                (Goal: max
+                                Target:
                             </t>
                             <t t-if="planline.type_condition == 'lower'">
-                                (Goal: min
+                                Target (less than):
                             </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>
@@ -88,7 +76,14 @@
                                     </t>
                                     <div class="oe_goal_inner_box">
                                         <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>
+                                        <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
+                                            <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>
+                                        </t>
+                                        <t t-if="goal.id == planline.own_goal_id and (planline.type_action or planline.computation_mode == 'manually')">
+                                            <a class="oe_goal_action" t-att-id="planline.own_goal_id">
+                                                <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>
+                                            </a>
+                                        </t>
                                     </div>
                                 </div>
                             </td>
@@ -101,12 +96,14 @@
     </t>
 
     <t t-name="gamification.challenge_suggestions">
-        <h3>Suggestions</h3>
-        <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
-            <li>
-                <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>
+        <div class="oe_goal">
+            <h3>Suggestions</h3>
+            <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
+                <li>
+                    <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>
+        </div>
     </t>
 
 </templates>
-- 
cgit v1.2.3


From 9c0936e6582f3aa117f721219f9dff17712245fd Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 26 Apr 2013 17:52:42 +0200
Subject: [IMP] design using display table

bzr revid: mat@openerp.com-20130426155242-1do1w4mrch23lhbm
---
 .../gamification/static/src/xml/gamification.xml   | 111 ++++++++++-----------
 1 file changed, 53 insertions(+), 58 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 27a4a46108d..62476c9a366 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -6,75 +6,72 @@
     <t t-name="gamification.goal_list_to_do">
         <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
             <div>
-                <h4 style="display:inline-block;"><t t-esc="plan.name" /></h4>
                 <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
+                <h4><t t-esc="plan.name" /></h4>
             </div>
 
             <t t-if="plan.visibility_mode == 'progressbar'">
-                <ul class="oe_goals_list">
-                    <li t-foreach="plan.goals" t-as="goal" t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
-                        <t t-if="goal.type_display == 'progress'"><span class="oe_goal_current"><t t-esc="goal.current" /></span></t>
-                        <div class="oe_goal_outer_box">
+                <div class="oe_table oe_goals_list">
+                    <div t-foreach="plan.goals" t-as="goal" t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
                             <t t-if="goal.type_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
-                            <div t-attf-class="oe_goal_inner_box #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
-                                <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
-                                    <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
-                                </t>
-                                <t t-if="goal.type_action or goal.computation_mode == 'manually'">
-                                    <span t-att-title="goal.type_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.type_name" /></a></span>
-                                </t>
+                            <div t-attf-class="oe_goal_inner_box">
                                 <t t-if="goal.type_display == 'progress'">
-                                    <t t-if="goal.type_condition == 'higher'">
-                                            (target:
+                                    <div class="oe_cell oe_goal_current"><t t-esc="goal.current" /></div>
+                                </t>
+                                <div class="oe_cell">
+                                    <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
+                                        <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
                                     </t>
-                                    <t t-if="goal.type_condition == 'lower'">
-                                            (target less than:
+                                    <t t-if="goal.type_action or goal.computation_mode == 'manually'">
+                                        <span t-att-title="goal.type_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.type_name" /></a></span>
                                     </t>
-                                    <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                    <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>)
-                                </t>
+                                    <t t-if="goal.type_display == 'progress'">
+                                        <t t-if="goal.type_condition == 'higher'">
+                                                (target:
+                                        </t>
+                                        <t t-if="goal.type_condition == 'lower'">
+                                                (target less than:
+                                        </t>
+                                        <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                        <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>)
+                                    </t>
+                                </div>
                             </div>
-                        </div>
-                    </li>
-                </ul>
+                    </div>
+                </div>
             </t>
 
             <t t-if="plan.visibility_mode == 'board'">
-                <table t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
-                    <thead>
-                    <tr>
-                        <th colspan="3" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
+                <div t-foreach="plan.planlines" t-as="planline" class="oe_goals_list oe_table">
+                    <div class="oe_row">
+                        <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <strong><t t-esc="planline.type_name"/></strong>
-
-                            <t t-if="planline.computation_mode == 'manually' and !planline.type_action">
-                                <strong><t t-esc="planline.type_name"/></strong>
-                                <a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
-                            </t>
-                            <t t-if="planline.type_condition == 'higher'">
-                                Target:
-                            </t>
-                            <t t-if="planline.type_condition == 'lower'">
-                                Target (less than):
+                            <br/>
+                            <div class="oe_grey">
+                                <t t-if="planline.type_condition == 'higher'">
+                                    Target:
+                                </t>
+                                <t t-if="planline.type_condition == 'lower'">
+                                    Target (less than):
+                                </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>
+                            </div>
+                        </div>
+                    </div>
+                    <div t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
+                        <div class="oe_row oe_goal_outer_box">
+                            <t t-if="planline.type_display == 'progress'">
+                                <div class="oe_goal_progress_background"></div>
+                                <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </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>
-                    <tbody>
-                    <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div>
-                            <th class="col0"><t t-esc="goal.rank" /></th>
-                            <td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
-                            <td class="col2">
-                                <div class="oe_goal_outer_box">
-                                    <t t-if="planline.type_display == 'progress'">
-                                        <div class="oe_goal_progress_background"></div>
-                                        <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
-                                    </t>
-                                    <div class="oe_goal_inner_box">
+                            <div class="oe_goal_inner_box">
+                                <div class="oe_cell col0"><t t-esc="goal.rank" /></div>
+                                <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></div>
+                                <div class="oe_cell col2">
+                                    
                                         <t t-esc="goal.user_name"/><br/>
                                         <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
                                             <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>
@@ -84,20 +81,18 @@
                                                 <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>
                                             </a>
                                         </t>
-                                    </div>
                                 </div>
-                            </td>
+                            </div>
                         </div>
-                    </tr>
-                </tbody>
-                </table>
+                    </div>
+                </div>
             </t>
         </div>
     </t>
 
     <t t-name="gamification.challenge_suggestions">
         <div class="oe_goal">
-            <h3>Suggestions</h3>
+            <h4>Proposed Challenges</h4>
             <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
                 <li>
                     <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>
-- 
cgit v1.2.3


From 87c1fab873ed246fb5f3152377a82bad49c8a982 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 26 Apr 2013 18:16:13 +0200
Subject: [IMP] remove inner_box block

bzr revid: mat@openerp.com-20130426161613-4mxh5f25yjc8ogl8
---
 addons/gamification/static/src/xml/gamification.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 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 62476c9a366..97b69453490 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -17,7 +17,7 @@
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
-                            <div t-attf-class="oe_goal_inner_box">
+                            
                                 <t t-if="goal.type_display == 'progress'">
                                     <div class="oe_cell oe_goal_current"><t t-esc="goal.current" /></div>
                                 </t>
@@ -39,7 +39,6 @@
                                         <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>)
                                     </t>
                                 </div>
-                            </div>
                     </div>
                 </div>
             </t>
@@ -67,7 +66,7 @@
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
-                            <div class="oe_goal_inner_box">
+                            
                                 <div class="oe_cell col0"><t t-esc="goal.rank" /></div>
                                 <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></div>
                                 <div class="oe_cell col2">
@@ -82,7 +81,7 @@
                                             </a>
                                         </t>
                                 </div>
-                            </div>
+                            
                         </div>
                     </div>
                 </div>
-- 
cgit v1.2.3


From 3ee9aa428b1cd29834ee6ed5e8c3adc760c24ade Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 29 Apr 2013 15:20:00 +0200
Subject: [FIX]gamification: design issues

bzr revid: mat@openerp.com-20130429132000-kibmf1u17h24j92c
---
 addons/gamification/static/src/xml/gamification.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 1c655afbb64..9b02005db0f 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -60,7 +60,7 @@
                         </div>
                     </div>
                     <div t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
+                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''}">
                             <t t-if="planline.type_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
-- 
cgit v1.2.3


From 0ea12d6d918b8bcecb9125272ae7fd31f94b7827 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 29 Apr 2013 17:30:07 +0200
Subject: [IMP] design tweaks

bzr revid: mat@openerp.com-20130429153007-tha1wmcvbtp89dz2
---
 addons/gamification/static/src/xml/gamification.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 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 9b02005db0f..1b47f2918d5 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -60,7 +60,7 @@
                         </div>
                     </div>
                     <div t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''}">
+                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{planline.type_display != 'progress' ? 'oe_no_progress' : ''}">
                             <t t-if="planline.type_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
                                 <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
@@ -69,9 +69,9 @@
                                 <div class="oe_cell col0"><t t-esc="goal.rank" /></div>
                                 <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></div>
                                 <div class="oe_cell col2">
-                                    <t t-if="planline.type_display == 'progress'"><br/>
+                                    <t t-if="planline.type_display == 'progress'">
                                         <!-- progress, action on current value -->
-                                        <t t-esc="goal.user_name"/>
+                                        <t t-esc="goal.user_name"/><br/>
                                         <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
                                             <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>
                                         </t>
-- 
cgit v1.2.3


From e396d9f0b6aab19a752ed5ec1e4aecc50689cb25 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 29 Apr 2013 17:47:38 +0200
Subject: [IMP] tooltip on goal symbols

bzr revid: mat@openerp.com-20130429154738-as56ln2gpv3muvyx
---
 addons/gamification/static/src/xml/gamification.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 1b47f2918d5..8aa577bb4fe 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -31,7 +31,7 @@
                                             Target:
                                         </t>
                                         <t t-if="goal.type_condition == 'lower'">
-                                            Target less than:
+                                            Target: &lt;=
                                         </t>
                                         <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
                                         <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
@@ -53,7 +53,7 @@
                                     Target:
                                 </t>
                                 <t t-if="planline.type_condition == 'lower'">
-                                    Target (less than):
+                                    Target: &lt;=
                                 </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>
                             </div>
-- 
cgit v1.2.3


From 3887f78cef37b681ad67cd0cc96477c7b1e3ecd8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 3 Jun 2013 22:30:53 +0200
Subject: [REF] gamification: code review (WIP)

bzr revid: qdp-launchpad@openerp.com-20130603203053-dy7ia09rl0i1sxmd
---
 addons/gamification/static/src/xml/gamification.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 8aa577bb4fe..9f6bc1c81e9 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -34,7 +34,7 @@
                                             Target: &lt;=
                                         </t>
                                         <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                        <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                                        <t t-if="goal.type_suffix"><t t-esc="goal.type_suffix"/></t>
                                     </div>
                                 </t>
                             </div>
@@ -55,7 +55,7 @@
                                 <t t-if="planline.type_condition == 'lower'">
                                     Target: &lt;=
                                 </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>
+                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
                             </div>
                         </div>
                     </div>
@@ -73,11 +73,11 @@
                                         <!-- progress, action on current value -->
                                         <t t-esc="goal.user_name"/><br/>
                                         <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
-                                            <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>
+                                            <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
                                         </t>
                                         <t t-if="goal.id == planline.own_goal_id and (planline.type_action or planline.computation_mode == 'manually')">
                                             <a class="oe_goal_action" t-att-id="planline.own_goal_id">
-                                                <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>
+                                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
                                             </a>
                                         </t>
                                     </t>
-- 
cgit v1.2.3


From 122c15c48d430c502adf2df45bad4405a864b5ce Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 17 Dec 2013 17:15:41 +0100
Subject: [REF] gamification: pretty much changing half of the code to make tde
 happy...

bzr revid: mat@openerp.com-20131217161541-oxsgy7gmko2x6qui
---
 .../gamification/static/src/xml/gamification.xml   | 76 +++++++++++-----------
 1 file changed, 38 insertions(+), 38 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 9f6bc1c81e9..6bfd4c2ffc9 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -4,37 +4,37 @@
         <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
     </t>
     <t t-name="gamification.goal_list_to_do">
-        <div t-foreach="widget.goals_info.info" t-as="plan" class="oe_goal">
+        <div t-foreach="widget.goals_info.info" t-as="challenge" class="oe_goal">
             <div>
-                <a class="oe_update_plan oe_e" rol="button" t-attf-id="{plan.id}">e</a>
-                <h4><t t-esc="plan.name" /></h4>
+                <a class="oe_update_challenge oe_e" rol="button" t-attf-id="{challenge.id}">e</a>
+                <h4><t t-esc="challenge.name" /></h4>
             </div>
 
-            <t t-if="plan.visibility_mode == 'progressbar'">
+            <t t-if="challenge.visibility_mode == 'progressbar'">
                 <div class="oe_table oe_goals_list">
-                    <div t-foreach="plan.goals" t-as="goal" t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.type_display != 'progress' ? 'oe_no_progress' : ''}">
-                            <t t-if="goal.type_display == 'progress'">
+                    <div t-foreach="challenge.goals" t-as="goal" t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.definition_display != 'progress' ? 'oe_no_progress' : ''}">
+                            <t t-if="goal.definition_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
-                                <div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                <div class="oe_goal_progress" t-attf-style="#{goal.definition_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                                 <div class="oe_cell oe_goal_current"><t t-esc="goal.current" /></div>
                             </t>
                             <div class="oe_cell">
-                                <t t-if="goal.computation_mode != 'manually' and !goal.type_action">
-                                    <span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
+                                <t t-if="goal.computation_mode != 'manually' and !goal.definition_action">
+                                    <span t-att-title="goal.definition_description"><t t-esc="goal.definition_name" /></span>
                                 </t>
-                                <t t-if="goal.type_action or goal.computation_mode == 'manually'">
-                                    <span t-att-title="goal.type_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.type_name" /></a></span>
+                                <t t-if="goal.definition_action or goal.computation_mode == 'manually'">
+                                    <span t-att-title="goal.definition_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.definition_name" /></a></span>
                                 </t>
-                                <t t-if="goal.type_display == 'progress'"><br/>
+                                <t t-if="goal.definition_display == 'progress'"><br/>
                                     <div class="oe_grey">
-                                        <t t-if="goal.type_condition == 'higher'">
+                                        <t t-if="goal.definition_condition == 'higher'">
                                             Target:
                                         </t>
-                                        <t t-if="goal.type_condition == 'lower'">
+                                        <t t-if="goal.definition_condition == 'lower'">
                                             Target: &lt;=
                                         </t>
-                                        <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                        <t t-if="goal.type_suffix"><t t-esc="goal.type_suffix"/></t>
+                                        <span t-attf-class="#{goal.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                        <t t-if="goal.definition_suffix"><t t-esc="goal.definition_suffix"/></t>
                                     </div>
                                 </t>
                             </div>
@@ -42,52 +42,52 @@
                 </div>
             </t>
 
-            <t t-if="plan.visibility_mode == 'board'">
-                <div t-foreach="plan.planlines" t-as="planline" class="oe_goals_list oe_table">
+            <t t-if="challenge.visibility_mode == 'board'">
+                <div t-foreach="challenge.lines" t-as="line" class="oe_goals_list oe_table">
                     <div class="oe_row">
-                        <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
-                            <strong><t t-esc="planline.type_name"/></strong>
+                        <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{line.definition_description ? line.definition_description : ''}">
+                            <strong><t t-esc="line.definition_name"/></strong>
                             <br/>
                             <div class="oe_grey">
-                                <t t-if="planline.type_condition == 'higher'">
+                                <t t-if="line.definition_condition == 'higher'">
                                     Target:
                                 </t>
-                                <t t-if="planline.type_condition == 'lower'">
+                                <t t-if="line.definition_condition == 'lower'">
                                     Target: &lt;=
                                 </t>
-                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
+                                <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="line.target_goal" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
                             </div>
                         </div>
                     </div>
-                    <div t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
-                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{planline.type_display != 'progress' ? 'oe_no_progress' : ''}">
-                            <t t-if="planline.type_display == 'progress'">
+                    <div t-foreach="line.goals" t-as="goal" t-attf-class="#{goal.id == line.own_goal_id ? 'oe_bold' : ''}">
+                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{line.definition_display != 'progress' ? 'oe_no_progress' : ''}">
+                            <t t-if="line.definition_display == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
-                                <div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                <div class="oe_goal_progress" t-attf-style="#{line.definition_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
                             
                                 <div class="oe_cell col0"><t t-esc="goal.rank" /></div>
                                 <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></div>
                                 <div class="oe_cell col2">
-                                    <t t-if="planline.type_display == 'progress'">
+                                    <t t-if="line.definition_display == 'progress'">
                                         <!-- progress, action on current value -->
                                         <t t-esc="goal.user_name"/><br/>
-                                        <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
-                                            <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
+                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.definition_action)">
+                                            <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
                                         </t>
-                                        <t t-if="goal.id == planline.own_goal_id and (planline.type_action or planline.computation_mode == 'manually')">
-                                            <a class="oe_goal_action" t-att-id="planline.own_goal_id">
-                                                <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_suffix"> <t t-esc="planline.type_suffix"/></t>
+                                        <t t-if="goal.id == line.own_goal_id and (line.definition_action or line.computation_mode == 'manually')">
+                                            <a class="oe_goal_action" t-att-id="line.own_goal_id">
+                                                <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
                                             </a>
                                         </t>
                                     </t>
-                                    <t t-if="planline.type_display != 'progress'">
+                                    <t t-if="line.definition_display != 'progress'">
                                         <!-- not progress, action on user name -->
-                                        <t t-if="goal.id != planline.own_goal_id or (planline.computation_mode != 'manually' and !planline.type_action)">
+                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.definition_action)">
                                             <t t-esc="goal.user_name"/>
                                         </t>
-                                        <t t-if="goal.id == planline.own_goal_id and (planline.type_action or planline.computation_mode == 'manually')">
-                                            <a class="oe_goal_action" t-att-id="planline.own_goal_id"><t t-esc="goal.user_name"/></a>
+                                        <t t-if="goal.id == line.own_goal_id and (line.definition_action or line.computation_mode == 'manually')">
+                                            <a class="oe_goal_action" t-att-id="line.own_goal_id"><t t-esc="goal.user_name"/></a>
                                         </t>
                                     </t>
                                 </div>
@@ -100,7 +100,7 @@
 
     <t t-name="gamification.challenge_suggestions">
         <div class="oe_goal">
-            <h4>Proposed Challenges</h4>
+            <h4>Invited Challenges</h4>
             <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
                 <li>
                     <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>
-- 
cgit v1.2.3


From 4bc29b9ffae6177dfcc42c69216f29e482c0716e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 17 Dec 2013 18:02:32 +0100
Subject: [REF] gamification

bzr revid: mat@openerp.com-20131217170232-e0zruxzl1wlycaji
---
 addons/gamification/static/src/xml/gamification.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 6bfd4c2ffc9..19c622dcb97 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -10,7 +10,7 @@
                 <h4><t t-esc="challenge.name" /></h4>
             </div>
 
-            <t t-if="challenge.visibility_mode == 'progressbar'">
+            <t t-if="challenge.visibility_mode == 'personal'">
                 <div class="oe_table oe_goals_list">
                     <div t-foreach="challenge.goals" t-as="goal" t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.definition_display != 'progress' ? 'oe_no_progress' : ''}">
                             <t t-if="goal.definition_display == 'progress'">
@@ -42,7 +42,7 @@
                 </div>
             </t>
 
-            <t t-if="challenge.visibility_mode == 'board'">
+            <t t-if="challenge.visibility_mode == 'ranking'">
                 <div t-foreach="challenge.lines" t-as="line" class="oe_goals_list oe_table">
                     <div class="oe_row">
                         <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{line.definition_description ? line.definition_description : ''}">
-- 
cgit v1.2.3


From f77aefc07ace66587bc13f7d2fa55755968437c5 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 20 Dec 2013 15:45:21 +0100
Subject: [REF] gamification: cleaning methods and reports

bzr revid: mat@openerp.com-20131220144521-wyu1gx8bcitu6nk4
---
 .../gamification/static/src/xml/gamification.xml   | 78 +++++++++++-----------
 1 file changed, 40 insertions(+), 38 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 19c622dcb97..6316ca886f0 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -1,10 +1,12 @@
 <templates>
-    <t t-name="gamification.user_wall_sidebar" class="oe_gamification_user_wall_sidebar">
-        <div class="oe_gamification_suggestion"><em>No challenge suggestions</em></div>
-        <div class="oe_gamification_goal"><em>Your goal list is empty</em></div>
+    <t t-name="gamification.UserWallSidebar" class="oe_gamification_user_wall_sidebar">
+        <div>
+            <div class="oe_gamification_suggestion"></div>
+            <div class="oe_gamification_challenge_list"></div>
+        </div>
     </t>
-    <t t-name="gamification.goal_list_to_do">
-        <div t-foreach="widget.goals_info.info" t-as="challenge" class="oe_goal">
+    <t t-name="gamification.ChallengeSummary">
+        <div class="oe_goal">
             <div>
                 <a class="oe_update_challenge oe_e" rol="button" t-attf-id="{challenge.id}">e</a>
                 <h4><t t-esc="challenge.name" /></h4>
@@ -12,29 +14,29 @@
 
             <t t-if="challenge.visibility_mode == 'personal'">
                 <div class="oe_table oe_goals_list">
-                    <div t-foreach="challenge.goals" t-as="goal" t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{goal.definition_display != 'progress' ? 'oe_no_progress' : ''}">
-                            <t t-if="goal.definition_display == 'progress'">
+                    <div t-foreach="challenge.lines" t-as="line" t-attf-class="oe_row oe_goal_outer_box #{line.state == 'reached' ? 'oe_goal_reached' : ''} #{line.display_mode != 'progress' ? 'oe_no_progress' : ''}">
+                            <t t-if="line.display_mode == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
-                                <div class="oe_goal_progress" t-attf-style="#{goal.definition_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
-                                <div class="oe_cell oe_goal_current"><t t-esc="goal.current" /></div>
+                                <div class="oe_goal_progress" t-attf-style="#{line.display_mode == 'progress' ? 'width: '+line.completeness+'%;' : 'width:0;'}"></div>
+                                <div class="oe_cell oe_goal_current"><t t-esc="line.current" /></div>
                             </t>
                             <div class="oe_cell">
-                                <t t-if="goal.computation_mode != 'manually' and !goal.definition_action">
-                                    <span t-att-title="goal.definition_description"><t t-esc="goal.definition_name" /></span>
+                                <t t-if="line.computation_mode != 'manually' and !line.action">
+                                    <span t-att-title="line.description"><t t-esc="line.name" /></span>
                                 </t>
-                                <t t-if="goal.definition_action or goal.computation_mode == 'manually'">
-                                    <span t-att-title="goal.definition_description"><a class="oe_goal_action" t-att-id="goal.id"><t t-esc="goal.definition_name" /></a></span>
+                                <t t-if="line.action or line.computation_mode == 'manually'">
+                                    <span t-att-title="line.description"><a class="oe_goal_action" t-att-id="line.id"><t t-esc="line.name" /></a></span>
                                 </t>
-                                <t t-if="goal.definition_display == 'progress'"><br/>
+                                <t t-if="line.display_mode == 'progress'"><br/>
                                     <div class="oe_grey">
-                                        <t t-if="goal.definition_condition == 'higher'">
+                                        <t t-if="line.definition_condition == 'higher'">
                                             Target:
                                         </t>
-                                        <t t-if="goal.definition_condition == 'lower'">
+                                        <t t-if="line.definition_condition == 'lower'">
                                             Target: &lt;=
                                         </t>
-                                        <span t-attf-class="#{goal.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
-                                        <t t-if="goal.definition_suffix"><t t-esc="goal.definition_suffix"/></t>
+                                        <span t-attf-class="#{line.monetary ? 'oe_goal_field_monetary' : ''}" t-attf-data-id="#{line.monetary ? challenge.currency : ''}"><t t-esc="line.target"/></span>
+                                        <t t-if="line.suffix"><t t-esc="line.suffix"/></t>
                                     </div>
                                 </t>
                             </div>
@@ -45,8 +47,8 @@
             <t t-if="challenge.visibility_mode == 'ranking'">
                 <div t-foreach="challenge.lines" t-as="line" class="oe_goals_list oe_table">
                     <div class="oe_row">
-                        <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{line.definition_description ? line.definition_description : ''}">
-                            <strong><t t-esc="line.definition_name"/></strong>
+                        <div class="oe_cell oe_thead" colspan="3" t-attf-title="#{line.description ? line.description : ''}">
+                            <strong><t t-esc="line.name"/></strong>
                             <br/>
                             <div class="oe_grey">
                                 <t t-if="line.definition_condition == 'higher'">
@@ -55,39 +57,39 @@
                                 <t t-if="line.definition_condition == 'lower'">
                                     Target: &lt;=
                                 </t>
-                                <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="line.target_goal" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
+                                <span t-attf-class="#{line.monetary ? 'oe_goal_field_monetary' : ''}" t-attf-data-id="#{line.monetary ? challenge.currency : ''}"><t t-esc="line.target" /></span><t t-if="line.suffix"> <t t-esc="line.suffix"/></t>
                             </div>
                         </div>
                     </div>
                     <div t-foreach="line.goals" t-as="goal" t-attf-class="#{goal.id == line.own_goal_id ? 'oe_bold' : ''}">
-                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{line.definition_display != 'progress' ? 'oe_no_progress' : ''}">
-                            <t t-if="line.definition_display == 'progress'">
+                        <div t-attf-class="oe_row oe_goal_outer_box #{goal.state == 'reached' ? 'oe_goal_reached' : ''} #{line.display_mode != 'progress' ? 'oe_no_progress' : ''}">
+                            <t t-if="line.display_mode == 'progress'">
                                 <div class="oe_goal_progress_background"></div>
-                                <div class="oe_goal_progress" t-attf-style="#{line.definition_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
+                                <div class="oe_goal_progress" t-attf-style="#{line.display_mode == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
                             </t>
                             
                                 <div class="oe_cell col0"><t t-esc="goal.rank" /></div>
-                                <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></div>
+                                <div class="oe_cell col1"><img class="oe_user_avatar" t-attf-alt="#{goal.name}" t-attf-data-id="#{goal.user_id}"/></div>
                                 <div class="oe_cell col2">
-                                    <t t-if="line.definition_display == 'progress'">
+                                    <t t-if="line.display_mode == 'progress'">
                                         <!-- progress, action on current value -->
-                                        <t t-esc="goal.user_name"/><br/>
-                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.definition_action)">
-                                            <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
+                                        <t t-esc="goal.name"/><br/>
+                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.action)">
+                                            <span t-attf-class="#{line.monetary ? 'oe_goal_field_monetary' : ''}" t-attf-data-id="#{line.monetary ? challenge.currency : ''}"><t t-esc="goal.current" /></span><t t-if="line.suffix"> <t t-esc="line.suffix"/></t>
                                         </t>
-                                        <t t-if="goal.id == line.own_goal_id and (line.definition_action or line.computation_mode == 'manually')">
+                                        <t t-if="goal.id == line.own_goal_id and (line.action or line.computation_mode == 'manually')">
                                             <a class="oe_goal_action" t-att-id="line.own_goal_id">
-                                                <span t-attf-class="#{line.definition_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="line.definition_suffix"> <t t-esc="line.definition_suffix"/></t>
+                                                <span t-attf-class="#{line.monetary ? 'oe_goal_field_monetary' : ''}" t-attf-data-id="#{line.monetary ? challenge.currency : ''}"><t t-esc="goal.current" /></span><t t-if="line.suffix"> <t t-esc="line.suffix"/></t>
                                             </a>
                                         </t>
                                     </t>
-                                    <t t-if="line.definition_display != 'progress'">
+                                    <t t-if="line.display_mode != 'progress'">
                                         <!-- not progress, action on user name -->
-                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.definition_action)">
-                                            <t t-esc="goal.user_name"/>
+                                        <t t-if="goal.id != line.own_goal_id or (line.computation_mode != 'manually' and !line.action)">
+                                            <t t-esc="goal.name"/>
                                         </t>
-                                        <t t-if="goal.id == line.own_goal_id and (line.definition_action or line.computation_mode == 'manually')">
-                                            <a class="oe_goal_action" t-att-id="line.own_goal_id"><t t-esc="goal.user_name"/></a>
+                                        <t t-if="goal.id == line.own_goal_id and (line.action or line.computation_mode == 'manually')">
+                                            <a class="oe_goal_action" t-att-id="line.own_goal_id"><t t-esc="goal.name"/></a>
                                         </t>
                                     </t>
                                 </div>
@@ -98,10 +100,10 @@
         </div>
     </t>
 
-    <t t-name="gamification.challenge_suggestions">
+    <t t-name="gamification.ChallengeSuggestion">
         <div class="oe_goal">
             <h4>Invited Challenges</h4>
-            <ul t-foreach="widget.challenge_suggestions.info" t-as="challenge" class="oe_goals_list">
+            <ul t-foreach="challenges" t-as="challenge" class="oe_goals_list">
                 <li>
                     <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>
-- 
cgit v1.2.3