From 4f31f9c501f9deb6febe22d23b27cfcc211c846e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 30 Aug 2021 11:48:39 +0530 Subject: [PATCH] fix: Show Document Status (docstatus) as a title on hovering the Status Indicator Pill --- frappe/public/icons/timeless/symbol-defs.svg | 10 ---------- frappe/public/js/frappe/list/list_view.js | 8 ++++---- frappe/public/js/frappe/utils/utils.js | 7 ++----- frappe/public/scss/common/indicator.scss | 12 +----------- 4 files changed, 7 insertions(+), 30 deletions(-) diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index 1732548bbc..b2f1428967 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -709,14 +709,4 @@ - - - - - - - - - - diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 914807f57a..f304d313b4 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -952,11 +952,11 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { get_indicator_html(doc) { const indicator = frappe.get_indicator(doc, this.doctype); - const icon = doc.docstatus == 1 ? 'submitted' : doc.docstatus == 2 ? 'cancelled' : 'dot'; + const title = doc.docstatus == 1 ? 'Document has been submitted' : doc.docstatus == 2 ? + 'Document has been cancelled' : 'Document is in draft state'; if (indicator) { - return ` - ${frappe.utils.icon(icon, 'xs', '', indicator[1])} + return ` ${__(indicator[0])} `; } diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 12b883a552..21841296dc 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1114,17 +1114,14 @@ Object.assign(frappe.utils, { } }, - icon(icon_name, size="sm", icon_class="", stroke_color="") { + icon(icon_name, size="sm", icon_class="") { let size_class = ""; let icon_style = ""; if (typeof size == "object") { - icon_style = `width: ${size.width}; height: ${size.height};`; + icon_style = `width: ${size.width}; height: ${size.height}`; } else { size_class = `icon-${size}`; } - if (stroke_color) { - icon_style += `stroke: ${stroke_color};`; - } return ` `; diff --git a/frappe/public/scss/common/indicator.scss b/frappe/public/scss/common/indicator.scss index 600373baec..13162ab6b1 100644 --- a/frappe/public/scss/common/indicator.scss +++ b/frappe/public/scss/common/indicator.scss @@ -175,14 +175,4 @@ @keyframes blink { 50% { opacity: 0.5; } -} - -.indicator-pill-icon { - margin-right: 3px; -} - -.list-indicator-pill::before { - content: ''; - width: unset; - margin-right: unset; -} +} \ No newline at end of file