From bebfc491a4ddb479824e8056c81fe1b3281d2e18 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 13 Jan 2021 16:23:00 +0530 Subject: [PATCH 1/4] fix(minor): setup-wizard page_name shows as undefined --- frappe/desk/page/setup_wizard/setup_wizard.js | 2 +- frappe/public/js/frappe/ui/slides.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js index 46eec522a4..37b3f66e8a 100644 --- a/frappe/desk/page/setup_wizard/setup_wizard.js +++ b/frappe/desk/page/setup_wizard/setup_wizard.js @@ -88,8 +88,8 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { super(args); $.extend(this, args); - this.welcomed = true; this.page_name = "setup-wizard"; + this.welcomed = true; frappe.set_route("setup-wizard/0"); } diff --git a/frappe/public/js/frappe/ui/slides.js b/frappe/public/js/frappe/ui/slides.js index 7bdfb3296a..8d3df0647e 100644 --- a/frappe/public/js/frappe/ui/slides.js +++ b/frappe/public/js/frappe/ui/slides.js @@ -242,6 +242,7 @@ frappe.ui.Slides = class Slides { this.done_state = done_state; this.before_load = before_load; this.on_update = on_update; + this.page_name = "setup-wizard"; this.slide_dict = {}; From e88b5f6a85410aa6a13cf99c3c922e9987df4ee5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Jan 2021 09:49:44 +0530 Subject: [PATCH 2/4] fix(minor): keep form dashboard sections expanded by default --- frappe/public/js/frappe/form/dashboard.js | 13 ++++++++++--- frappe/public/scss/desk/form.scss | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index 638d0090d6..4dca1e4daf 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -602,7 +602,7 @@ class Section { this.df = options || {}; this.make(); - if (this.df.title && this.df.collapsible) { + if (this.df.title && this.df.collapsible && localStorage.getItem(options.css_class + '-closed')) { this.collapse(); } this.refresh(); @@ -657,6 +657,7 @@ class Section { this.collapse_link = this.head.on("click", () => { this.collapse(); }); + this.set_icon(); this.indicator.show(); } } @@ -677,9 +678,15 @@ class Section { this.body.toggleClass("hide", hide); this.head && this.head.toggleClass("collapsed", hide); - let indicator_icon = hide ? 'down' : 'up-line'; + this.set_icon(hide); - this.indicator & this.indicator.html(frappe.utils.icon(indicator_icon, 'sm', 'mb-1')); + // save state for next reload ('' is falsy) + localStorage.setItem(this.df.css_class + '-closed', hide ? '1' : ''); + } + + set_icon(hide) { + let indicator_icon = hide ? 'down' : 'up-line'; + this.indicator && this.indicator.html(frappe.utils.icon(indicator_icon, 'sm', 'mb-1')); } is_collapsed() { diff --git a/frappe/public/scss/desk/form.scss b/frappe/public/scss/desk/form.scss index 66c7e531cb..ee8a618ff7 100644 --- a/frappe/public/scss/desk/form.scss +++ b/frappe/public/scss/desk/form.scss @@ -24,7 +24,7 @@ color: $text-muted; margin-left: 10px; position: relative; - bottom: -1px; + padding: 0px; } .collapse-indicator.octicon-chevron-up { From 30ad27e075a2a9add28666a5d8aef9449ddba375 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Jan 2021 15:38:47 +0530 Subject: [PATCH 3/4] fix(minor): ui fixes to grid scrolling, etc --- frappe/public/js/frappe/form/controls/link.js | 2 +- frappe/public/js/frappe/form/grid.js | 7 +++++-- frappe/public/js/frappe/form/grid_pagination.js | 1 + frappe/public/js/frappe/utils/utils.js | 2 +- frappe/public/scss/desk/grid.scss | 1 + 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js index ce1e2ae79d..713ffe5f92 100644 --- a/frappe/public/js/frappe/form/controls/link.js +++ b/frappe/public/js/frappe/form/controls/link.js @@ -182,7 +182,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ let filter_string = me.get_filter_description(args.filters); if (filter_string) { r.results.push({ - html: `${filter_string}`, + html: `${filter_string}`, value: '', action: () => {} }); diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 04eba6d995..ad35a96013 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -201,7 +201,7 @@ export default class Grid { this.wrapper.find('.grid-heading-row .grid-row-check:checked:first').prop('checked', 0); if (selected_children.length == this.grid_pagination.page_length) { - frappe.utils.scroll_to(this.wrapper); + this.scroll_to_top(); } } @@ -213,9 +213,12 @@ export default class Grid { this.wrapper.find('.grid-heading-row .grid-row-check:checked:first').prop('checked', 0); this.refresh(); - frappe.utils.scroll_to(this.wrapper); + this.scroll_to_top(); }); + } + scroll_to_top() { + frappe.utils.scroll_to(this.wrapper); } select_row(name) { diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js index 0920bf5981..2fd0798414 100644 --- a/frappe/public/js/frappe/form/grid_pagination.js +++ b/frappe/public/js/frappe/form/grid_pagination.js @@ -108,6 +108,7 @@ export default class GridPagination { } this.update_page_numbers(); + this.grid.scroll_to_top(); } go_to_last_page_to_add_row() { diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 9b2b61fce4..074832da4f 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -281,7 +281,7 @@ Object.assign(frappe.utils, { }, get_scroll_position: function(element, additional_offset) { - let header_offset = $(".navbar").height() + $(".page-head").height(); + let header_offset = $(".navbar").height() + $(".page-head:visible").height(); let scroll_top = $(element).offset().top - header_offset - cint(additional_offset); return scroll_top; }, diff --git a/frappe/public/scss/desk/grid.scss b/frappe/public/scss/desk/grid.scss index ff5a8cc879..02d8af6d38 100644 --- a/frappe/public/scss/desk/grid.scss +++ b/frappe/public/scss/desk/grid.scss @@ -370,6 +370,7 @@ background-color: var(--fg-color); .btn { box-shadow: none; + margin-top: -3px; } } From 4ba65b1332ea66c14df230ac55be013772aea8d8 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 15 Jan 2021 09:47:26 +0530 Subject: [PATCH 4/4] fix(minor): background in base.html --- frappe/public/scss/login.scss | 11 +++-------- frappe/templates/base.html | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/frappe/public/scss/login.scss b/frappe/public/scss/login.scss index 434585fc4f..25fc6662e3 100644 --- a/frappe/public/scss/login.scss +++ b/frappe/public/scss/login.scss @@ -1,13 +1,8 @@ @import "./desk/variables"; -// [data-path="login"] { -// background-color: var(--bg-color); - -// .web-footer, -// .navbar { -// background-color: var(--fg-color); -// } -// } +body { + background-color: var(--bg-light-gray); +} .for-login, .for-forgot, diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 77c34d146f..8b97e079af 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -58,7 +58,7 @@ window.socketio_port = {{ (frappe.socketio_port or 'null') }}; - + {%- block banner -%} {% include "templates/includes/banner_extension.html" ignore missing %}