From fb51083d747ad2f209d060fb8b60e1c38b789e1b Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 4 Jul 2012 15:56:57 +0530
Subject: [PATCH] [IMP]improve company and translate and export translate view
 as per review

bzr revid: sgo@tinyerp.com-20120704102657-k61j3u2epiclua15
---
 .../addons/base/module/wizard/base_export_language_view.xml | 6 +++---
 .../base/module/wizard/base_language_install_view.xml       | 5 ++---
 openerp/addons/base/res/res_users_view.xml                  | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/module/wizard/base_export_language_view.xml b/openerp/addons/base/module/wizard/base_export_language_view.xml
index ea1bf244fe8..c84e85a2448 100644
--- a/openerp/addons/base/module/wizard/base_export_language_view.xml
+++ b/openerp/addons/base/module/wizard/base_export_language_view.xml
@@ -10,12 +10,12 @@
                 <form string="Export Translations" version="7.0">
                     <field invisible="1" name="state"/>
                     <header states="choose">
-                        <button icon="gtk-cancel" name="act_cancel" special="cancel" string="_Close" type="object"/>
-                        <button icon="gtk-ok" name="act_getfile" string="_Export" type="object"/>
+                        <button icon="gtk-ok" name="act_getfile" string="_Export" type="object" class="oe_highlight"/> or 
+                        <button icon="gtk-cancel" name="act_cancel" special="cancel" string="_Close" type="object" class="oe_link"/>
                     </header>
                     <sheet>
                         <group colspan="4">
-                            <group states="choose" string="Export Translation">
+                            <group states="choose">
                                 <field name="lang"/>
                                 <field name="format" required="1"/>
                                 <field height="200" name="modules" nolabel="1" colspan="4"/>
diff --git a/openerp/addons/base/module/wizard/base_language_install_view.xml b/openerp/addons/base/module/wizard/base_language_install_view.xml
index 9b738a57c95..86c5c8ea959 100644
--- a/openerp/addons/base/module/wizard/base_language_install_view.xml
+++ b/openerp/addons/base/module/wizard/base_language_install_view.xml
@@ -10,9 +10,8 @@
                 <form string="Load a Translation" version="7.0">
                     <field name="state" invisible="1"/>
                     <header states="init">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel" colspan="1"/>
-                        <label string="or" states="init"/>
-                        <button name="lang_install" string="Load" type="object" icon="gtk-ok" colspan="1" class="oe_highlight"/>
+                        <button name="lang_install" string="Load" type="object" icon="gtk-ok" colspan="1" class="oe_highlight"/> or 
+                        <button special="cancel" string="Cancel" icon="gtk-cancel" colspan="1" class="oe_link"/>
                     </header>
                     <sheet>
                         <group>
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index c4e6a7a370e..1e5af485cb1 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -87,7 +87,7 @@
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
-                            <label for="company_id" class="oe_edit_only"/>
+                            <label for="company_id" class="oe_edit_only" string="Default Company"/>
                             <h2><field name="company_id" context="{'user_preference': 0}"/></h2>
                         </div>
                         <group>
@@ -125,7 +125,7 @@
                             </page>
                             <page string="Allowed Companies" groups="base.group_multi_company">
                                 <group>
-                                    <field name="company_ids" widget="many2many_tags" string="Default Company"/>
+                                    <field name="company_ids" widget="many2many_tags" string="Allowed Company"/>
                                 </group>
                             </page>
                         </notebook>
@@ -205,7 +205,7 @@
                             <field name="name" readonly="1" class="oe_edit_only"/>
                             (<field name="login" readonly="1" class="oe_edit_only"/>)
                         </h1>
-                        <label for="company_id" class="oe_edit_only"/>
+                        <label for="company_id" class="oe_edit_only" string="Default Company"/>
                         <h2>
                             <field name="company_id" widget="selection" readonly="0"
                                 groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>