From 3af5d51a4162347a1adc4c5a2525f0bcb9f3aa48 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 3 Aug 2017 15:34:02 +0530 Subject: [PATCH] [style] cleanup tags --- frappe/core/page/desktop/desktop.js | 25 ----------------- frappe/public/css/list.css | 10 ++++--- frappe/public/css/sidebar.css | 13 --------- frappe/public/js/frappe/list/list_sidebar.js | 28 +++++++------------ .../js/frappe/list/list_sidebar_stat.html | 13 +++++---- frappe/public/js/frappe/ui/tags.js | 3 +- frappe/public/less/list.less | 10 ++++--- frappe/public/less/sidebar.less | 15 ---------- 8 files changed, 32 insertions(+), 85 deletions(-) diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js index bfa5575963..ad706f6c18 100644 --- a/frappe/core/page/desktop/desktop.js +++ b/frappe/core/page/desktop/desktop.js @@ -50,7 +50,6 @@ $.extend(frappe.desktop, { desktop_items: all_icons, })); - frappe.desktop.setup_help_messages(); frappe.desktop.setup_module_click(); // notifications @@ -63,30 +62,6 @@ $.extend(frappe.desktop, { }, - setup_help_messages: function() { - // { - // title: 'Sign up for a Premium Plan', - // description: 'Sign up for a premium plan and add users, get more disk space and priority support', - // action: 'Select Plan', - // route: 'usage-info' - // } - - // TEMP: test activiation without this message. - return; - - // if(!frappe.user.has_role('System Manager')) { - // return; - // } - - // frappe.call({ - // method: 'frappe.core.page.desktop.desktop.get_help_messages', - // callback: function(r) { - // frappe.desktop.render_help_messages(r.message); - // } - // }); - - }, - render_help_messages: function(help_messages) { var wrapper = frappe.desktop.wrapper.find('.help-message-wrapper'); var $help_messages = wrapper.find('.help-messages'); diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css index 2f342af46f..05cb1d07b6 100644 --- a/frappe/public/css/list.css +++ b/frappe/public/css/list.css @@ -215,17 +215,19 @@ text-align: left; } .tag-row { - margin-top: 5px; padding-left: 55px; + margin-bottom: 0px; + margin-top: -5px; } .taggle_placeholder { top: 0; - left: 0; + left: 5px; font-size: 11px; + color: #8D99A6; } .taggle_list { - padding-left: 0; - margin-bottom: 0; + padding-left: 5px; + margin-bottom: 3px; } .taggle_list .taggle { font-size: 11px; diff --git a/frappe/public/css/sidebar.css b/frappe/public/css/sidebar.css index 5b7fa2e8fd..1bea165047 100644 --- a/frappe/public/css/sidebar.css +++ b/frappe/public/css/sidebar.css @@ -293,19 +293,6 @@ body[data-route^="Module"] .main-menu .form-sidebar { .sidebar-left .list-sidebar .stat-label { margin-bottom: -10px; } -.list-sidebar .list-tag-preview { - padding: 5px !important; - margin-left: 5px; - display: inline !important; -} -.list-sidebar .list-tag-preview:hover, -a.close:hover, -.list-sidebar .list-tag-preview:active, -a.close:active, -.list-sidebar .list-tag-preview:focus, -a.close:focus { - border-color: transparent !important; -} .layout-side-section .module-sidebar-nav { margin-top: 15px; } diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js index 375bd0d6c4..4a9a5753c2 100644 --- a/frappe/public/js/frappe/list/list_sidebar.js +++ b/frappe/public/js/frappe/list/list_sidebar.js @@ -195,7 +195,7 @@ frappe.views.ListSidebar = Class.extend({ var custom_column = values.custom_column !== undefined ? values.custom_column : 1; - + if(custom_column) { var field_name = 'kanban_column'; } else { @@ -350,43 +350,35 @@ frappe.views.ListSidebar = Class.extend({ var stats = [] var label = frappe.meta.docfield_map[this.doctype][field] ? frappe.meta.docfield_map[this.doctype][field].label : field; - var show_tags = ''; stat = (stat || []).sort(function(a, b) { return b[1] - a[1] }); $.each(stat, function(i,v) { sum = sum + v[1]; }) - if(tags) - { + if(tags) { for (var t in tags) { var nfound = -1; for (var i in stat) { if (tags[t] ===stat[i][0]) { stats.push(stat[i]); nfound = i; - break + break; } } - if (nfound<0) - { - stats.push([tags[t],0]) - } - else - { + if (nfound<0) { + stats.push([tags[t],0]); + } else { me.tempstats["_user_tags"].splice(nfound,1); } } - field = "_user_tags" - } - else - { - stats = stat + field = "_user_tags"; + } else { + stats = stat; } var context = { field: field, stat: stats, sum: sum, - label: field==='_user_tags' ? tags ? __(label)+ show_tags:(__("UnCategorised Tags") + show_tags): __(label), + label: field==='_user_tags' ? (tags ? __(label) : __("Tags")) : __(label), }; var sidebar_stat = $(frappe.render_template("list_sidebar_stat", context)) .on("click", ".stat-link", function() { diff --git a/frappe/public/js/frappe/list/list_sidebar_stat.html b/frappe/public/js/frappe/list/list_sidebar_stat.html index 5f23d439eb..10af8bcf07 100644 --- a/frappe/public/js/frappe/list/list_sidebar_stat.html +++ b/frappe/public/js/frappe/list/list_sidebar_stat.html @@ -1,19 +1,22 @@ +
+ +
diff --git a/frappe/public/js/frappe/ui/tags.js b/frappe/public/js/frappe/ui/tags.js index c7fd32a5fb..ede40f50ee 100644 --- a/frappe/public/js/frappe/ui/tags.js +++ b/frappe/public/js/frappe/ui/tags.js @@ -77,7 +77,8 @@ frappe.ui.TagEditor = Class.extend({ args:{ doctype: me.frm.doctype, txt: value.toLowerCase(), - cat_tags:JSON.stringify(me.list_sidebar.get_cat_tags()) + cat_tags: me.list_sidebar ? + JSON.stringify(me.list_sidebar.get_cat_tags()) : '[]' }, callback: function(r) { me.awesomplete.list = r.message; diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less index 957a7030a3..517c6e4059 100644 --- a/frappe/public/less/list.less +++ b/frappe/public/less/list.less @@ -273,19 +273,21 @@ // tags .tag-row { - margin-top: 5px; padding-left: 55px; + margin-bottom: 0px; + margin-top: -5px; } .taggle_placeholder { top: 0; - left: 0; + left: 5px; font-size: 11px; + color: @text-muted; } .taggle_list { - padding-left: 0; - margin-bottom: 0; + padding-left: 5px; + margin-bottom: 3px; .taggle { font-size: 11px; diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less index 67ecfd4e36..aacb83b17e 100644 --- a/frappe/public/less/sidebar.less +++ b/frappe/public/less/sidebar.less @@ -378,21 +378,6 @@ body[data-route^="Module"] .main-menu { } } -.list-sidebar .list-tag-preview { - padding: 5px !important; - margin-left: 5px; - display: inline !important; -} - -.list-sidebar .list-tag-preview&, -a.close { - &:hover, - &:active, - &:focus { - border-color: transparent !important; - } -} - // module sidebar .layout-side-section .module-sidebar-nav { margin-top: 15px;