From 64e683a6d4d60a12392f29ab5159456b16e261be Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 12 Feb 2019 04:25:48 +0530 Subject: [PATCH 1/3] fix(modules): set implicit category of modules --- frappe/config/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/config/__init__.py b/frappe/config/__init__.py index dfe3c8b97e..4a139005f1 100644 --- a/frappe/config/__init__.py +++ b/frappe/config/__init__.py @@ -35,6 +35,10 @@ def get_modules_from_app(app): module['module_name'] = m active_modules_list.append(module) else: + for m in modules: + if m.get("type") == "module" and "category" not in m: + m["category"] = "Modules" + # Only newly formatted modules that have a category to be shown on desk modules = [m for m in modules if m.get("category")] active_modules_list = [] From 2ae056ad7a2eeca07777fcabfbb429c44eb993fa Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 12 Feb 2019 04:37:57 +0530 Subject: [PATCH 2/3] fix(modules): One line module descriptions --- frappe/config/desktop.py | 12 ++++++------ frappe/public/js/frappe/views/components/Desktop.vue | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frappe/config/desktop.py b/frappe/config/desktop.py index bb506a7caf..a4677a906b 100644 --- a/frappe/config/desktop.py +++ b/frappe/config/desktop.py @@ -13,7 +13,7 @@ def get_data(): "reverse": 1, "icon": "octicon octicon-calendar", "type": "module", - "description": "Todos, Notes and other basic tools to help you track your work." + "description": "Todos, notes, calendar and newsletter." }, { "module_name": "Settings", @@ -24,7 +24,7 @@ def get_data(): "icon": "octicon octicon-settings", "type": "module", "hidden": 1, - "description": "Configure Printing, Email and Customization." + "description": "Data import, printing, email and workflows." }, { "module_name": "Users and Permissions", @@ -46,7 +46,7 @@ def get_data(): "icon": "octicon octicon-settings", "type": "module", "hidden": 1, - "description": "Customize forms and add custom fields to suit your processes." + "description": "Customize forms, custom fields, scripts and translations." }, { "module_name": "Integrations", @@ -79,7 +79,7 @@ def get_data(): "system_manager": 1, "condition": getattr(frappe.local.conf, 'developer_mode', 0), "hidden": 1, - "description": "Doctypes, dev tools and logs. (Only active when developer mode is enabled)" + "description": "Doctypes, dev tools and logs." }, # Places @@ -92,7 +92,7 @@ def get_data(): "icon": "octicon octicon-globe", "type": "module", "hidden": 1, - "description": "Webpages and the Portal Side of Things." + "description": "Webpages, webforms, blogs and website theme." }, { "module_name": 'Social', @@ -104,6 +104,6 @@ def get_data(): "color": '#FF4136', 'standard': 1, 'idx': 15, - "description": "Build your profile and share posts on the feed with other users." + "description": "Build your profile and share posts with other users." }, ] diff --git a/frappe/public/js/frappe/views/components/Desktop.vue b/frappe/public/js/frappe/views/components/Desktop.vue index e637d464eb..bab18d507d 100644 --- a/frappe/public/js/frappe/views/components/Desktop.vue +++ b/frappe/public/js/frappe/views/components/Desktop.vue @@ -106,7 +106,7 @@ export default { .modules-container { display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); - grid-auto-rows: minmax(87px, 1fr); + grid-auto-rows: minmax(72px, 1fr); column-gap: 15px; row-gap: 15px; } From f67b76f530d1ccc3be21c7510d02ecfe19de41c3 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 12 Feb 2019 05:41:29 +0530 Subject: [PATCH 3/3] chore(modules): remove icon residue styles --- frappe/public/js/frappe/views/components/Desktop.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/frappe/public/js/frappe/views/components/Desktop.vue b/frappe/public/js/frappe/views/components/Desktop.vue index bab18d507d..30c09a6cd9 100644 --- a/frappe/public/js/frappe/views/components/Desktop.vue +++ b/frappe/public/js/frappe/views/components/Desktop.vue @@ -125,9 +125,6 @@ export default { } .module-box-content { - padding-right: 15px; - flex: 1; - h4 { margin-bottom: 5px }