[MERGE] upstream

bzr revid: fva@openerp.com-20121217180033-6id1sw4gcoff3wvh

addons/web/static/src/css/base.css

@@ -30,7 +30,7 @@
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp.openerp_webclient_container {
   height: 100%;
@@ -998,6 +998,39 @@
   background-image: -o-linear-gradient(top, #646060, #262626);
   background-image: linear-gradient(to bottom, #646060, #262626);
 }
+.openerp .oe_topbar .oe_topbar_anonymous_login {
+  background-color: #dc5f59;
+  color: #eeeeee;
+  background-color: #fc8787;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#fc8787), to(maroon));
+  background-image: -webkit-linear-gradient(top, #fc8787, maroon);
+  background-image: -moz-linear-gradient(top, #fc8787, maroon);
+  background-image: -ms-linear-gradient(top, #fc8787, maroon);
+  background-image: -o-linear-gradient(top, #fc8787, maroon);
+  background-image: linear-gradient(to bottom, #fc8787, maroon);
+}
+.openerp .oe_topbar .oe_topbar_anonymous_login a {
+  display: block;
+  padding: 5px 10px 7px;
+  line-height: 20px;
+  height: 20px;
+  text-decoration: none;
+  color: white;
+  background: transparent;
+  -webkit-transition: all 0.2s ease-out;
+  -moz-transition: all 0.2s ease-out;
+  -ms-transition: all 0.2s ease-out;
+  -o-transition: all 0.2s ease-out;
+  transition: all 0.2s ease-out;
+}
+.openerp .oe_topbar .oe_topbar_anonymous_login a:hover {
+  background: rgba(0, 0, 0, 0.1);
+  color: white;
+  text-shadow: 0px 0px 3px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
+}
 .openerp .oe_topbar .oe_topbar_item {
   display: block;
   padding: 5px 10px 7px;
@@ -1203,7 +1236,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1228,7 +1261,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightGray;
+  border-top: 1px solid lightgrey;
   border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -2177,7 +2210,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -3168,3 +3201,7 @@ div.ui-widget-overlay {
     overflow: hidden !important;
   }
 }
+.blockUI.blockOverlay {
+  background-color: black;
+  opacity: 0.6;
+}

addons/web/static/src/css/base.sass

@@ -827,6 +827,24 @@ $sheet-padding: 16px
         height: 32px
         background-color: #414141
         @include vertical-gradient(#646060, #262626)
+        .oe_topbar_anonymous_login
+            background-color: #dc5f59
+            color: #eeeeee
+            @include vertical-gradient(#FC8787, #800000)
+            a
+                display: block
+                padding: 5px 10px 7px
+                line-height: 20px
+                height: 20px
+                text-decoration: none
+                color: white
+                background: transparent
+                @include transition(all 0.2s ease-out)
+            a:hover
+                background: rgba(0,0,0,0.1)
+                color: white
+                text-shadow: 0px 0px 3px rgba(0,0,0,0.2)
+                @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
         .oe_topbar_item
             display: block
             padding: 5px 10px 7px
@@ -1670,7 +1688,7 @@ $sheet-padding: 16px
                 width: 400px
                 padding-bottom: 0
         div.oe_chatter
-            box-sizing: border-box 
+            box-sizing: border-box
             min-width: $sheet-min-width + 2* $sheet-padding
             max-width: $sheet-max-width + 2* $sheet-padding
             margin: 0 auto
@@ -1942,7 +1960,7 @@ $sheet-padding: 16px
                 overflow: hidden
                 width: 24px
                 overflow: hidden
-                background: transparent 
+                background: transparent
                 color: #7C7BAD
                 box-shadow: none
                 border: none
@@ -2518,5 +2536,9 @@ div.ui-widget-overlay
             overflow: hidden !important
 // }}}
 
+.blockUI.blockOverlay
+    background-color: black
+    opacity: 0.6000000238418579
+
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:

addons/web/static/src/js/chrome.js

@@ -811,7 +811,6 @@ instance.web.Menu =  instance.web.Widget.extend({
                 });
             }
         });
-        
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -1302,12 +1301,21 @@ instance.web.WebClient = instance.web.Client.extend({
                             result.context,
                             {search_default_message_unread: true});
                     }
-                    return $.when(self.action_manager.do_action(result, {
+                    var completed = $.Deferred();
+                    $.when(self.action_manager.do_action(result, {
                         clear_breadcrumbs: true,
                         action_menu_id: self.menu.current_menu,
                     })).fail(function() {
                         self.menu.open_menu(options.previous_menu_id);
+                    }).always(function() {
+                        completed.resolve();
                     });
+                    setTimeout(function() {
+                        completed.resolve();
+                    }, 2000);
+                    // We block the menu when clicking on an element until the action has correctly finished
+                    // loading. If something crash, there is a 2 seconds timeout before it's unblocked.
+                    return completed;
                 });
             });
     },

addons/web_calendar/static/src/css/web_calendar.css

@@ -9,18 +9,9 @@
 }
 .openerp .oe_calendar {
   background-color: white;
-  height: 600px;
+  min-height: 600px;
   border-right: 1px solid #eeeeee;
 }
-.openerp .oe_calendar .oe_calendar_table {
-  position: absolute;
-  left: 0px;
-  right: 0px;
-  top: 0px;
-  border-top: 3px solid #eeeeee;
-  width: 100%;
-  overflow: hidden;
-}
 .openerp .oe_calendar .oe_calendar_filter {
   padding: 0 10px;
 }
@@ -30,9 +21,6 @@
 .openerp .oe_calendar .dhx_cal_navline {
   z-index: auto;
 }
-.openerp .oe_calendar.oe_cal_month .dhx_cal_data {
-  overflow-y: hidden;
-}
 .openerp .oe_calendar.oe_cal_month .dhx_cal_data table tr td:last-child div.dhx_month_body {
   padding-right: 5px;
 }

addons/web_calendar/static/src/css/web_calendar.sass

@@ -11,18 +11,9 @@
 
     .oe_calendar
         background-color: white
-        height: 600px
+        min-height: 600px
         border-right: 1px solid #eee
 
-        .oe_calendar_table
-            position: absolute
-            left: 0px
-            right: 0px
-            top: 0px
-            border-top: 3px solid #eee
-            width: 100%
-            overflow: hidden
-
         .oe_calendar_filter
             padding: 0 10px
 
@@ -36,7 +27,6 @@
             z-index: auto
 
         &.oe_cal_month .dhx_cal_data
-            overflow-y: hidden
 
             table tr td:last-child div.dhx_month_body
                 padding-right: 5px