From 563ba21620585ae4a8d007757ccc214929e623a9 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 28 Apr 2012 03:23:04 +0200
Subject: [PATCH] user_menu preferences, viewmanager css, menu empty
 needactions

bzr revid: al@openerp.com-20120428012304-8z27jmbo7vgn380q
---
 addons/web/static/src/css/base.css    |  5 ++---
 addons/web/static/src/css/base.sass   |  5 ++---
 addons/web/static/src/js/chrome.js    |  2 +-
 addons/web/static/src/js/view_form.js |  6 ++++--
 addons/web/static/src/xml/base.xml    | 14 +++++++-------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c960b6ed39d..26f77c739d4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -432,7 +432,6 @@
   width: 100%;
   height: 31px;
   border-top: solid 1px #d3d3d3;
-  border-bottom: solid 1px black;
   background-color: #646060;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
   background-image: -webkit-linear-gradient(top, #646060, #262626);
@@ -874,13 +873,12 @@
   margin: 8px;
 }
 .openerp .oe_view_manager_header2 .oe_view_manager_header2_row2 {
-  margin: 8px;
+  margin: 0 8px 8px 8px;
 }
 .openerp .oe_view_manager_header2 td {
   line-height: 26px;
 }
 .openerp .oe_view_manager_header2 h2 {
-  float: left;
   font-size: 18px;
   margin: 1px 0;
 }
@@ -1044,6 +1042,7 @@
   line-height: 14px;
   color: #4c4c4c;
   text-decoration: none;
+  cursor: pointer;
 }
 .openerp .oe_dropdown_menu li a:hover {
   text-decoration: none;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 63ed68a7b67..e9890bcc922 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -356,7 +356,6 @@ $colour4: #8a89ba
         width: 100%
         height: 31px
         border-top: solid 1px #d3d3d3
-        border-bottom: solid 1px black
         @include vertical-gradient(#646060, #262626)
 
         .oe_systray
@@ -687,11 +686,10 @@ $colour4: #8a89ba
         .oe_view_manager_header2_row1
             margin: 8px
         .oe_view_manager_header2_row2
-            margin: 8px
+            margin: 0 8px 8px 8px
         td
             line-height: 26px
         h2
-            float: left
             font-size: 18px
             margin: 1px 0
             a
@@ -822,6 +820,7 @@ $colour4: #8a89ba
                 line-height: 14px
                 color: #4c4c4c
                 text-decoration: none
+                cursor: pointer
                 &:hover
                     text-decoration: none
                     @include vertical-gradient(#f0f0fa, #eeeef6)
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 1a98874c306..542f3aa0985 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -833,8 +833,8 @@ instance.web.UserMenu =  instance.web.Widget.extend({
             title: _t("Preferences"),
             width: '700px',
             buttons: [
-                {text: _t("Cancel"), click: function(){ $(this).dialog('destroy'); }},
                 {text: _t("Change password"), click: function(){ self.change_password(); }},
+                {text: _t("Cancel"), click: function(){ $(this).dialog('destroy'); }},
                 {text: _t("Save"), click: function(){
                         var inner_viewmanager = action_manager.inner_viewmanager;
                         inner_viewmanager.views[inner_viewmanager.active_view].controller.do_save()
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 53038ff1e11..5f24822c13b 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1676,6 +1676,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(/** @lends
      * @param node
      */
     init: function(field_manager, node) {
+        
         this._super(field_manager, node);
         this.field_manager = field_manager;
         this.name = this.node.attrs.name;
@@ -1700,6 +1701,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(/** @lends
         });
     },
     start: function() {
+        var self = this;
         this._super.apply(this, arguments);
         if (this.field.translate) {
             this.$element.addClass('oe_form_field_translatable');
@@ -1712,10 +1714,10 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(/** @lends
         }
         if (!this.disable_utility_classes) {
             var set_required = function() {
-                this.$element.toggleClass('oe_form_required', this.get("required"));
+                self.$element.toggleClass('oe_form_required', self.get("required"));
             };
             this.on("change:required", this, set_required);
-            _.bind(set_required, this)();
+            set_required();
         }
     },
     set_value: function(value_) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 6fbbadf7adb..03d616c8886 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -307,7 +307,7 @@
         t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''"
         t-att-data-action-id="menu.action ? menu.action.split(',')[1] : ''">
         <t t-esc="menu.name"/>
-        <t t-if="menu.needaction_enabled">
+        <t t-if="menu.needaction_enabled &amp;&amp; menu.needaction_counter">
             <div class="oe_menu_counter">
                 <t t-esc="menu.needaction_counter"/>
             </div>
@@ -324,7 +324,7 @@
             </a>
             <ul class="oe_dropdown_options">
                 <li><a href="#" data-menu="about">About OpenERP</a></li>
-                <li><a href="#" data-menu="settings">Settings</a></li>
+                <li><a href="#" data-menu="settings">Preferences</a></li>
                 <li><a href="#" data-menu="logout">Log out</a></li>
                 <li><hr/></li>
             </ul>
@@ -425,20 +425,20 @@
             </tr>
             <tr>
                 <td>
-                    <div class="oe_view_manager_header2_row1">
+                    <div class="oe_view_manager_header2_row2">
                         <div class="oe_view_manager_buttons"/>
                     </div>
                 </td>
                 <td>
-                    <div class="oe_view_manager_header2_row1">
+                    <div class="oe_view_manager_header2_row2">
                         <div class="oe_view_manager_sidebar"/>
                     </div>
                 </td>
                 <td>
-                    <div class="oe_view_manager_header2_row1">
+                    <div class="oe_view_manager_header2_row2">
                     <ul class="oe_view_manager_switch oe_button_group oe_right">
-                        <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
-                          <li><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
+                        <t t-if="widget.views_src.length > 2" t-foreach="widget.views_src" t-as="view">
+                          <li t-if="view.view_type != 'form'"><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
                             </a></li>
                         </t>
                     </ul>