From 0d8b9c865354323343bcf41176db23bfedaad8b6 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Mon, 23 Jul 2018 15:34:34 +0530 Subject: [PATCH] Revert "Modules dropdown" (#5855) * Revert "bench use should check if the site exists (#5849)" This reverts commit 630858eb968616edb8eebcb72dfb15419fefe2cc. * Revert "Add option to convert password to use ASCII instead of Unicode when needed by smtp server config (#5793)" This reverts commit 191684f6a5d99704e58acbaa001a585e5e52e90e. * Revert "Token based authentication (#5752)" This reverts commit abd3333baea8567152bd2f2efb3050dae1746486. * Revert "[minor] test fix" This reverts commit b6ba3915a678867de8351810eb6ddeb5a111ff15. * Revert "allow null when time field is not required (#5832)" This reverts commit 803f6b0c7b5b0520b900cc4aa7423d3b67aa9d87. * Revert "remove duplicate field entry for fieldname two_factor_authentication (#5846)" This reverts commit 6a06e65d209ad2d678cfc049e4774d385b8a787f. * Revert "Query Report (#5845)" This reverts commit f870a0bd25c4d1b8703349fbeeef8e4b17430450. * Revert "Modules dropdown (#5767)" This reverts commit 6f908b344301c75f4bf848681a4b6517461392b4. --- frappe/boot.py | 12 +-- frappe/desk/page/modules/modules.js | 11 --- frappe/public/css/chat.css | 3 + frappe/public/js/frappe/chat.js | 4 +- .../public/js/frappe/ui/toolbar/navbar.html | 85 +++++++------------ frappe/public/js/frappe/ui/toolbar/toolbar.js | 85 ++++--------------- frappe/public/less/chat.less | 2 + frappe/public/less/navbar.less | 74 ++-------------- 8 files changed, 57 insertions(+), 219 deletions(-) diff --git a/frappe/boot.py b/frappe/boot.py index 2c29444cf9..96f2cbae8e 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -16,7 +16,6 @@ from frappe.desk.form.load import get_meta_bundle from frappe.utils.change_log import get_versions from frappe.translate import get_lang_dict from frappe.email.inbox import get_email_accounts -from frappe.config.desktop import get_data as get_core_modules from frappe.core.doctype.feedback_trigger.feedback_trigger import get_enabled_feedback_trigger def get_bootinfo(): @@ -40,7 +39,7 @@ def get_bootinfo(): bootinfo.modules = {} bootinfo.module_list = [] - load_desktop_modules(bootinfo) + load_desktop_icons(bootinfo) bootinfo.letter_heads = get_letter_heads() bootinfo.active_domains = frappe.get_active_domains() bootinfo.all_domains = [d.get("name") for d in frappe.get_all("Domain")] @@ -96,17 +95,10 @@ def load_conf_settings(bootinfo): for key in ('developer_mode', 'socketio_port', 'file_watcher_port'): if key in conf: bootinfo[key] = conf.get(key) -def load_desktop_modules(bootinfo): - # Get all desktop icons +def load_desktop_icons(bootinfo): from frappe.desk.doctype.desktop_icon.desktop_icon import get_desktop_icons bootinfo.desktop_icons = get_desktop_icons() - # Define core modules - bootinfo.core_modules = get_core_modules() - - # Add explore links - bootinfo["page_quick_links"] = frappe.get_hooks('page_quick_links') or [] - def get_allowed_pages(): return get_user_pages_or_reports('Page') diff --git a/frappe/desk/page/modules/modules.js b/frappe/desk/page/modules/modules.js index a0bceecc6b..80048fbf59 100644 --- a/frappe/desk/page/modules/modules.js +++ b/frappe/desk/page/modules/modules.js @@ -18,17 +18,6 @@ frappe.pages['modules'].on_page_load = function(wrapper) { .show(frappe.session.user); }); - let quick_link = frappe.boot.page_quick_links ? frappe.boot.page_quick_links[0] : null; - - if(quick_link) { - this.page.set_secondary_action( - quick_link.label, - () => { - frappe.set_route(quick_link.link); - } - ); - } - if(frappe.user.has_role('System Manager')) { page.add_menu_item(__('Install Apps'), function() { frappe.set_route("applications"); diff --git a/frappe/public/css/chat.css b/frappe/public/css/chat.css index 6e9ee99ba5..2f9f4cc66b 100644 --- a/frappe/public/css/chat.css +++ b/frappe/public/css/chat.css @@ -267,6 +267,9 @@ a.no-decoration:active { height: 40px; text-align: center; } +.navbar .octicon { + margin-top: 5px; +} .frappe-chat > .frappe-chat-popper { position: fixed; bottom: 0px; diff --git a/frappe/public/js/frappe/chat.js b/frappe/public/js/frappe/chat.js index 056e884453..d4e8f74dbc 100644 --- a/frappe/public/js/frappe/chat.js +++ b/frappe/public/js/frappe/chat.js @@ -2633,11 +2633,9 @@ frappe.chat.render = (render = true, force = false) => // Render if frappe-chat-toggle doesn't exist. if ( frappe.utils.is_empty($placeholder.has('.frappe-chat-toggle')) ) { - - // Note: custom padding set visually for icon const $template = $(` -
+
diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html index 2f81471edd..048548c831 100644 --- a/frappe/public/js/frappe/ui/toolbar/navbar.html +++ b/frappe/public/js/frappe/ui/toolbar/navbar.html @@ -1,61 +1,10 @@