diff --git a/core/doctype/page/page.txt b/core/doctype/page/page.txt index 7efe60ca8e..4dd675a885 100644 --- a/core/doctype/page/page.txt +++ b/core/doctype/page/page.txt @@ -2,7 +2,7 @@ { "creation": "2012-12-20 17:16:49", "docstatus": 0, - "modified": "2013-07-05 14:48:00", + "modified": "2013-07-11 14:37:21", "modified_by": "Administrator", "owner": "Administrator" }, @@ -70,6 +70,12 @@ "fieldtype": "Data", "label": "Title" }, + { + "doctype": "DocField", + "fieldname": "icon", + "fieldtype": "Data", + "label": "icon" + }, { "doctype": "DocField", "fieldname": "column_break0", diff --git a/core/page/data_import_tool/data_import_tool.txt b/core/page/data_import_tool/data_import_tool.txt index 4368d3dcd1..04b557685b 100644 --- a/core/page/data_import_tool/data_import_tool.txt +++ b/core/page/data_import_tool/data_import_tool.txt @@ -1,30 +1,31 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-06-14 15:07:25", + "docstatus": 0, + "modified": "2013-07-11 14:41:54", "modified_by": "Administrator", - "modified": "2012-10-04 16:54:24" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Data Import Tool", - "module": "Core", "doctype": "Page", + "icon": "icon-upload", + "module": "Core", + "name": "__common__", "page_name": "Data Import Tool", - "standard": "Yes" + "standard": "Yes", + "title": "Data Import Tool" }, { - "parent": "data-import-tool", - "name": "__common__", "doctype": "Page Role", + "name": "__common__", + "parent": "data-import-tool", + "parentfield": "roles", "parenttype": "Page", - "role": "System Manager", - "parentfield": "roles" + "role": "System Manager" }, { - "name": "data-import-tool", - "doctype": "Page" + "doctype": "Page", + "name": "data-import-tool" }, { "doctype": "Page Role" diff --git a/core/page/desktop/desktop.txt b/core/page/desktop/desktop.txt index 3e9219f7a6..c415bd8dae 100644 --- a/core/page/desktop/desktop.txt +++ b/core/page/desktop/desktop.txt @@ -2,12 +2,13 @@ { "creation": "2013-02-14 17:37:37", "docstatus": 0, - "modified": "2013-04-03 11:38:05", + "modified": "2013-07-11 14:41:56", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "Page", + "icon": "icon-th", "module": "Core", "name": "__common__", "page_name": "desktop", diff --git a/core/page/messages/messages.txt b/core/page/messages/messages.txt index 0949bd7fbb..347a9eaedc 100644 --- a/core/page/messages/messages.txt +++ b/core/page/messages/messages.txt @@ -2,12 +2,13 @@ { "creation": "2012-06-14 18:44:56", "docstatus": 0, - "modified": "2013-04-03 14:48:57", + "modified": "2013-07-11 14:43:32", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "Page", + "icon": "icon-envelope", "module": "Core", "name": "__common__", "page_name": "messages", diff --git a/core/page/modules_setup/modules_setup.txt b/core/page/modules_setup/modules_setup.txt index 556be2bfb6..4faf9caa2b 100644 --- a/core/page/modules_setup/modules_setup.txt +++ b/core/page/modules_setup/modules_setup.txt @@ -2,12 +2,13 @@ { "creation": "2012-10-04 18:45:29", "docstatus": 0, - "modified": "2013-04-03 12:19:56", + "modified": "2013-07-11 14:43:37", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "Page", + "icon": "icon-cog", "module": "Core", "name": "__common__", "page_name": "modules_setup", diff --git a/core/page/permission_manager/permission_manager.txt b/core/page/permission_manager/permission_manager.txt index db0c54dcee..7a83332794 100644 --- a/core/page/permission_manager/permission_manager.txt +++ b/core/page/permission_manager/permission_manager.txt @@ -1,30 +1,31 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2013-01-01 11:00:01", + "docstatus": 0, + "modified": "2013-07-11 14:43:42", "modified_by": "Administrator", - "modified": "2013-01-09 17:07:38" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Permission Manager", "doctype": "Page", + "icon": "icon-lock", "module": "Core", + "name": "__common__", + "page_name": "Permission Manager", "standard": "Yes", - "page_name": "Permission Manager" + "title": "Permission Manager" }, { + "doctype": "Page Role", "name": "__common__", "parent": "permission-manager", - "doctype": "Page Role", + "parentfield": "roles", "parenttype": "Page", - "role": "System Manager", - "parentfield": "roles" + "role": "System Manager" }, { - "name": "permission-manager", - "doctype": "Page" + "doctype": "Page", + "name": "permission-manager" }, { "doctype": "Page Role" diff --git a/core/page/todo/todo.txt b/core/page/todo/todo.txt index 140f56b510..5f9cc0525a 100644 --- a/core/page/todo/todo.txt +++ b/core/page/todo/todo.txt @@ -2,12 +2,13 @@ { "creation": "2013-04-09 11:45:31", "docstatus": 0, - "modified": "2013-04-09 11:47:54", + "modified": "2013-07-11 14:44:45", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "Page", + "icon": "icon-check", "module": "Core", "name": "__common__", "page_name": "todo", diff --git a/core/page/update_manager/update_manager.txt b/core/page/update_manager/update_manager.txt index 82fab61b65..e403c9babc 100644 --- a/core/page/update_manager/update_manager.txt +++ b/core/page/update_manager/update_manager.txt @@ -2,12 +2,13 @@ { "creation": "2013-04-01 11:07:42", "docstatus": 0, - "modified": "2013-04-01 11:07:42", + "modified": "2013-07-11 14:45:15", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "Page", + "icon": "icon-rss", "module": "Core", "name": "__common__", "page_name": "update-manager", diff --git a/core/page/user_properties/user_properties.txt b/core/page/user_properties/user_properties.txt index 71ec268efe..e8ad018b6c 100644 --- a/core/page/user_properties/user_properties.txt +++ b/core/page/user_properties/user_properties.txt @@ -1,30 +1,31 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2013-01-01 18:50:55", + "docstatus": 0, + "modified": "2013-07-11 14:45:20", "modified_by": "Administrator", - "modified": "2013-01-09 17:07:00" + "owner": "Administrator" }, { - "name": "__common__", - "title": "User Properties", "doctype": "Page", + "icon": "icon-user", "module": "Core", + "name": "__common__", + "page_name": "user-properties", "standard": "Yes", - "page_name": "user-properties" + "title": "User Properties" }, { + "doctype": "Page Role", "name": "__common__", "parent": "user-properties", - "doctype": "Page Role", + "parentfield": "roles", "parenttype": "Page", - "role": "System Manager", - "parentfield": "roles" + "role": "System Manager" }, { - "name": "user-properties", - "doctype": "Page" + "doctype": "Page", + "name": "user-properties" }, { "doctype": "Page Role" diff --git a/public/js/wn/views/moduleview.js b/public/js/wn/views/moduleview.js index b441766b2e..812cd2e36e 100644 --- a/public/js/wn/views/moduleview.js +++ b/public/js/wn/views/moduleview.js @@ -163,6 +163,9 @@ wn.views.moduleview.ModuleView = Class.extend({ if(item.page && !item.route) { item.route = item.page; } + if(item.page) { + item.icon = ' '; + } // link item.link = repl("%(label)s", item); diff --git a/webnotes/boot.py b/webnotes/boot.py index 2a7bfb1ff6..4c1d86b311 100644 --- a/webnotes/boot.py +++ b/webnotes/boot.py @@ -59,6 +59,8 @@ def get_bootinfo(): bootinfo.hidden_modules = webnotes.conn.get_global("hidden_modules") bootinfo.doctype_icons = dict(webnotes.conn.sql("""select name, icon from tabDocType where ifnull(icon,'')!=''""")) + bootinfo.doctype_icons.update(dict(webnotes.conn.sql("""select name, icon from + tabPage where ifnull(icon,'')!=''"""))) add_home_page(bootinfo, doclist) add_allowed_pages(bootinfo) diff --git a/webnotes/widgets/moduleview.py b/webnotes/widgets/moduleview.py index d7de21259a..a72b065241 100644 --- a/webnotes/widgets/moduleview.py +++ b/webnotes/widgets/moduleview.py @@ -16,7 +16,10 @@ def get_data(module, doctypes='[]'): def get_count(doctypes): count = {} for d in doctypes: - count[d] = get_doctype_count_from_table(d) + try: + count[d] = get_doctype_count_from_table(d) + except webnotes.PermissionError, e: + pass return count def get_doctype_count_from_table(doctype):