From 91c2e57fdb6b50eafaab30939474ce99bd1f91f7 Mon Sep 17 00:00:00 2001 From: pratu16x7 Date: Mon, 28 Aug 2017 17:26:51 +0530 Subject: [PATCH] [setup wiz] fixes --- frappe/desk/page/setup_wizard/setup_wizard.css | 16 ++++++++++------ frappe/desk/page/setup_wizard/setup_wizard.js | 16 +++++++++------- frappe/public/css/desk.css | 3 +++ frappe/public/js/frappe/ui/slides.js | 16 ++++++++-------- .../js/frappe/ui/toolbar/user_progress_dialog.js | 6 +++++- frappe/public/less/desk.less | 3 +++ 6 files changed, 38 insertions(+), 22 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.css b/frappe/desk/page/setup_wizard/setup_wizard.css index f61ea87863..21fcd66970 100644 --- a/frappe/desk/page/setup_wizard/setup_wizard.css +++ b/frappe/desk/page/setup_wizard/setup_wizard.css @@ -13,6 +13,10 @@ } } +.setup-wizard-slide .slides-progress { + margin-top: 10px; +} + .setup-wizard-slide .lead { margin: 30px; color: #777777; @@ -41,14 +45,18 @@ } .setup-wizard-slide.with-form { - margin: 60px auto; + margin: 40px auto; padding: 10px 50px; border: 1px solid #d1d8dd; box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.1); } +.setup-wizard-slide .add-more { + margin: 0px; +} + .setup-wizard-slide .footer { - padding: 30px 0px; + padding: 30px 7px; } .setup-wizard-slide a.next-btn.disabled, @@ -58,10 +66,6 @@ border-color: #b1bdca; } -.setup-wizard-progress { - padding: 15px; -} - .setup-wizard-slide .fa-fw { vertical-align: middle; font-size: 10px; diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js index c8286d49f2..dbea8f4ca1 100644 --- a/frappe/desk/page/setup_wizard/setup_wizard.js +++ b/frappe/desk/page/setup_wizard/setup_wizard.js @@ -82,8 +82,8 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { make() { super.make(); this.container.addClass("container setup-wizard-slide with-form"); - this.$complete_btn = this.$footer.find('.complete-btn') - .on('click', this.action_on_complete.bind(this)); + this.$next_btn.addClass('action'); + this.$complete_btn = this.$footer.find('.complete-btn').addClass('action'); } before_show_slide() { @@ -103,7 +103,8 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { super.show_hide_prev_next(id); if (id + 1 === this.slides.length){ this.$next_btn.removeClass("btn-primary").hide(); - this.$complete_btn.addClass("btn-primary").show(); + this.$complete_btn.addClass("btn-primary").show() + .on('click', this.action_on_complete.bind(this)); } else { this.$next_btn.addClass("btn-primary").show(); @@ -155,9 +156,10 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { } setTimeout(function() { window.location = "/desk"; - setTimeout(function() { - frappe.frappe_toolbar.progress_dialog.show(); - }, 2000); + frappe.ui.toolbar.clear_cache(); + // setTimeout(function() { + // frappe.frappe_toolbar.progress_dialog.show(); + // }, 2000); }, 2000); }, error: function() { @@ -232,7 +234,7 @@ frappe.setup.SetupWizardSlide = class SetupWizardSlide extends frappe.ui.Slide { make() { super.make(); this.set_init_values(); - this.reset_primary_button_state(); + this.reset_action_button_state(); // this.setup_keyboard_nav(); } diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index f8893f1f66..1dc4a96f37 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -1103,6 +1103,9 @@ input[type="checkbox"]:checked:before { padding: 0px 7px; border: none; } +.slides-wrapper .add-more { + margin-bottom: 30px; +} .slides-wrapper .lead { margin-top: 20px; } diff --git a/frappe/public/js/frappe/ui/slides.js b/frappe/public/js/frappe/ui/slides.js index 71cbdf0d7b..7d2fc295ac 100644 --- a/frappe/public/js/frappe/ui/slides.js +++ b/frappe/public/js/frappe/ui/slides.js @@ -25,7 +25,7 @@ frappe.ui.Slide = class Slide {
-
+
${__("Add More")}
@@ -133,28 +133,28 @@ frappe.ui.Slide = class Slide { // Primary button (outside of slide) resetup_primary_button() { this.unbind_primary_action(); - this.bind_fields_to_primary_btn(); - this.reset_primary_button_state(); + this.bind_fields_to_action_btn(); + this.reset_action_button_state(); this.bind_primary_action(); } - bind_fields_to_primary_btn() { + bind_fields_to_action_btn() { var me = this; this.reqd_fields.map((field) => { field.$wrapper.on('change input', () => { - me.reset_primary_button_state(); + me.reset_action_button_state(); }); }); } - reset_primary_button_state() { + reset_action_button_state() { var empty_fields = this.reqd_fields.filter((field) => { return !field.get_value(); }); if(empty_fields.length) { - this.slides_footer.find('.primary').addClass('disabled'); + this.slides_footer.find('.action').addClass('disabled'); } else { - this.slides_footer.find('.primary').removeClass('disabled'); + this.slides_footer.find('.action').removeClass('disabled'); } } diff --git a/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js b/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js index 192ee51c3c..e7c898fe7c 100644 --- a/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js +++ b/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js @@ -170,6 +170,7 @@ frappe.setup.UserProgressSlide = class UserProgressSlide extends frappe.ui.Slide primary_action() { var me = this; if(this.set_values()) { + this.$primary_btn.addClass('.disabled'); frappe.call({ method: me.submit_method, args: {args_data: me.values}, @@ -177,6 +178,9 @@ frappe.setup.UserProgressSlide = class UserProgressSlide extends frappe.ui.Slide me.done = 1; me.refresh(); }, + onerror: function() { + me.$primary_btn.removeClass('.disabled'); + }, freeze: true }); } @@ -212,7 +216,7 @@ frappe.setup.UserProgressDialog = class UserProgressDialog { $footer.find('.text-right') .prepend($(` ${__("Mark as Done")}`)) - .prepend($(` + .prepend($(` ${__("Create")}`)); }, on_update: (completed, total) => { diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 08e223915a..ecc8b84965 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -1046,6 +1046,9 @@ input[type="checkbox"] { border: none; } } + .add-more { + margin-bottom: 30px; + } .lead { margin-top: 20px; }