From 8b1a062c99187316fbbe5dcdcc61bf813eafd77f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Sep 2012 17:33:30 +0200
Subject: [PATCH] [IMP] kanban : Improve the opening on global bock. Add a
 class 'oe_kanban_global_click_edit' has same methods of
 'oe_kanban_global_click' but open in form/edit view ; Improve display of menu
 dropdown

bzr revid: chm@openerp.com-20120907153330-2dmzfiy9vwtb36uv
---
 addons/web/static/src/css/base.css           |  1 +
 addons/web/static/src/css/base.sass          |  1 +
 addons/web_kanban/static/src/css/kanban.css  |  1 +
 addons/web_kanban/static/src/css/kanban.sass |  1 +
 addons/web_kanban/static/src/js/kanban.js    | 11 +++++++++--
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 226ccbd3513..1256ffef6f9 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -689,6 +689,7 @@
 .openerp .oe_dropdown_toggle {
   color: #404040;
   font-weight: normal;
+  display:inline-block;
 }
 .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {
   display: block;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 13f740f218c..ac73f3de045 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -559,6 +559,7 @@ $sheet-max-width: 860px
     .oe_dropdown_toggle
         color: #404040
         font-weight: normal
+		display:inline-block
     .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
         display: block
     .oe_dropdown_menu
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 345becc7cdd..7f209e9f60a 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -134,6 +134,7 @@
   margin-left: 4px;
   cursor: pointer;
   position: relative;
+  display: inline-block;
   top: -8px;
 }
 .openerp .oe_kanban_view .oe_kanban_add {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index b85d3ebea03..1878b86925b 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -148,6 +148,7 @@
         margin-left: 4px
         cursor: pointer
         position: relative
+		display: inline-block
         top: -8px
     .oe_kanban_add
         float: right
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 0cef134d95b..c2a0244fd21 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -757,7 +757,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
             }
         });
 
-        if (this.$el.find('.oe_kanban_global_click').length) {
+        if (this.$el.find('.oe_kanban_global_click,.oe_kanban_global_click_edit').length) {
             this.$el.on('click', function(ev) {
                 if (!ev.isTrigger && !$(ev.target).data('events')) {
                     var trigger = true;
@@ -798,8 +798,15 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
             });
         }
     },
+    /* actions when user click on the block with a specific class
+    *  open on normal view : oe_kanban_global_click
+    *  open on form/edit view : oe_kanban_global_click_edit
+    */
     on_card_clicked: function(ev) {
-        this.view.open_record(this.id);
+        if(this.$el.find('.oe_kanban_global_click_edit').size()>0)
+            this.do_action_edit();
+        else
+            this.do_action_open();
     },
     setup_color_picker: function() {
         var self = this;