From 3b5ccc5a77db22f3877894c49baa1baabeca928c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 12 Apr 2012 11:16:31 +0530
Subject: [PATCH] [IMP]:improved bgcolor code.

bzr revid: apa@tinyerp.com-20120412054631-xs2nk19n3w858qpn
---
 addons/project/project_view.xml           | 12 ++---
 addons/project/static/src/css/project.css | 20 +------
 addons/project/static/src/js/project.js   | 63 ++++++++++++-----------
 3 files changed, 40 insertions(+), 55 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7b294d9f16f..10c49fc74cc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,12 +186,12 @@
                                       <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>
-                                            <li><a t-att-id="record.id.value" class="bgcolor_thistle"><span class="thistle square"></span></a></li>
-                                            <li><a t-att-id="record.id.value" class="bgcolor_orange"><span class="orange square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_0 square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_1 square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_2 square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_3 square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_4 square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_5 square"></span></a></li>
                                         </ul>
                                       </li>
                                     </ul>
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 2fe2372855e..cc57d7b4660 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -131,7 +131,7 @@ a.oe_project_kanban_action {
  }
 
 .oe_kanban_color_1 {
-    background: steelblue;
+    background: #B1DCFE;
 }
 .oe_kanban_color_2 {
     background: firebrick;
@@ -146,24 +146,6 @@ a.oe_project_kanban_action {
     background: orange;
 }
 
-.white {
-  background: white; }
-  
-.steelblue {
-  background: steelblue; }
-
-.firebrick {
-  background: firebrick; }
-
-.khaki {
-  background: khaki; }
-
-.thistle {
-  background: thistle; }
-
-.orange {
-  background: orange; }
-  
 .open {
   display: block;
   }
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 567c381cc27..3dae71e8170 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -39,38 +39,41 @@ 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').click(function(){
+                    color = parseInt($(this).find('span').attr('class').split(' ')[0].substring(16))
+                    color_class = $(this).find('span').attr('class').split(' ')[0]
+                    console.log($(this).find('span').attr('class').split(' ')[0].substring(16))
+                    $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(color_class + ' oe_project_kanban_vignette');
+                    self.view.dataset.write(parseInt(this.id), {color:color});
                 });
                 
-                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});
-                });
-                
-                this.$element.find('.bgcolor_firebrick').click(function(){
-                    $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette');
-                    self.view.dataset.write(parseInt(this.id), {color:2});
-                    
-                });
-                
-                this.$element.find('.bgcolor_khaki').click(function(){
-                    $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette');
-                    self.view.dataset.write(parseInt(this.id), {color:3});
-                    
-                });
-                
-                this.$element.find('.bgcolor_thistle').click(function(){
-                    $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette');
-                    self.view.dataset.write(parseInt(this.id), {color:4});
-                    
-                });
-                
-                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});
-                });
+                //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});
+                //});
+                //
+                //this.$element.find('.bgcolor_firebrick').click(function(){
+                //    $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(2) + ' oe_project_kanban_vignette');
+                //    self.view.dataset.write(parseInt(this.id), {color:2});
+                //    
+                //});
+                //
+                //this.$element.find('.bgcolor_khaki').click(function(){
+                //    $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(3) + ' oe_project_kanban_vignette');
+                //    self.view.dataset.write(parseInt(this.id), {color:3});
+                //    
+                //});
+                //
+                //this.$element.find('.bgcolor_thistle').click(function(){
+                //    $(this).closest('#oe_project_kanban_vignette').removeClass().addClass(self.kanban_color(4) + ' oe_project_kanban_vignette');
+                //    self.view.dataset.write(parseInt(this.id), {color:4});
+                //    
+                //});
+                //
+                //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});
+                //});
                 
             };
             self._super();