fix loading

bzr revid: al@openerp.com-20120408150633-k7g8pph11eey9at4

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

@@ -96,6 +96,9 @@
 .openerp2 .oe_clear {
   clear: both;
 }
+.openerp2 .oe_wait {
+  cursor: wait;
+}
 .openerp2 a.button:link, .openerp2 a.button:visited, .openerp2 button, .openerp2 input[type='submit'] {
   display: inline-block;
   border: 1px solid #ababab;
@@ -223,6 +226,23 @@
   background-image: -o-linear-gradient(top, #dc5f59, #b33630);
   background-image: linear-gradient(to bottom, #dc5f59, #b33630);
 }
+.openerp2 .oe_loading {
+  display: none;
+  z-index: 100;
+  position: fixed;
+  top: 0;
+  right: 50%;
+  padding: 4px 12px;
+  background: #a61300;
+  color: white;
+  text-align: center;
+  border: 1px solid #990000;
+  border-top: none;
+  -moz-border-radius-bottomright: 8px;
+  -moz-border-radius-bottomleft: 8px;
+  border-bottom-right-radius: 8px;
+  border-bottom-left-radius: 8px;
+}
 .openerp2 .oe_topbar {
   width: 100%;
   height: 31px;
@@ -1060,15 +1080,10 @@
   margin-left: 6px;
   border-top-color: #404040;
 }
-.openerp2 .oe_view_manager_header .filter {
+.openerp2 .oe_view_manager_header .oe_filter {
   vertical-align: top;
 }
-.openerp2 .oe_view_manager_header .filter li {
-  height: 24px;
-  line-height: 24px;
-  padding: 0 8px;
-}
-.openerp2 .oe_view_manager_header .pagination li {
+.openerp2 .oe_view_manager_header .oe_filter li {
   height: 24px;
   line-height: 24px;
   padding: 0 8px;
@@ -1103,12 +1118,13 @@
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
-.openerp2 .oe_view_manager_header .oe_view_manager_switch li {
-  padding-left: 1px;
-  text-align: center;
-  width: 24px;
+.openerp2 .oe_view_manager_header .pagination li {
   height: 24px;
   line-height: 24px;
+  padding: 0 8px;
+}
+.openerp2 .oe_view_manager_header .oe_view_manager_switch {
+  float: right;
 }
 .openerp2 .oe_form_header {
   padding: 8px;
@@ -1124,9 +1140,6 @@
 .openerp2 .oe_form_header .oe-sidebar-attachments {
   display: none;
 }
-.openerp2 .oe_form label {
-  font-weight: bold;
-}
 .openerp2 .oe_form_group_cell {
   line-height: 18px;
 }
@@ -1241,6 +1254,9 @@
   -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
   -box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
 }
+.openerp2 .oe_form label {
+  font-weight: bold;
+}
 .openerp2 .oe_form_label_help[for], .openerp2 .oe_form_label[for] {
   white-space: nowrap;
 }

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

@@ -67,6 +67,12 @@ $colour4: #8a89ba
 // }}}
 
 .openerp2
+    // {{{ Loading
+    // }}}
+    // {{{ Loading
+    // }}}
+    // {{{ Loading
+    // }}}
     // Global style {{{
     padding: 0
     margin: 0
@@ -128,6 +134,8 @@ $colour4: #8a89ba
         float: right
     .oe_clear
         clear: both
+    .oe_wait
+        cursor: wait
     // }}}
     // Button style {{{
     a.button:link, a.button:visited, button, input[type='submit']
@@ -194,6 +202,24 @@ $colour4: #8a89ba
         @include vertical-gradient(#dc5f59, #b33630)
 
     // }}}
+    // {{{ Loading
+    .oe_loading
+        display: none
+        z-index: 100
+        position: fixed
+        top: 0
+        right: 50%
+        padding: 4px 12px
+        background: #A61300
+        color: white
+        text-align: center
+        border: 1px solid #900
+        border-top: none
+        -moz-border-radius-bottomright: 8px
+        -moz-border-radius-bottomleft: 8px
+        border-bottom-right-radius: 8px
+        border-bottom-left-radius: 8px
+    // }}}
     // Topbar {{{
     .oe_topbar
         width: 100%
@@ -849,8 +875,7 @@ $colour4: #8a89ba
                     @include box-shadow(none)
 
     // }}}
-
-    // Content Header {{{
+    // ViewManager Header {{{
     .oe_view_manager_header
         border-top: 1px solid #cacaca
         border-bottom: 1px solid #cacaca
@@ -872,17 +897,12 @@ $colour4: #8a89ba
                 margin-top: 7px
                 margin-left: 6px
                 border-top-color: #404040
-        .filter
+        .oe_filter
             vertical-align: top
             li
                 height: 24px
                 line-height: 24px
                 padding: 0 8px
-        .pagination
-            li
-                height: 24px
-                line-height: 24px
-                padding: 0 8px
         .oe_button_group
             display: inline-block
             border: 1px solid #ababab
@@ -902,17 +922,14 @@ $colour4: #8a89ba
                 a
                     color: #fff
                     text-shadow: 0 1px 2px rgba(0,0,0,0.4)
-
-        .oe_view_manager_switch
+        .pagination
             li
-                padding-left: 1px
-                text-align: center
-                width: 24px
                 height: 24px
                 line-height: 24px
+                padding: 0 8px
+        .oe_view_manager_switch
+            float: right
     // }}}
-
-
     // FormView Chrome {{{
     .oe_form_header
         padding: 8px
@@ -928,9 +945,6 @@ $colour4: #8a89ba
 
     // }}}
     // FormView Body {{{
-    .oe_form
-        label
-            font-weight: bold
     .oe_form_group_cell
         line-height: 18px
         .oe_form_button
@@ -1033,6 +1047,9 @@ $colour4: #8a89ba
         //        line-height: 18px
     // }}}
     // FormView Label {{{
+    .oe_form
+        label
+            font-weight: bold
     .oe_form_label_help[for], .oe_form_label[for]
         white-space: nowrap
     // }}}

addons/web/static/src/css/base_old.css

@@ -58,34 +58,12 @@
     display: none;
 }
 
-/* Loading */
-.loading {
-    cursor: wait;
-}
-.openerp .loading {
-    display: none;
-    z-index: 100;
-    position: fixed;
-    top: 0;
-    right: 50%;
-    padding: 4px 12px;
-    background: #A61300;
-    color: white;
-    text-align: center;
-    border: 1px solid #900;
-    border-top: none;
-    -moz-border-radius-bottomright: 8px;
-    -moz-border-radius-bottomleft: 8px;
-    border-bottom-right-radius: 8px;
-    border-bottom-left-radius: 8px;
-}
-.openerp .oe_notification {
+.oe_notification
     z-index: 1050;
     display: none;
-}
-.openerp .oe_notification * {
+.oe_notification *
     color: white;
-}
+
 
 /* Login page */
 

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

@@ -214,15 +214,8 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
     }
 });
 
-openerp.web.Loading = openerp.web.OldWidget.extend(/** @lends openerp.web.Loading# */{
+openerp.web.Loading = openerp.web.Widget.extend({
     template: 'Loading',
-    /**
-     * @constructs openerp.web.Loading
-     * @extends openerp.web.OldWidget
-     *
-     * @param parent
-     * @param element_id
-     */
     init: function(parent) {
         this._super(parent);
         this.count = 0;
@@ -255,10 +248,9 @@ openerp.web.Loading = openerp.web.OldWidget.extend(/** @lends openerp.web.Loadin
 
         this.count += increment;
         if (this.count > 0) {
-            $(".loading",this.$element).text(_.str.sprintf(
-                _t("Loading (%d)"), this.count));
-            $(".loading",this.$element).show();
-            this.getParent().$element.addClass('loading');
+            this.$element.text(_.str.sprintf( _t("Loading (%d)"), this.count));
+            this.$element.show();
+            this.getParent().$element.addClass('oe_wait');
         } else {
             this.count = 0;
             clearTimeout(this.long_running_timer);
@@ -267,8 +259,8 @@ openerp.web.Loading = openerp.web.OldWidget.extend(/** @lends openerp.web.Loadin
                 this.blocked_ui = false;
                 $.unblockUI();
             }
-            $(".loading",this.$element).fadeOut();
-            this.getParent().$element.removeClass('loading');
+            this.$element.fadeOut();
+            this.getParent().$element.removeClass('oe_wait');
         }
     }
 });

addons/web/static/src/js/views.js

@@ -262,7 +262,7 @@ session.web.ViewManager =  session.web.OldWidget.extend(/** @lends session.web.V
     start: function() {
         this._super();
         var self = this;
-        this.$element.find('.oe_vm_switch button').click(function() {
+        this.$element.find('.oe_view_manager_switch button').click(function() {
             self.on_mode_switch($(this).data('view-type'));
         });
         var views_ids = {};

addons/web/static/src/xml/base.xml

@@ -6,10 +6,8 @@
     <div></div>
 </t>
 <t t-name="Loading">
-    <div id="oe_loading">
-        <div class="loading">
+    <div class="oe_loading">
         Loading...
-        </div>
     </div>
 </t>
 <t t-name="Notification">