Merge lp:~openerp-dev/openerp-web/7.0-kanban-folded-chm into lp:openerp-web/7.0

[Thibault Delavallée (OpenERP)]

[FIX] [IMP] kanban view: number of items in a column is now also displayed for folded columns. Indeed, using custom filters, it can be interesting to know whether there are items in the folded column. This branch also solves some CSS issues related to kanban view and re-indent some code.

=== modified file 'addons/web_kanban/static/src/css/kanban.css'
--- addons/web_kanban/static/src/css/kanban.css	2013-01-09 09:44:51 +0000
+++ addons/web_kanban/static/src/css/kanban.css	2013-01-30 12:32:23 +0000
@@ -92,12 +92,21 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.openerp .oe_kanban_view .oe_kanban_group_title .oe_kanban_group_length {
+.openerp .oe_kanban_view .oe_kanban_group_length {
+  text-align: center;
+  display: none;
+}
+.openerp .oe_kanban_view .oe_kanban_group_length .oe_tag {
+  position: relative;
+  top: +8px;
+  font-weight: bold;
+}
+.openerp .oe_kanban_view .oe_fold_column .oe_kanban_group_length {
   position: absolute;
   top: -1px;
   right: -14px;
-  text-align: center;
   float: right;
+  display: block;
 }
 .openerp .oe_kanban_view .oe_kanban_header:hover .oe_kanban_group_length {
   display: none;
@@ -141,7 +150,8 @@
 .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title, .openerp .oe_kanban_view .oe_kanban_group_folded.oe_kanban_column *, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_aggregates, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_add {
   display: none;
 }
-.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title_vertical {
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title_vertical,
+.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_length {
   display: block;
 }
 .openerp .oe_kanban_view .oe_kanban_group_folded .oe_dropdown_kanban {
@@ -163,7 +173,7 @@
   display: none;
   position: relative;
   opacity: 0.75;
-  top: 20px;
+  top: 26px;
 }
 .openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
   margin-left: 4px;
@@ -175,6 +185,7 @@
 }
 .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
   top: -2px;
+  height: 14px;
 }
 .openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_dropdown_toggle {
   cursor: pointer;

=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
--- addons/web_kanban/static/src/css/kanban.sass	2013-01-09 09:44:51 +0000
+++ addons/web_kanban/static/src/css/kanban.sass	2013-01-30 12:32:23 +0000
@@ -54,6 +54,13 @@
     &.oe_kanban_grouped .oe_kanban_dummy_cell
         background: url(/web/static/src/img/form_sheetbg.png)
         width: 100%
+    .oe_kanban_group_length
+        text-align: center
+        display: none
+        .oe_tag
+            position: relative
+            top: +8px
+            font-weight: bold
     .ui-sortable-placeholder
         border: 1px solid rgba(0,0,0,0.1)
         visibility: visible !important
@@ -118,12 +125,13 @@
             white-space: nowrap
             overflow: hidden
             text-overflow: ellipsis
+    .oe_fold_column
         .oe_kanban_group_length
           position: absolute
           top: -1px
           right: -14px
-          text-align: center
           float: right
+          display: block
     &.oe_kanban_grouped
         .oe_kanban_column, .oe_kanban_group_header
             width: 185px
@@ -159,7 +167,7 @@
     .oe_kanban_group_folded
         .oe_kanban_group_title, &.oe_kanban_column *, .oe_kanban_aggregates, .oe_kanban_add
             display: none
-        .oe_kanban_group_title_vertical
+        .oe_kanban_group_title_vertical, .oe_kanban_group_length
             display: block
         .oe_dropdown_kanban
             left: -5px
@@ -178,7 +186,7 @@
         display: none
         position: relative
         opacity: 0.75
-        top: 20px
+        top: 26px
     // }}}
     // KanbanQuickCreate {{{
     .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
@@ -189,6 +197,7 @@
         top: -8px
     .oe_kanban_header .oe_dropdown_toggle
         top: -2px
+        height: 14px;
     .oe_kanban_card, .oe_dropdown_toggle
         cursor: pointer
         display: inline-block

=== modified file 'addons/web_kanban/static/src/xml/web_kanban.xml'
--- addons/web_kanban/static/src/xml/web_kanban.xml	2013-01-09 09:44:51 +0000
+++ addons/web_kanban/static/src/xml/web_kanban.xml	2013-01-30 12:32:23 +0000
@@ -34,16 +34,21 @@
                 <t t-if="widget.view._is_quick_create_enabled()">
                     <div class="oe_kanban_add oe_e" title="Quick create">]</div>
                 </t>
-                    <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                        <span class="oe_e">í</span>
-                        <ul class="oe_dropdown_menu oe_kanban_group_dropdown">
-                            <li><a data-action="toggle_fold" href="#">Fold</a></li>
-                            <t t-if="widget.view.grouped_by_m2o and widget.value">
-                                <li><a data-action="edit" href="#">Edit</a></li>
-                                <li><a data-action="delete" href="#">Delete</a></li>
-                            </t>
-                        </ul>
+                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                    <div class="oe_kanban_group_length">
+                        <span class="oe_tag">
+                            <t t-if="widget.group.get('length') &gt; 99"> 99+ </t><t t-if="widget.group.get('length') &lt;= 99"> <t t-esc="widget.group.get('length')"/> </t>
+                        </span>
                     </div>
+                    <span class="oe_e">í</span>
+                    <ul class="oe_dropdown_menu oe_kanban_group_dropdown">
+                        <li><a data-action="toggle_fold" href="#">Fold</a></li>
+                        <t t-if="widget.view.grouped_by_m2o and widget.value">
+                            <li><a data-action="edit" href="#">Edit</a></li>
+                            <li><a data-action="delete" href="#">Delete</a></li>
+                        </t>
+                    </ul>
+                </div>
                 <div class="oe_fold_column">
                     <div t-attf-class="oe_kanban_group_title #{widget.undefined_title ? 'oe_kanban_group_title_undefined' : ''}">
                         <div class="oe_kanban_group_length oe_tag">
@@ -57,7 +62,9 @@
                         </li>
                     </ul>
                 </div>
-                <span t-if="widget.title" class="oe_kanban_group_title_vertical"><t t-esc="widget.title"/></span>
+                <span t-if="widget.title" class="oe_kanban_group_title_vertical">
+                    <t t-esc="widget.title"/>
+                </span>
             </div>
         </t>
         <t t-if="! widget.view.group_by &amp;&amp; widget.view._is_quick_create_enabled()">