pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: apa@tinyerp.com-20120411054625-rpkxfriji0u1799m
This commit is contained in:
Amit Patel (OpenERP)
2012-04-11 11:16:25 +05:30
parent 6ec5f649de 59e07ee6f0
commit 92d49432a6
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
+1
View File
@@ -186,6 +186,7 @@
<li ><a type="delete">Delete</a></li>
<li>
<ul class="color-chooser">
<li><a t-att-id="record.id.value" class="bgcolor_white"><span class="white square"></span></a></li>
<li><a t-att-id="record.id.value" class="bgcolor_steelblue"><span class="steelblue square"></span></a></li>
<li><a t-att-id="record.id.value" class="bgcolor_firebrick"><span class="firebrick square"></span></a></li>
<li><a t-att-id="record.id.value" class="bgcolor_khaki"><span class="khaki square"></span></a></li>
addons/project/static/src/css/project.css
+7 -2
View File
@@ -134,7 +134,9 @@ a.oe_project_kanban_action {
.square {
display: inline-block;
width: 18px;
height: 18px; }
height: 18px;
border:1px solid grey;
}
.oe_kanban_color_1 {
background: steelblue;
@@ -152,7 +154,9 @@ a.oe_project_kanban_action {
background: orange;
}
.white {
background: white; }
.steelblue {
background: steelblue; }
@@ -167,6 +171,7 @@ a.oe_project_kanban_action {
.orange {
background: orange; }
.open {
display: block;
}
addons/project/static/src/js/project.js
+5 -1
View File
@@ -39,6 +39,11 @@ openerp.project = function(openerp) {
$('#list').replaceWith(my_list);
// set background color
this.$element.find('.bgcolor_white').click(function(){
$(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(0) + ' oe_project_kanban_vignette');
self.view.dataset.write(parseInt(this.id), {color:0});
});
this.$element.find('.bgcolor_steelblue').click(function(){
$(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(1) + ' oe_project_kanban_vignette');
self.view.dataset.write(parseInt(this.id), {color:1});
@@ -65,7 +70,6 @@ openerp.project = function(openerp) {
this.$element.find('.bgcolor_orange').click(function(){
$(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(5) + ' oe_project_kanban_vignette');
self.view.dataset.write(parseInt(this.id), {color:5});
});
};