[MERGE] Merged with sbh branch holding code update

bzr revid: tde@openerp.com-20120405125046-ixvmxuw4wkv4yksp

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

@@ -220,6 +220,17 @@
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
   -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
 }
+.openerp2 .oe_secondary_submenu li .oe_menu_counter {
+  float: right;
+  background: #eeeeee;
+  color: #8a89ba;
+  font-weight: bold;
+  border-width: 1px;
+  padding-top: 2px;
+  padding-right: 4px;
+  padding-left: 4px;
+  border-radius: 2px;
+}
 .openerp2 .oe_secondary_submenu .oe_active {
   background: #8a89ba;
   border-top: 1px solid lightGray;
@@ -240,6 +251,17 @@
   -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
 }
+.openerp2 .oe_secondary_submenu .oe_active .oe_menu_counter {
+  float: right;
+  background: #eeeeee;
+  color: #8a89ba;
+  font-weight: bold;
+  border-width: 1px;
+  padding-top: 2px;
+  padding-right: 4px;
+  padding-left: 4px;
+  border-radius: 2px;
+}
 .openerp2 .oe_secondary_submenu .oe_menu_toggler:before {
   width: 0;
   height: 0;
@@ -264,17 +286,6 @@
   border-right: 4px solid transparent;
   border-top: 4px solid #4c4c4c;
 }
-.oe_menu_counter {
-  float:right;
-  background: #eeeeee;
-  color: #8a89ba;
-  font-weight: bold;
-  border-width:1px;
-  padding-top:2px;
-  padding-right:4px;
-  padding-left:4px;
-  border-radius:2px;
-}
 .openerp2 .oe_dropdown {
   position: relative;
 }

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

@@ -238,6 +238,16 @@ $colour4: #8a89ba
                 text-shadow: 0 1px 1px rgba(0,0,0,0.2)
                 @include radius(4px)
                 @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2))
+            .oe_menu_counter 
+                float: right
+                background: #eeeeee
+                color: #8a89ba
+                font-weight: bold
+                border-width: 1px
+                padding-top: 2px
+                padding-right: 4px
+                padding-left: 4px
+                border-radius: 2px
         .oe_active
             background: $colour4
             border-top: 1px solid lightGray
@@ -251,6 +261,16 @@ $colour4: #8a89ba
                 color: $colour4
                 text-shadow: 0 1px 1px white
                 @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2))
+            .oe_menu_counter 
+                float: right
+                background: #eeeeee
+                color: #8a89ba
+                font-weight: bold
+                border-width: 1px
+                padding-top: 2px
+                padding-right: 4px
+                padding-left: 4px
+                border-radius: 2px
         .oe_menu_toggler:before
             width: 0
             height: 0

addons/web/static/src/js/view_list.js

@@ -82,6 +82,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             }
             self.compute_aggregates();
         });
+
         this.no_leaf = false;
     },
     /**
@@ -775,7 +776,7 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
      *
      * @constructs openerp.web.ListView.List
      * @extends openerp.web.Class
-     *
+     * 
      * @param {Object} opts display options, identical to those of :js:class:`openerp.web.ListView`
      */
     init: function (group, opts) {
@@ -1513,7 +1514,7 @@ var Record = openerp.web.Class.extend(/** @lends Record# */{
     /**
      * @constructs Record
      * @extends openerp.web.Class
-     *
+     * 
      * @mixes Events
      * @param {Object} [data]
      */
@@ -1595,11 +1596,11 @@ var Collection = openerp.web.Class.extend(/** @lends Collection# */{
      * Smarter collections, with events, very strongly inspired by Backbone's.
      *
      * Using a "dumb" array of records makes synchronization between the
-     * various serious
+     * various serious 
      *
      * @constructs Collection
      * @extends openerp.web.Class
-     *
+     * 
      * @mixes Events
      * @param {Array} [records] records to initialize the collection with
      * @param {Object} [options]