[IMP] Kanban: Added white and gray colors. Color#0 (white) is the default color
bzr revid: fme@openerp.com-20111027160151-2yet6p62l1xsb99c
This commit is contained in:
parent
2944108e6e
commit
0e6a72cb8d
|
@ -134,91 +134,113 @@
|
|||
}
|
||||
|
||||
/* Custom colors are also present in kanban.js */
|
||||
/* Custom color#0 */
|
||||
.openerp .oe_kanban_color_0 .oe_kanban_color_bglight {
|
||||
background: #FFFFFF;
|
||||
}
|
||||
.openerp .oe_kanban_color_0 .oe_kanban_color_bgdark {
|
||||
background: #EEEEEE;
|
||||
}
|
||||
.openerp .oe_kanban_color_0 .oe_kanban_color_border {
|
||||
border-color: #CCCCCC;
|
||||
}
|
||||
|
||||
/* Custom color#1 */
|
||||
.openerp .oe_kanban_color_1 .oe_kanban_color_bglight {
|
||||
background: #FFC7C7;
|
||||
background: #CCCCCC;
|
||||
}
|
||||
.openerp .oe_kanban_color_1 .oe_kanban_color_bgdark {
|
||||
background: #FF8F8F;
|
||||
background: #999999;
|
||||
}
|
||||
.openerp .oe_kanban_color_1 .oe_kanban_color_border {
|
||||
border-color: #D97979;
|
||||
border-color: #666666;
|
||||
}
|
||||
|
||||
/* Custom color#2 */
|
||||
.openerp .oe_kanban_color_2 .oe_kanban_color_bglight {
|
||||
background: #FFF1C7;
|
||||
background: #FFC7C7;
|
||||
}
|
||||
.openerp .oe_kanban_color_2 .oe_kanban_color_bgdark {
|
||||
background: #FFE38F;
|
||||
background: #FF8F8F;
|
||||
}
|
||||
.openerp .oe_kanban_color_2 .oe_kanban_color_border {
|
||||
border-color: #D9C179;
|
||||
border-color: #D97979;
|
||||
}
|
||||
|
||||
/* Custom color#3 */
|
||||
.openerp .oe_kanban_color_3 .oe_kanban_color_bglight {
|
||||
background: #E3FFC7;
|
||||
background: #FFF1C7;
|
||||
}
|
||||
.openerp .oe_kanban_color_3 .oe_kanban_color_bgdark {
|
||||
background: #C7FF8F;
|
||||
background: #FFE38F;
|
||||
}
|
||||
.openerp .oe_kanban_color_3 .oe_kanban_color_border {
|
||||
border-color: #A9D979;
|
||||
border-color: #D9C179;
|
||||
}
|
||||
|
||||
/* Custom color#4 */
|
||||
.openerp .oe_kanban_color_4 .oe_kanban_color_bglight {
|
||||
background: #C7FFD5;
|
||||
background: #E3FFC7;
|
||||
}
|
||||
.openerp .oe_kanban_color_4 .oe_kanban_color_bgdark {
|
||||
background: #8FFFAB;
|
||||
background: #C7FF8F;
|
||||
}
|
||||
.openerp .oe_kanban_color_4 .oe_kanban_color_border {
|
||||
border-color: #79D991;
|
||||
border-color: #A9D979;
|
||||
}
|
||||
|
||||
/* Custom color#5 */
|
||||
.openerp .oe_kanban_color_5 .oe_kanban_color_bglight {
|
||||
background: #C7FFFF;
|
||||
background: #C7FFD5;
|
||||
}
|
||||
.openerp .oe_kanban_color_5 .oe_kanban_color_bgdark {
|
||||
background: #8FFFFF;
|
||||
background: #8FFFAB;
|
||||
}
|
||||
.openerp .oe_kanban_color_5 .oe_kanban_color_border {
|
||||
border-color: #79D9D9;
|
||||
border-color: #79D991;
|
||||
}
|
||||
|
||||
/* Custom color#6 */
|
||||
.openerp .oe_kanban_color_6 .oe_kanban_color_bglight {
|
||||
background: #C7D5FF;
|
||||
background: #C7FFFF;
|
||||
}
|
||||
.openerp .oe_kanban_color_6 .oe_kanban_color_bgdark {
|
||||
background: #8FABFF;
|
||||
background: #8FFFFF;
|
||||
}
|
||||
.openerp .oe_kanban_color_6 .oe_kanban_color_border {
|
||||
border-color: #8FABFF;
|
||||
border-color: #79D9D9;
|
||||
}
|
||||
|
||||
/* Custom color#7 */
|
||||
.openerp .oe_kanban_color_7 .oe_kanban_color_bglight {
|
||||
background: #E3C7FF;
|
||||
background: #C7D5FF;
|
||||
}
|
||||
.openerp .oe_kanban_color_7 .oe_kanban_color_bgdark {
|
||||
background: #C78FFF;
|
||||
background: #8FABFF;
|
||||
}
|
||||
.openerp .oe_kanban_color_7 .oe_kanban_color_border {
|
||||
border-color: #A979D9;
|
||||
border-color: #8FABFF;
|
||||
}
|
||||
|
||||
/* Custom color#8 */
|
||||
.openerp .oe_kanban_color_8 .oe_kanban_color_bglight {
|
||||
background: #FFC7F1;
|
||||
background: #E3C7FF;
|
||||
}
|
||||
.openerp .oe_kanban_color_8 .oe_kanban_color_bgdark {
|
||||
background: #FF8FE3;
|
||||
background: #C78FFF;
|
||||
}
|
||||
.openerp .oe_kanban_color_8 .oe_kanban_color_border {
|
||||
border-color: #A979D9;
|
||||
}
|
||||
|
||||
/* Custom color#9 */
|
||||
.openerp .oe_kanban_color_9 .oe_kanban_color_bglight {
|
||||
background: #FFC7F1;
|
||||
}
|
||||
.openerp .oe_kanban_color_9 .oe_kanban_color_bgdark {
|
||||
background: #FF8FE3;
|
||||
}
|
||||
.openerp .oe_kanban_color_9 .oe_kanban_color_border {
|
||||
border-color: #D979C1;
|
||||
}
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
|
|||
}
|
||||
},
|
||||
kanban_color: function(variable) {
|
||||
var number_of_color_schemes = 8,
|
||||
var number_of_color_schemes = 10,
|
||||
index = 0;
|
||||
switch (typeof(variable)) {
|
||||
case 'string':
|
||||
|
@ -75,7 +75,8 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
|
|||
default:
|
||||
return '';
|
||||
}
|
||||
return 'oe_kanban_color_' + ((index % number_of_color_schemes) || number_of_color_schemes);
|
||||
var color = (index % number_of_color_schemes);
|
||||
return 'oe_kanban_color_' + color;
|
||||
},
|
||||
kanban_gravatar: function(email, size) {
|
||||
size = size || 22;
|
||||
|
@ -222,7 +223,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
|
|||
do_change_color: function(record_id, $e) {
|
||||
var self = this,
|
||||
id = record_id,
|
||||
colors = '#FFC7C7,#FFF1C7,#E3FFC7,#C7FFD5,#C7FFFF,#C7D5FF,#E3C7FF,#FFC7F1'.split(','),
|
||||
colors = '#FFFFFF,#CCCCCC,#FFC7C7,#FFF1C7,#E3FFC7,#C7FFD5,#C7FFFF,#C7D5FF,#E3C7FF,#FFC7F1'.split(','),
|
||||
$cpicker = $(QWeb.render('KanbanColorPicker', { colors : colors, columns: 2 }));
|
||||
$e.after($cpicker);
|
||||
$cpicker.mouseenter(function() {
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
<tr>
|
||||
<t t-foreach="colors" t-as="color">
|
||||
<td t-att-bgcolor="color">
|
||||
<a href="#" t-att-data-color="color_index + 1"/>
|
||||
<a href="#" t-att-data-color="color_index"/>
|
||||
</td>
|
||||
<t t-if="((color_index + 1) % Math.round(colors.length / columns)) == 0"></tr><tr></t>
|
||||
</t>
|
||||
|
|
Loading…
Reference in New Issue