From 9b7917492452b06ca28680404828be9f0112b43a Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 1 May 2020 14:05:26 +0530 Subject: [PATCH 1/6] fix: number style --- frappe/public/js/frappe/views/dashboard/dashboard_view.js | 7 +++---- frappe/public/less/desktop.less | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index 0ca096f07d..6b1ab9aada 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -24,6 +24,7 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { this.setup_dashboard_page(); this.setup_dashboard_customization(); this.make_dashboard(); + this.setup_events(); } setup_dashboard_customization() { @@ -103,13 +104,11 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { if (!this.charts.length && !this.number_cards.length) { this.render_empty_state(); } - - this.setup_events(); } setup_events() { - $(document.body).on('toggleFullWidth', () => this.make_dashboard()); - $(document.body).on('toggleListSidebar', () => this.make_dashboard()); + $(document.body).on('toggleFullWidth', () => this.render_dashboard()); + $(document.body).on('toggleListSidebar', () => this.render_dashboard()); } fetch_dashboard_items(doctype, filters, obj_name) { diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less index 47d19f50e6..14792e4c8f 100644 --- a/frappe/public/less/desktop.less +++ b/frappe/public/less/desktop.less @@ -433,8 +433,9 @@ justify-content: space-between; .number { - font-size: 25px; - line-height: 2em; + font-weight: 600; + font-size: 26px; + line-height: 1.8em; } .number-text { From f1bed50a85cd05e55eb5d469e83faae505fa32db Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 1 May 2020 14:18:06 +0530 Subject: [PATCH 2/6] fix: underline customize option on hover --- .../js/frappe/views/dashboard/dashboard_view.js | 12 +++++------- frappe/public/less/dashboard_view.less | 4 ++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index 6b1ab9aada..b491cebf02 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -44,13 +44,11 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
${dashboard_name}
${__('Customize')}
- - ${__('Reset')} - / - ${__('Save')} - / - ${__('Discard')} - + ${__('Reset')} + / + ${__('Save')} + / + ${__('Discard')}
`); diff --git a/frappe/public/less/dashboard_view.less b/frappe/public/less/dashboard_view.less index c26045c21b..874e4e2e36 100644 --- a/frappe/public/less/dashboard_view.less +++ b/frappe/public/less/dashboard_view.less @@ -38,6 +38,10 @@ .customize-options { display: none; cursor: pointer; + + .customize-option:hover { + text-decoration: underline; + } } } } From 2fc666347372d679e00106410062f9f25eb2c0f2 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 1 May 2020 14:22:23 +0530 Subject: [PATCH 3/6] fix: confirm before resetting customizations --- .../js/frappe/views/dashboard/dashboard_view.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index b491cebf02..13c44d2130 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -228,12 +228,14 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { } reset_dashboard_customization() { - this.dashboard_settings = null; - frappe.model.user_settings.save( - this.doctype, 'dashboard_settings', this.dashboard_settings - ).then(() => this.make_dashboard()); + frappe.confirm(__("Are you sure you want to reset all customizations?"), () => { + this.dashboard_settings = null; + frappe.model.user_settings.save( + this.doctype, 'dashboard_settings', this.dashboard_settings + ).then(() => this.make_dashboard()); - this.toggle_customize(false); + this.toggle_customize(false); + }); } toggle_customize(show) { From ae2bedd45763c023c457978cde0c55165b894fb8 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 1 May 2020 15:22:38 +0530 Subject: [PATCH 4/6] fix: set is_public permlevel as 0 for dashboard charts --- frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 75941a9019..698b115084 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -227,12 +227,11 @@ "description": "This chart will be public to all Users if this is set", "fieldname": "is_public", "fieldtype": "Check", - "label": "Is Public", - "permlevel": 1 + "label": "Is Public" } ], "links": [], - "modified": "2020-04-23 13:01:07.178866", + "modified": "2020-05-01 15:22:03.640602", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", From 5f3d9d2b986cb8d77e4f64c822bd32ffe0fae2de Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 1 May 2020 15:24:08 +0530 Subject: [PATCH 5/6] fix: fix description of is_public field --- frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 4 ++-- frappe/desk/doctype/number_card/number_card.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 698b115084..b5201a8b1f 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -224,14 +224,14 @@ }, { "default": "0", - "description": "This chart will be public to all Users if this is set", + "description": "This chart will be available to all Users if this is set", "fieldname": "is_public", "fieldtype": "Check", "label": "Is Public" } ], "links": [], - "modified": "2020-05-01 15:22:03.640602", + "modified": "2020-05-01 15:22:59.119341", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json index 6bdcf26f12..5fb058d8ce 100644 --- a/frappe/desk/doctype/number_card/number_card.json +++ b/frappe/desk/doctype/number_card/number_card.json @@ -72,7 +72,7 @@ }, { "default": "0", - "description": "This card will be public to all Users if this is set", + "description": "This card will be available to all Users if this is set", "fieldname": "is_public", "fieldtype": "Check", "label": "Is Public" @@ -99,7 +99,7 @@ } ], "links": [], - "modified": "2020-05-01 11:10:20.788844", + "modified": "2020-05-01 15:23:29.550243", "modified_by": "Administrator", "module": "Desk", "name": "Number Card", From f3d553d05f613079254b2888a984844215d309b4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Fri, 1 May 2020 17:15:43 +0530 Subject: [PATCH 6/6] style: Fix formatting --- frappe/public/less/desktop.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less index 14792e4c8f..9ecff872f0 100644 --- a/frappe/public/less/desktop.less +++ b/frappe/public/less/desktop.less @@ -434,8 +434,8 @@ .number { font-weight: 600; - font-size: 26px; - line-height: 1.8em; + font-size: 26px; + line-height: 1.8em; } .number-text { @@ -639,4 +639,4 @@ transform: scale3d(0.5, 0.5, 0.5); opacity: 0; visibility: hidden; -} \ No newline at end of file +}