vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #6918 from pratu16x7/explore-2.0-fixes

Browse source 
fix(modules): set implicit module category, one line descriptions
This commit is contained in:
Prateeksha Singh 2019-02-12 05:44:39 +05:30 • committed by GitHub
commit f7e2ce5166
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/config/__init__.py
View file

@ -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 = []

12
frappe/config/desktop.py
View file

@ -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."
},
]

5
frappe/public/js/frappe/views/components/Desktop.vue
View file

@ -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;
}
@ -125,9 +125,6 @@ export default {
}
.module-box-content {
padding-right: 15px;
flex: 1;
h4 {
margin-bottom: 5px
}