From 2cb06d79a63a7abdd288d0087c3b0febb5df60b1 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 11:43:13 +0200
Subject: [PATCH] [IMP] better badge views

bzr revid: mat@openerp.com-20130412094313-x530vhkzrwvt0tei
---
 addons/gamification/badge.py                |  2 +-
 addons/gamification/badge_view.xml          | 36 +++++++++------------
 addons/gamification/static/src/css/goal.css |  2 +-
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/addons/gamification/badge.py b/addons/gamification/badge.py
index 3872c4362a2..7f7ddea7ce6 100644
--- a/addons/gamification/badge.py
+++ b/addons/gamification/badge.py
@@ -163,7 +163,7 @@ class gamification_badge(osv.Model):
                 ('having', 'People having some badges'),
                 ('nobody', 'No one'),
             ],
-            string="User Authorization Rule",
+            string="Allowed to Grant",
             help="Who can grant this badge",
             required=True),
         'rule_auth_user_ids': fields.many2many('res.users', 'rel_badge_auth_users',
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 55c8ffb6dfa..3d89bc752c2 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -67,13 +67,7 @@
             <field name="arch" type="xml">
                 <form string="Badge" version="7.0">
                     <header>
-                        <button string="Grant this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [
-                            '|',
-                                ('rule_auth', '=', 'nobody'),
-                                '&amp;',
-                                    ('rule_max', '=', True),
-                                    ('stat_this_month', '&gt;=', 'rule_max_number')
-                            ]}" />
+                        <button string="Grant this Badge" type="action" name="%(action_grant_wizard)d" class="oe_highlight" attrs="{'invisible': [('remaining_sending','!=',0)]}" />
                         <button string="Check Badge" type="object" name="check_automatic" groups="base.group_no_one" />
                     </header>
                     <sheet>
@@ -87,8 +81,8 @@
                         <group>
                             <field name="description" nolabel="1" placeholder="Badge Description" />
                         </group>
-                        <group string="User Rules">
-                            <field name="rule_auth" string="Allowed to Grant" widget="radio" />
+                        <group string="Rules for User Granting">
+                            <field name="rule_auth" widget="radio" />
                             <field name="rule_auth_user_ids" attrs="{'invisible': [('rule_auth','!=','users')]}" widget="many2many_tags" />
                             <field name="rule_auth_badge_ids" attrs="{'invisible': [('rule_auth','!=','having')]}" widget="many2many_tags" />
                             <field name="rule_max" attrs="{'invisible': [('rule_auth','=','nobody')]}" />
@@ -104,7 +98,7 @@
                                 </div>
                             </div>
                         </group>
-                        <group string="Automatic Rules">
+                        <group string="Rules for Automatic Granting">
                             <field name="rule_automatic" widget="radio"/>
                             <field name="compute_code" attrs="{'invisible': [('rule_automatic','!=','python')]}"/>
                             <field name="goal_type_ids" attrs="{'invisible': [('rule_automatic','!=','goals')]}" widget="many2many_tags"/>
@@ -151,12 +145,7 @@
                                         </ul>
                                     </div>
                                     <div class="oe_kanban_left">
-                                        <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="100" height="100" /></a>
-                                        <div class="oe_kanban_badge_avatars">
-                                            <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner">
-                                                <img t-att-src="kanban_image('res.users', 'image_small', owner)" t-att-data-member_id="owner"/>
-                                            </t>
-                                        </div>
+                                        <a type="open"><img t-att-src="kanban_image('gamification.badge', 'image', record.image.raw_value)" t-att-title="record.name.value" width="110" height="110" /></a>
                                     </div>
                                     <div>
                                         <h4><a type="open"><field name="name"/></a></h4>
@@ -168,19 +157,24 @@
                                         </p>
                                         <t t-if="record.remaining_sending.value != 0">
                                             <button type="action" name="%(action_grant_wizard)d" class="oe_highlight">Grant</button>
-                                            <p class="oe_grey">
+                                            <span class="oe_grey">
                                                 <t t-if="record.remaining_sending.value != -1">
-                                                    <t t-esc="record.remaining_sending.value"/>/<t t-esc="record.rule_max_number.value"/> remaining
+                                                    <t t-esc="record.remaining_sending.value"/>/<t t-esc="record.rule_max_number.value"/>
                                                 </t>
                                                 <t t-if="record.remaining_sending.value == -1">
                                                     ∞
                                                 </t>
-                                            </p>
+                                            </span>
                                         </t>
                                         <t t-if="record.remaining_sending.value == 0">
-                                            <div class="oe_grey">You can not send this badge</div>
+                                            <div class="oe_grey">Can not send</div>
                                         </t>
-                                    </div>                
+                                    </div>
+                                    <div class="oe_kanban_badge_avatars">
+                                        <t t-foreach="record.unique_owner_ids.raw_value.slice(0,11)" t-as="owner">
+                                            <img t-att-src="kanban_image('res.users', 'image_small', owner)" t-att-data-member_id="owner"/>
+                                        </t>
+                                    </div>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index cb8054f33b4..d5792d7864b 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -1,6 +1,6 @@
 /* Kanban views */
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal {
-  width: 220px;
+  width: 230px;
   min-height: 200px;
 }
 .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {