')
+ .append($('
![]()
', { src: '/web_dashboard/static/src/img/view_todo_arrow.png' }))
+ .append($('
').html(this.view.options.action.help || " "))
+ );
+ }
+ },
do_reload: function() {
var view_manager = this.view.getParent(),
action_manager = view_manager.getParent();
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 0100e45d6fc..b0ba5c58928 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
.openerp .oe_kanban_view {
height: inherit;
}
@@ -324,7 +325,7 @@
-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
}
-.openerp .oe_kanban_view .oe_kanban_card:hover .oe_kanban_menuaction {
+.openerp .oe_kanban_view .oe_kanban_card:hover .oe_dropdown_kanban {
display: block;
}
.openerp .oe_kanban_view .oe_kanban_card h3 {
@@ -385,56 +386,24 @@
text-overflow: ellipsis;
white-space: nowrap;
}
-.openerp .oe_kanban_view a.oe_kanban_menuaction {
+.openerp .oe_kanban_view .oe_dropdown_kanban {
position: absolute;
- top: 3px;
- right: 6px;
+ top: -8px;
+ right: 3px;
display: none;
color: #4c4c4c;
cursor: pointer;
}
-.openerp .oe_kanban_view a.oe_kanban_menuaction:hover {
+.openerp .oe_kanban_view .oe_dropdown_kanban:hover {
text-decoration: none;
}
-.openerp .oe_kanban_view .oe_kanban_menu {
- display: none;
- position: absolute;
- top: 30px;
+.openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu {
right: -140px;
- padding: 4px;
- border: 1px solid #afafb6;
min-width: 160px;
- overflow-x: hidden;
- z-index: 900;
- background: white;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
- -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
- -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-}
-.openerp .oe_kanban_view .oe_kanban_menu p {
- margin-left: 12px;
-}
-.openerp .oe_kanban_view .oe_kanban_menu > li > a {
- display: block;
- padding: 3px 6px;
- line-height: 14px;
- color: #4c4c4c;
- text-decoration: none;
-}
-.openerp .oe_kanban_view .oe_kanban_menu > li > a:hover {
- background: #f0f0fa;
- background: -moz-linear-gradient(#f0f0fa, #eeeef6);
- background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
- background: -webkit-linear-gradient(#f0f0fa, #eeeef6);
- -moz-box-shadow: none;
- -webkit-box-shadow: none;
- -box-shadow: none;
}
.openerp .oe_kanban_view .oe_kanban_colorpicker {
padding: 3px 6px;
+ white-space: nowrap;
}
.openerp .oe_kanban_view .oe_kanban_colorpicker li {
float: left;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index d91dc357397..2509db68eb7 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -280,7 +280,7 @@
margin-bottom: 0
&:hover
@include box-shadow(0 0 3px rgba(0,0,0,0.6))
- .oe_kanban_menuaction
+ .oe_dropdown_kanban
display: block
h3
margin: 0 16px 0 0
@@ -319,46 +319,23 @@
white-space: nowrap
// }}}
// KanbanDropDown {{{
- a.oe_kanban_menuaction
+ .oe_dropdown_kanban
position: absolute
- top: 3px
- right: 6px
+ top: -8px
+ right: 3px
display: none
color: #4c4c4c
cursor: pointer
&:hover
text-decoration: none
- .oe_kanban_menu
- display: none
- position: absolute
- top: 30px
- right: -140px
- padding: 4px
- border: 1px solid #afafb6
- min-width: 160px
- overflow-x: hidden
- z-index: 900
- background: white
- @include radius(3px)
- @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
- p
- margin-left: 12px
- > li > a
- display: block
- padding: 3px 6px
- line-height: 14px
- color: #4c4c4c
- text-decoration: none
- > li > a:hover
- background: #f0f0fa
- background: -moz-linear-gradient(#f0f0fa, #eeeef6)
- background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6))
- background: -webkit-linear-gradient(#f0f0fa, #eeeef6)
- @include box-shadow(none)
+ .oe_dropdown_menu
+ right: -140px
+ min-width: 160px
// }}}
// KanbanColorPicker {{{
.oe_kanban_colorpicker
padding: 3px 6px
+ white-space: nowrap
.oe_kanban_colorpicker li
float: left
a
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 879894e97c7..6811953465d 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -42,18 +42,6 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
this.limit = options.limit || 80;
this.add_group_mutex = new $.Mutex();
},
- start: function() {
- var self = this;
- var def = this._super.apply(this, arguments);
- // Bind kanban cards dropdown menus
- $('html').on('click.kanban', function() {
- self.trigger('hide_menus');
- });
- this.on('hide_menus', this, function() {
- self.$element.find('.oe_kanban_menu').hide();
- });
- return def;
- },
destroy: function() {
this._super.apply(this, arguments);
$('html').off('click.kanban');
@@ -608,7 +596,6 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
}
this.$element.find('.oe_kanban_action').click(function() {
- self.view.trigger('hide_menus');
var $action = $(this),
type = $action.data('type') || 'button',
method = 'do_action_' + (type === 'action' ? 'object' : type);
@@ -619,32 +606,17 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
} else {
self.do_warn("Kanban: no action for type : " + type);
}
- return false;
- });
-
- this.$element.on('click', '.oe_kanban_menuaction', function() {
- var $menu = $(this).next('.oe_kanban_menu');
- var show = !$menu.is(':visible');
- self.view.trigger('hide_menus');
- var doc_width = $(document).width();
- $menu.toggle(show);
- if (show) {
- var offset = $menu.offset();
- var menu_width = $menu.width();
- var x = doc_width - offset.left - menu_width - 15;
- if (x < 0) {
- $menu.offset({ left: offset.left + x }).width(menu_width);
- }
- }
- return false;
});
if (this.$element.find('.oe_kanban_global_click').length) {
- this.$element.on('click', this.on_card_clicked);
+ this.$element.on('click', function(ev) {
+ if (!ev.isTrigger && !$(ev.target).data('events')) {
+ //self.on_card_clicked(ev);
+ }
+ });
}
},
- on_card_clicked: function() {
- this.view.trigger('hide_menus');
+ on_card_clicked: function(ev) {
this.view.open_record(this.id);
},
setup_color_picker: function() {
@@ -654,8 +626,8 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
$el.html(QWeb.render('KanbanColorPicker', {
widget: this
}));
- $el.on('click', 'a', function() {
- self.view.trigger('hide_menus');
+ $el.on('click', 'a', function(ev) {
+ ev.preventDefault();
var color_field = $(this).parents('.oe_kanban_colorpicker').first().data('field') || 'color';
var data = {};
data[color_field] = $(this).data('color');
@@ -663,7 +635,6 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
self.record[color_field] = $(this).data('color');
self.do_reload();
});
- return false;
});
}
},