diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-04-12 15:52:33 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-04-12 15:52:33 +0200 |
| commit | ef8ab87cff223bd09fd476fdb3ef9469a3fee986 (patch) | |
| tree | 6a788209690a73469fbc58eb432c0ce6d9ba155a | |
| parent | d5c4f14a1a5baf6edd794d1fcba57b258f525935 (diff) | |
[IMP] better UI
bzr revid: mat@openerp.com-20130412135233-wek9hcbnufost0tf
| -rw-r--r-- | addons/gamification/badge_view.xml | 2 | ||||
| -rw-r--r-- | addons/gamification/goal_view.xml | 8 | ||||
| -rw-r--r-- | addons/hr_gamification/badge_view.xml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml index 9f3c113f53f..9b615963bb9 100644 --- a/addons/gamification/badge_view.xml +++ b/addons/gamification/badge_view.xml @@ -29,7 +29,7 @@ <group> <field name="user_id" nolabel="1" /> <field name="badge_id" invisible="1"/> - <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters" /> + <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" /> </group> <footer> <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml index 8e1602b327a..b79dae4a41b 100644 --- a/addons/gamification/goal_view.xml +++ b/addons/gamification/goal_view.xml @@ -101,13 +101,13 @@ <filter name="my" string="My Goals" domain="[('user_id', '=', uid)]"/> <separator/> <filter name="draft" string="Draft" domain="[('state', '=', 'draft')]"/> - <filter name="inprogress" string="Opened" + <filter name="inprogress" string="Current" domain="[ '|', - ('state', 'in', ('inprogress', 'inprogress_update')), - ('end_date', '>=', context_today().strftime('%%Y-%%m-%%d')) + ('state', 'in', ('inprogress', 'inprogress_update')), + ('end_date', '>=', context_today().strftime('%%Y-%%m-%%d')) ]"/> - <filter name="closed" string="Closed" domain="[('state', 'in', ('reached', 'failed'))]"/> + <filter name="closed" string="Passed" domain="[('state', 'in', ('reached', 'failed'))]"/> <separator/> <field name="user_id"/> diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml index f8e9e550883..df1d03b5fca 100644 --- a/addons/hr_gamification/badge_view.xml +++ b/addons/hr_gamification/badge_view.xml @@ -13,7 +13,7 @@ <group> <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False)]" /> <field name="badge_id" invisible="1"/> - <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters" /> + <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" /> </group> <footer> <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or @@ -35,7 +35,7 @@ <group> <field name="employee_id" invisible="1" /> <field name="badge_id" nolabel="1" colspan="4" /> - <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters" /> + <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" /> </group> <footer> <button string="Reward Employee" type="object" name="action_grant_badge" class="oe_highlight" /> or |