From 7bbd6542ce31db5922d5c938b7c09b6a1fae5cbc Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 7 Mar 2017 10:49:02 +0530 Subject: [PATCH 1/3] [kanban] open form when card clicked --- frappe/public/js/frappe/views/kanban/kanban_board.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js index 511a334920..11143501c2 100644 --- a/frappe/public/js/frappe/views/kanban/kanban_board.js +++ b/frappe/public/js/frappe/views/kanban/kanban_board.js @@ -531,7 +531,8 @@ frappe.provide("frappe.views"); function bind_edit_card() { self.$card.find('.kanban-card.content').on('click', function () { - setup_edit_card(); + frappe.set_route('Form', card.doctype, card.name); + // setup_edit_card(); }); } From a25506f42a08bed0651fe1ace1f0d30cf36ac809 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 7 Mar 2017 12:03:31 +0530 Subject: [PATCH 2/3] [enhance] gantt custom popup --- .../public/js/frappe/views/gantt/gantt_view.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/views/gantt/gantt_view.js b/frappe/public/js/frappe/views/gantt/gantt_view.js index fb99ea292d..7d5d234b16 100644 --- a/frappe/public/js/frappe/views/gantt/gantt_view.js +++ b/frappe/public/js/frappe/views/gantt/gantt_view.js @@ -69,17 +69,18 @@ frappe.views.GanttView = frappe.views.ListRenderer.extend({ }, custom_popup_html: function(task) { var item = me.get_item(task.id); - var list_item_subject = frappe.render_template('list_item_subject', item); - var html = '
'+ - list_item_subject +'
'; - // custom html in {doctype}_list.js + var html = + `
${task.name}
+

${task._start.format('MMM D')} - ${task._end.format('MMM D')}

`; + + // custom html in doctype settings var custom = me.settings.gantt_custom_popup_html; - if(custom) { - html = custom(item, html); + if(custom && $.isFunction(custom)) { + var ganttobj = task; + html = custom(ganttobj, item); } - - return '
'+ html +'
'; + return '
' + html + '
'; } }); this.render_dropdown(); From 3a0cd99945463df49da37013904fef0f11619f66 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 7 Mar 2017 12:20:59 +0530 Subject: [PATCH 3/3] [ui] set max height on dropdown --- frappe/public/css/common.css | 2 ++ frappe/public/css/desk.css | 2 ++ frappe/public/css/website.css | 2 ++ frappe/public/less/common.less | 2 ++ 4 files changed, 8 insertions(+) diff --git a/frappe/public/css/common.css b/frappe/public/css/common.css index e07a6bb091..781a78d4d2 100644 --- a/frappe/public/css/common.css +++ b/frappe/public/css/common.css @@ -94,6 +94,8 @@ kbd { min-width: 200px; padding: 0px; font-size: 12px; + max-height: 400px; + overflow: auto; border-radius: 0px 0px 4px 4px; } .dropdown-menu .dropdown-header { diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index 4bf3cb0275..cd95c71021 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -94,6 +94,8 @@ kbd { min-width: 200px; padding: 0px; font-size: 12px; + max-height: 400px; + overflow: auto; border-radius: 0px 0px 4px 4px; } .dropdown-menu .dropdown-header { diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index 6c3582c9bd..fe5762b734 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -94,6 +94,8 @@ kbd { min-width: 200px; padding: 0px; font-size: 12px; + max-height: 400px; + overflow: auto; border-radius: 0px 0px 4px 4px; } .dropdown-menu .dropdown-header { diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less index 7fe8b195cd..3328d10ef0 100644 --- a/frappe/public/less/common.less +++ b/frappe/public/less/common.less @@ -107,6 +107,8 @@ kbd { min-width: 200px; padding: 0px; font-size: @text-medium; + max-height: 400px; + overflow: auto; // only rounded bottoms border-radius: 0px 0px 4px 4px;