Odoo Web (MOVED TO GITHUB)

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

  1. 7.0-kanban-folded-chm
  2. Merge into 7.0
Proposed by Thibault Delavallée (OpenERP)
Status: Merged
Merged at revision: 3732
Proposed branch: lp:~openerp-dev/openerp-web/7.0-kanban-folded-chm
Merge into: lp:openerp-web/7.0
Diff against target: 159 lines (+44/-17)
3 files modified
addons/web_kanban/static/src/css/kanban.css (+15/-4)
addons/web_kanban/static/src/css/kanban.sass (+12/-3)
addons/web_kanban/static/src/xml/web_kanban.xml (+17/-10)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-kanban-folded-chm
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+145591@code.launchpad.net

Description of the change

[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.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
92 overflow: hidden;92 overflow: hidden;
93 text-overflow: ellipsis;93 text-overflow: ellipsis;
94}94}
95.openerp .oe_kanban_view .oe_kanban_group_title .oe_kanban_group_length {95.openerp .oe_kanban_view .oe_kanban_group_length {
96 text-align: center;
97 display: none;
98}
99.openerp .oe_kanban_view .oe_kanban_group_length .oe_tag {
100 position: relative;
101 top: +8px;
102 font-weight: bold;
103}
104.openerp .oe_kanban_view .oe_fold_column .oe_kanban_group_length {
96 position: absolute;105 position: absolute;
97 top: -1px;106 top: -1px;
98 right: -14px;107 right: -14px;
99 text-align: center;
100 float: right;108 float: right;
109 display: block;
101}110}
102.openerp .oe_kanban_view .oe_kanban_header:hover .oe_kanban_group_length {111.openerp .oe_kanban_view .oe_kanban_header:hover .oe_kanban_group_length {
103 display: none;112 display: none;
@@ -141,7 +150,8 @@
141.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 {150.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 {
142 display: none;151 display: none;
143}152}
144.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title_vertical {153.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title_vertical,
154.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_length {
145 display: block;155 display: block;
146}156}
147.openerp .oe_kanban_view .oe_kanban_group_folded .oe_dropdown_kanban {157.openerp .oe_kanban_view .oe_kanban_group_folded .oe_dropdown_kanban {
@@ -163,7 +173,7 @@
163 display: none;173 display: none;
164 position: relative;174 position: relative;
165 opacity: 0.75;175 opacity: 0.75;
166 top: 20px;176 top: 26px;
167}177}
168.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {178.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
169 margin-left: 4px;179 margin-left: 4px;
@@ -175,6 +185,7 @@
175}185}
176.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {186.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
177 top: -2px;187 top: -2px;
188 height: 14px;
178}189}
179.openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_dropdown_toggle {190.openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_dropdown_toggle {
180 cursor: pointer;191 cursor: pointer;
181192
=== 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 @@
54 &.oe_kanban_grouped .oe_kanban_dummy_cell54 &.oe_kanban_grouped .oe_kanban_dummy_cell
55 background: url(/web/static/src/img/form_sheetbg.png)55 background: url(/web/static/src/img/form_sheetbg.png)
56 width: 100%56 width: 100%
57 .oe_kanban_group_length
58 text-align: center
59 display: none
60 .oe_tag
61 position: relative
62 top: +8px
63 font-weight: bold
57 .ui-sortable-placeholder64 .ui-sortable-placeholder
58 border: 1px solid rgba(0,0,0,0.1)65 border: 1px solid rgba(0,0,0,0.1)
59 visibility: visible !important66 visibility: visible !important
@@ -118,12 +125,13 @@
118 white-space: nowrap125 white-space: nowrap
119 overflow: hidden126 overflow: hidden
120 text-overflow: ellipsis127 text-overflow: ellipsis
128 .oe_fold_column
121 .oe_kanban_group_length129 .oe_kanban_group_length
122 position: absolute130 position: absolute
123 top: -1px131 top: -1px
124 right: -14px132 right: -14px
125 text-align: center
126 float: right133 float: right
134 display: block
127 &.oe_kanban_grouped135 &.oe_kanban_grouped
128 .oe_kanban_column, .oe_kanban_group_header136 .oe_kanban_column, .oe_kanban_group_header
129 width: 185px137 width: 185px
@@ -159,7 +167,7 @@
159 .oe_kanban_group_folded167 .oe_kanban_group_folded
160 .oe_kanban_group_title, &.oe_kanban_column *, .oe_kanban_aggregates, .oe_kanban_add168 .oe_kanban_group_title, &.oe_kanban_column *, .oe_kanban_aggregates, .oe_kanban_add
161 display: none169 display: none
162 .oe_kanban_group_title_vertical170 .oe_kanban_group_title_vertical, .oe_kanban_group_length
163 display: block171 display: block
164 .oe_dropdown_kanban172 .oe_dropdown_kanban
165 left: -5px173 left: -5px
@@ -178,7 +186,7 @@
178 display: none186 display: none
179 position: relative187 position: relative
180 opacity: 0.75188 opacity: 0.75
181 top: 20px189 top: 26px
182 // }}}190 // }}}
183 // KanbanQuickCreate {{{191 // KanbanQuickCreate {{{
184 .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle192 .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
@@ -189,6 +197,7 @@
189 top: -8px197 top: -8px
190 .oe_kanban_header .oe_dropdown_toggle198 .oe_kanban_header .oe_dropdown_toggle
191 top: -2px199 top: -2px
200 height: 14px;
192 .oe_kanban_card, .oe_dropdown_toggle201 .oe_kanban_card, .oe_dropdown_toggle
193 cursor: pointer202 cursor: pointer
194 display: inline-block203 display: inline-block
195204
=== 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 @@
34 <t t-if="widget.view._is_quick_create_enabled()">34 <t t-if="widget.view._is_quick_create_enabled()">
35 <div class="oe_kanban_add oe_e" title="Quick create">]</div>35 <div class="oe_kanban_add oe_e" title="Quick create">]</div>
36 </t>36 </t>
37 <div class="oe_dropdown_toggle oe_dropdown_kanban">37 <div class="oe_dropdown_toggle oe_dropdown_kanban">
38 <span class="oe_e">í</span>38 <div class="oe_kanban_group_length">
39 <ul class="oe_dropdown_menu oe_kanban_group_dropdown">39 <span class="oe_tag">
40 <li><a data-action="toggle_fold" href="#">Fold</a></li>40 <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>
41 <t t-if="widget.view.grouped_by_m2o and widget.value">41 </span>
42 <li><a data-action="edit" href="#">Edit</a></li>
43 <li><a data-action="delete" href="#">Delete</a></li>
44 </t>
45 </ul>
46 </div>42 </div>
43 <span class="oe_e">í</span>
44 <ul class="oe_dropdown_menu oe_kanban_group_dropdown">
45 <li><a data-action="toggle_fold" href="#">Fold</a></li>
46 <t t-if="widget.view.grouped_by_m2o and widget.value">
47 <li><a data-action="edit" href="#">Edit</a></li>
48 <li><a data-action="delete" href="#">Delete</a></li>
49 </t>
50 </ul>
51 </div>
47 <div class="oe_fold_column">52 <div class="oe_fold_column">
48 <div t-attf-class="oe_kanban_group_title #{widget.undefined_title ? 'oe_kanban_group_title_undefined' : ''}">53 <div t-attf-class="oe_kanban_group_title #{widget.undefined_title ? 'oe_kanban_group_title_undefined' : ''}">
49 <div class="oe_kanban_group_length oe_tag">54 <div class="oe_kanban_group_length oe_tag">
@@ -57,7 +62,9 @@
57 </li>62 </li>
58 </ul>63 </ul>
59 </div>64 </div>
60 <span t-if="widget.title" class="oe_kanban_group_title_vertical"><t t-esc="widget.title"/></span>65 <span t-if="widget.title" class="oe_kanban_group_title_vertical">
66 <t t-esc="widget.title"/>
67 </span>
61 </div>68 </div>
62 </t>69 </t>
63 <t t-if="! widget.view.group_by &amp;&amp; widget.view._is_quick_create_enabled()">70 <t t-if="! widget.view.group_by &amp;&amp; widget.view._is_quick_create_enabled()">