diff --git a/addons/project/project.py b/addons/project/project.py index 9a4b795e925..71502dc5263 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -201,6 +201,7 @@ class project(osv.osv): 'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'task': fields.boolean('Task',help = "If you check this field tasks appears in kanban view"), 'open_task': fields.function(_open_task , type='integer',string="Open Tasks"), + 'color': fields.integer('Color Index'), } def dummy(self, cr, uid, ids, context=None): return False diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 5ff98559f4a..72673430868 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -174,11 +174,12 @@ +
-
  • +
  • B
  • - -
    diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 88afefdd9a3..6f4153659d8 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -136,6 +136,11 @@ a.oe_project_kanban_action { width: 18px; height: 18px; } +.oe_kanban_color_2 { + background: steelblue; +} + + .steelblue { background: steelblue; } @@ -152,7 +157,7 @@ a.oe_project_kanban_action { background: orange; } .open { display: block; - background: #333333; } + } .open .dropdown-menu { display: block; } @@ -170,14 +175,13 @@ a.oe_project_kanban_action { .oe_project_kanban_vignette { position: relative; - display: block; min-height: 50px; - background: white; + /*background: white;*/ border: 1px solid #d8d8d8; border-bottom-color: #b9b9b9; padding: 6px; margin: 6px 0; - display: block; + display: inline-block; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; } diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index abe2b1c8da1..be44580f7a5 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,5 +1,6 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ + bind_events: function() { self = this; if(this.view.dataset.model == 'project.project') { @@ -36,6 +37,19 @@ openerp.project = function(openerp) { return aValue == bValue ? 0 : aValue < bValue ? -1 : 1; }); $('#list').replaceWith(my_list); + + + $('.steelblue').click(function(){ + //$(this).closest('.oe_project_kanban_vignette').css('background-color', 'steelblue'); + $action = $(this).closest('.oe_project_kanban_vignette').addClass(self.kanban_color(2)); + //var data = {}; + //data[$action.data('name')] = $(this).data('color'); + //self.view.dataset.write(2, {'color':2}, {}, function() { + // //self.record[$action.data('name')] = $(this).data('color'); + // self.do_reload(); + //}); + + }); }; self._super(); }