Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

This commit is contained in:
Nabin Hait
2013-07-11 16:07:53 +05:30
37 changed files with 505 additions and 449 deletions

View File

@@ -1,35 +1,36 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-06-14 15:07:28", "creation": "2012-06-14 15:07:28",
"docstatus": 0,
"modified": "2013-07-11 14:39:42",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-10-04 16:57:27" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"module": "Accounts",
"page_name": "Accounts Browser",
"doctype": "Page", "doctype": "Page",
"icon": "icon-sitemap",
"module": "Accounts",
"name": "__common__",
"page_name": "Accounts Browser",
"standard": "Yes" "standard": "Yes"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "Accounts Browser", "parent": "Accounts Browser",
"parentfield": "roles",
"parenttype": "Page"
},
{
"doctype": "Page",
"name": "Accounts Browser"
},
{
"doctype": "Page Role", "doctype": "Page Role",
"parenttype": "Page", "role": "Accounts User"
"parentfield": "roles"
}, },
{ {
"name": "Accounts Browser", "doctype": "Page Role",
"doctype": "Page" "role": "Accounts Manager"
},
{
"role": "Accounts User",
"doctype": "Page Role"
},
{
"role": "Accounts Manager",
"doctype": "Page Role"
} }
] ]

View File

@@ -1,21 +1,22 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-06-14 15:07:28", "creation": "2012-06-14 15:07:28",
"docstatus": 0,
"modified": "2013-07-11 14:40:16",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-10-05 16:30:46" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Accounts Home",
"module": "Accounts",
"doctype": "Page", "doctype": "Page",
"icon": "icon-th",
"module": "Accounts",
"name": "__common__",
"page_name": "accounts-home", "page_name": "accounts-home",
"standard": "Yes" "standard": "Yes",
"title": "Accounts Home"
}, },
{ {
"name": "accounts-home", "doctype": "Page",
"doctype": "Page" "name": "accounts-home"
} }
] ]

View File

@@ -2,12 +2,13 @@
{ {
"creation": "2013-01-27 16:30:52", "creation": "2013-01-27 16:30:52",
"docstatus": 0, "docstatus": 0,
"modified": "2013-01-29 13:11:00", "modified": "2013-07-11 14:42:16",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
{ {
"doctype": "Page", "doctype": "Page",
"icon": "icon-bar-chart",
"module": "Accounts", "module": "Accounts",
"name": "__common__", "name": "__common__",
"page_name": "financial-analytics", "page_name": "financial-analytics",

View File

@@ -2,12 +2,13 @@
{ {
"creation": "2013-01-27 16:30:52", "creation": "2013-01-27 16:30:52",
"docstatus": 0, "docstatus": 0,
"modified": "2013-01-29 13:11:17", "modified": "2013-07-11 14:41:59",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
{ {
"doctype": "Page", "doctype": "Page",
"icon": "icon-money",
"module": "Accounts", "module": "Accounts",
"name": "__common__", "name": "__common__",
"page_name": "Financial Statements", "page_name": "Financial Statements",

View File

@@ -1,40 +1,41 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-09-14 11:25:48", "creation": "2012-09-14 11:25:48",
"docstatus": 0,
"modified": "2013-07-11 14:42:21",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-10-04 17:00:09" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "General Ledger",
"module": "Accounts",
"doctype": "Page", "doctype": "Page",
"icon": "icon-table",
"module": "Accounts",
"name": "__common__",
"page_name": "general-ledger", "page_name": "general-ledger",
"standard": "Yes" "standard": "Yes",
"title": "General Ledger"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "general-ledger", "parent": "general-ledger",
"parentfield": "roles",
"parenttype": "Page"
},
{
"doctype": "Page",
"name": "general-ledger"
},
{
"doctype": "Page Role", "doctype": "Page Role",
"parenttype": "Page", "role": "Analytics"
"parentfield": "roles"
}, },
{ {
"name": "general-ledger", "doctype": "Page Role",
"doctype": "Page" "role": "Accounts Manager"
}, },
{ {
"role": "Analytics", "doctype": "Page Role",
"doctype": "Page Role" "role": "Accounts User"
},
{
"role": "Accounts Manager",
"doctype": "Page Role"
},
{
"role": "Accounts User",
"doctype": "Page Role"
} }
] ]

View File

@@ -2,12 +2,13 @@
{ {
"creation": "2013-01-27 16:30:52", "creation": "2013-01-27 16:30:52",
"docstatus": 0, "docstatus": 0,
"modified": "2013-01-29 13:11:43", "modified": "2013-07-11 14:44:49",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
{ {
"doctype": "Page", "doctype": "Page",
"icon": "icon-table",
"module": "Accounts", "module": "Accounts",
"name": "__common__", "name": "__common__",
"page_name": "trial-balance", "page_name": "trial-balance",

View File

@@ -1,30 +1,31 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-10-02 18:51:49", "creation": "2012-10-02 18:51:49",
"docstatus": 0,
"modified": "2013-07-11 14:45:25",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-10-04 17:04:18" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Voucher Import Tool",
"module": "Accounts",
"doctype": "Page", "doctype": "Page",
"page_name": "voucher-import-tool", "icon": "icon-upload",
"standard": "Yes" "module": "Accounts",
},
{
"parent": "voucher-import-tool",
"name": "__common__", "name": "__common__",
"doctype": "Page Role", "page_name": "voucher-import-tool",
"parenttype": "Page", "standard": "Yes",
"role": "Accounts Manager", "title": "Voucher Import Tool"
"parentfield": "roles"
}, },
{ {
"name": "voucher-import-tool", "doctype": "Page Role",
"doctype": "Page" "name": "__common__",
"parent": "voucher-import-tool",
"parentfield": "roles",
"parenttype": "Page",
"role": "Accounts Manager"
},
{
"doctype": "Page",
"name": "voucher-import-tool"
}, },
{ {
"doctype": "Page Role" "doctype": "Page Role"

View File

@@ -1,21 +1,22 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-02-21 13:22:54", "creation": "2012-02-21 13:22:54",
"docstatus": 0,
"modified": "2013-07-11 14:41:50",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-02-21 13:22:54" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Buying Home",
"module": "Buying",
"doctype": "Page", "doctype": "Page",
"icon": "icon-th",
"module": "Buying",
"name": "__common__",
"page_name": "buying-home", "page_name": "buying-home",
"standard": "Yes" "standard": "Yes",
"title": "Buying Home"
}, },
{ {
"name": "buying-home", "doctype": "Page",
"doctype": "Page" "name": "buying-home"
} }
] ]

View File

@@ -1,36 +1,37 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-09-21 20:15:16", "creation": "2012-09-21 20:15:16",
"docstatus": 0,
"modified": "2013-07-11 14:43:52",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-10-04 17:24:17" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Purchase Analytics",
"module": "Buying",
"doctype": "Page", "doctype": "Page",
"icon": "icon-bar-chart",
"module": "Buying",
"name": "__common__",
"page_name": "purchase-analytics", "page_name": "purchase-analytics",
"standard": "Yes" "standard": "Yes",
"title": "Purchase Analytics"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "purchase-analytics", "parent": "purchase-analytics",
"parentfield": "roles",
"parenttype": "Page"
},
{
"doctype": "Page",
"name": "purchase-analytics"
},
{
"doctype": "Page Role", "doctype": "Page Role",
"parenttype": "Page", "role": "Analytics"
"parentfield": "roles"
}, },
{ {
"name": "purchase-analytics", "doctype": "Page Role",
"doctype": "Page" "role": "Purchase Manager"
},
{
"role": "Analytics",
"doctype": "Page Role"
},
{
"role": "Purchase Manager",
"doctype": "Page Role"
} }
] ]

View File

@@ -2,12 +2,13 @@
{ {
"creation": "2013-04-09 11:45:31", "creation": "2013-04-09 11:45:31",
"docstatus": 0, "docstatus": 0,
"modified": "2013-04-09 11:47:32", "modified": "2013-07-11 14:40:20",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
{ {
"doctype": "Page", "doctype": "Page",
"icon": "icon-play",
"module": "Home", "module": "Home",
"name": "__common__", "name": "__common__",
"page_name": "activity", "page_name": "activity",

View File

@@ -1,21 +1,22 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-03-01 12:30:42", "creation": "2012-03-01 12:30:42",
"docstatus": 0,
"modified": "2013-07-11 14:41:47",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-03-01 12:30:42" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Attributions",
"module": "Home",
"doctype": "Page", "doctype": "Page",
"icon": "icon-trophy",
"module": "Home",
"name": "__common__",
"page_name": "attributions", "page_name": "attributions",
"standard": "Yes" "standard": "Yes",
"title": "Attributions"
}, },
{ {
"name": "attributions", "doctype": "Page",
"doctype": "Page" "name": "attributions"
} }
] ]

View File

@@ -1,30 +1,31 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-11-19 12:06:54", "creation": "2012-11-19 12:06:54",
"docstatus": 0,
"modified": "2013-07-11 14:43:20",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-11-23 18:03:48" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Latest Updates",
"doctype": "Page", "doctype": "Page",
"icon": "icon-asterisk",
"module": "Home", "module": "Home",
"name": "__common__",
"page_name": "latest-updates",
"standard": "Yes", "standard": "Yes",
"page_name": "latest-updates" "title": "Latest Updates"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "latest-updates", "parent": "latest-updates",
"doctype": "Page Role", "parentfield": "roles",
"parenttype": "Page", "parenttype": "Page",
"role": "All", "role": "All"
"parentfield": "roles"
}, },
{ {
"name": "latest-updates", "doctype": "Page",
"doctype": "Page" "name": "latest-updates"
}, },
{ {
"doctype": "Page Role" "doctype": "Page Role"

View File

@@ -1,21 +1,22 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-02-21 13:24:05", "creation": "2012-02-21 13:24:05",
"docstatus": 0,
"modified": "2013-07-11 14:42:23",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-02-21 13:24:05" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Human Resources Home",
"module": "HR",
"doctype": "Page", "doctype": "Page",
"icon": "icon-th",
"module": "HR",
"name": "__common__",
"page_name": "hr-home", "page_name": "hr-home",
"standard": "Yes" "standard": "Yes",
"title": "Human Resources Home"
}, },
{ {
"name": "hr-home", "doctype": "Page",
"doctype": "Page" "name": "hr-home"
} }
] ]

View File

@@ -1,21 +1,22 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-02-21 13:24:34", "creation": "2012-02-21 13:24:34",
"docstatus": 0,
"modified": "2013-07-11 14:43:23",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-12-10 18:30:00" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Manufacturing Home",
"module": "Manufacturing",
"doctype": "Page", "doctype": "Page",
"icon": "icon-th",
"module": "Manufacturing",
"name": "__common__",
"page_name": "manufacturing-home", "page_name": "manufacturing-home",
"standard": "Yes" "standard": "Yes",
"title": "Manufacturing Home"
}, },
{ {
"name": "manufacturing-home", "doctype": "Page",
"doctype": "Page" "name": "manufacturing-home"
} }
] ]

View File

@@ -20,7 +20,7 @@ patch_list = [
"execute:webnotes.reload_doc('core', 'doctype', 'docperm') # 2013-04-07", "execute:webnotes.reload_doc('core', 'doctype', 'docperm') # 2013-04-07",
"execute:webnotes.reload_doc('core', 'doctype', 'report')", "execute:webnotes.reload_doc('core', 'doctype', 'report')",
"execute:webnotes.reload_doc('core', 'doctype', 'doctype') # 2013-07-08", "execute:webnotes.reload_doc('core', 'doctype', 'doctype') # 2013-07-08",
"execute:webnotes.reload_doc('core', 'doctype', 'page') # 2013-06-24", "execute:webnotes.reload_doc('core', 'doctype', 'page') # 2013-07-11",
"patches.mar_2012.clean_property_setter", "patches.mar_2012.clean_property_setter",
"patches.april_2012.naming_series_patch", "patches.april_2012.naming_series_patch",
"patches.mar_2012.cleanup_control_panel", "patches.mar_2012.cleanup_control_panel",

View File

@@ -1,21 +1,22 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-02-21 13:24:22", "creation": "2012-02-21 13:24:22",
"docstatus": 0,
"modified": "2013-07-11 14:43:49",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-02-21 13:24:22" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Projects Home",
"module": "Projects",
"doctype": "Page", "doctype": "Page",
"icon": "icon-th",
"module": "Projects",
"name": "__common__",
"page_name": "projects-home", "page_name": "projects-home",
"standard": "Yes" "standard": "Yes",
"title": "Projects Home"
}, },
{ {
"name": "projects-home", "doctype": "Page",
"doctype": "Page" "name": "projects-home"
} }
] ]

View File

@@ -1,40 +1,41 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-09-21 20:15:12", "creation": "2012-09-21 20:15:12",
"docstatus": 0,
"modified": "2013-07-11 14:43:59",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-10-04 17:17:39" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Sales Analytics",
"module": "Selling",
"doctype": "Page", "doctype": "Page",
"icon": "icon-bar-chart",
"module": "Selling",
"name": "__common__",
"page_name": "sales-analytics", "page_name": "sales-analytics",
"standard": "Yes" "standard": "Yes",
"title": "Sales Analytics"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "sales-analytics", "parent": "sales-analytics",
"parentfield": "roles",
"parenttype": "Page"
},
{
"doctype": "Page",
"name": "sales-analytics"
},
{
"doctype": "Page Role", "doctype": "Page Role",
"parenttype": "Page", "role": "Analytics"
"parentfield": "roles"
}, },
{ {
"name": "sales-analytics", "doctype": "Page Role",
"doctype": "Page" "role": "Sales Manager"
}, },
{ {
"role": "Analytics", "doctype": "Page Role",
"doctype": "Page Role" "role": "Maintenance Manager"
},
{
"role": "Sales Manager",
"doctype": "Page Role"
},
{
"role": "Maintenance Manager",
"doctype": "Page Role"
} }
] ]

View File

@@ -1,55 +1,56 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-06-14 15:07:26", "creation": "2012-06-14 15:07:26",
"docstatus": 0,
"modified": "2013-07-11 14:43:56",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-10-04 17:34:55" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"module": "Selling",
"page_name": "Sales Browser",
"doctype": "Page", "doctype": "Page",
"icon": "icon-sitemap",
"module": "Selling",
"name": "__common__",
"page_name": "Sales Browser",
"standard": "Yes" "standard": "Yes"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "Sales Browser", "parent": "Sales Browser",
"parentfield": "roles",
"parenttype": "Page"
},
{
"doctype": "Page",
"name": "Sales Browser"
},
{
"doctype": "Page Role", "doctype": "Page Role",
"parenttype": "Page", "role": "Sales Master Manager"
"parentfield": "roles"
}, },
{ {
"name": "Sales Browser", "doctype": "Page Role",
"doctype": "Page" "role": "Material Master Manager"
}, },
{ {
"role": "Sales Master Manager", "doctype": "Page Role",
"doctype": "Page Role" "role": "Accounts Manager"
}, },
{ {
"role": "Material Master Manager", "doctype": "Page Role",
"doctype": "Page Role" "role": "Sales Master Manager"
}, },
{ {
"role": "Accounts Manager", "doctype": "Page Role",
"doctype": "Page Role" "role": "Purchase Manager"
}, },
{ {
"role": "Sales Master Manager", "doctype": "Page Role",
"doctype": "Page Role" "role": "Purchase Master Manager"
}, },
{ {
"role": "Purchase Manager", "doctype": "Page Role",
"doctype": "Page Role" "role": "Material Manager"
},
{
"role": "Purchase Master Manager",
"doctype": "Page Role"
},
{
"role": "Material Manager",
"doctype": "Page Role"
} }
] ]

View File

@@ -1,30 +1,31 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-02-20 15:46:39", "creation": "2012-02-20 15:46:39",
"docstatus": 0,
"modified": "2013-07-11 14:44:01",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-02-20 15:46:57" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Selling Home",
"module": "Selling",
"doctype": "Page", "doctype": "Page",
"page_name": "selling-home", "icon": "icon-th",
"standard": "Yes" "module": "Selling",
},
{
"parent": "selling-home",
"name": "__common__", "name": "__common__",
"doctype": "Page Role", "page_name": "selling-home",
"parenttype": "Page", "standard": "Yes",
"role": "All", "title": "Selling Home"
"parentfield": "roles"
}, },
{ {
"name": "selling-home", "doctype": "Page Role",
"doctype": "Page" "name": "__common__",
"parent": "selling-home",
"parentfield": "roles",
"parenttype": "Page",
"role": "All"
},
{
"doctype": "Page",
"name": "selling-home"
}, },
{ {
"doctype": "Page Role" "doctype": "Page Role"

View File

@@ -93,6 +93,10 @@ class DocType:
"url": "blog" "url": "blog"
}) })
website_settings.save() website_settings.save()
style_settings = webnotes.bean("Style Settings", "Style Settings")
style_settings.doc.top_bar_background = "F2F2F2"
style_settings.doc.font_size = "15px"
style_settings.save()
def create_default_accounts(self): def create_default_accounts(self):
self.fld_dict = {'account_name':0,'parent_account':1,'group_or_ledger':2,'is_pl_account':3,'account_type':4,'debit_or_credit':5,'company':6,'tax_rate':7} self.fld_dict = {'account_name':0,'parent_account':1,'group_or_ledger':2,'is_pl_account':3,'account_type':4,'debit_or_credit':5,'company':6,'tax_rate':7}

View File

@@ -1,4 +1,4 @@
<h2 style="text-align: center;"><i class="icon-home"></i> Sample Home Page</h2> <h2><i class="icon-home"></i> Sample Home Page</h2>
<br> <br>
<p>This is a sample home page for your company <b>%(name)s's</b> website. This was <p>This is a sample home page for your company <b>%(name)s's</b> website. This was
created from the Website Module inside ERPNext. ERPNext provides you with simple created from the Website Module inside ERPNext. ERPNext provides you with simple
@@ -19,4 +19,7 @@
<a href="https://erpnext.com" target="_blank">erpnext.com</a> <a href="https://erpnext.com" target="_blank">erpnext.com</a>
website is built on ERPNext itself.</p> website is built on ERPNext itself.</p>
<p class="text-muted">For more help, click here</p> <p><a href="login" class="btn btn-primary">Login to your Account</a><p>
<p class="text-muted pull-right">For more help, <a href="http://erpnext.org" target="_blank">
click here</a></p>

View File

@@ -1,29 +1,30 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-06-14 15:07:28", "creation": "2012-06-14 15:07:28",
"docstatus": 0,
"modified": "2013-07-11 14:44:04",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-10-04 16:52:41" "owner": "Administrator"
}, },
{ {
"name": "__common__", "doctype": "Page",
"icon": "icon-cog",
"module": "Setup", "module": "Setup",
"standard": "Yes",
"page_name": "Setup",
"doctype": "Page"
},
{
"parent": "Setup",
"name": "__common__", "name": "__common__",
"doctype": "Page Role", "page_name": "Setup",
"parenttype": "Page", "standard": "Yes"
"role": "System Manager",
"parentfield": "roles"
}, },
{ {
"name": "Setup", "doctype": "Page Role",
"doctype": "Page" "name": "__common__",
"parent": "Setup",
"parentfield": "roles",
"parenttype": "Page",
"role": "System Manager"
},
{
"doctype": "Page",
"name": "Setup"
}, },
{ {
"doctype": "Page Role" "doctype": "Page Role"

View File

@@ -1,36 +1,37 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-09-21 20:15:14", "creation": "2012-09-21 20:15:14",
"docstatus": 0,
"modified": "2013-07-11 14:44:08",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-10-04 17:34:24" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Stock Ageing",
"module": "Stock",
"doctype": "Page", "doctype": "Page",
"icon": "icon-table",
"module": "Stock",
"name": "__common__",
"page_name": "stock-ageing", "page_name": "stock-ageing",
"standard": "Yes" "standard": "Yes",
"title": "Stock Ageing"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "stock-ageing", "parent": "stock-ageing",
"parentfield": "roles",
"parenttype": "Page"
},
{
"doctype": "Page",
"name": "stock-ageing"
},
{
"doctype": "Page Role", "doctype": "Page Role",
"parenttype": "Page", "role": "Analytics"
"parentfield": "roles"
}, },
{ {
"name": "stock-ageing", "doctype": "Page Role",
"doctype": "Page" "role": "Material Manager"
},
{
"role": "Analytics",
"doctype": "Page Role"
},
{
"role": "Material Manager",
"doctype": "Page Role"
} }
] ]

View File

@@ -1,36 +1,37 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-09-21 20:15:14", "creation": "2012-09-21 20:15:14",
"docstatus": 0,
"modified": "2013-07-11 14:44:10",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-10-04 17:32:20" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Stock Analytics",
"module": "Stock",
"doctype": "Page", "doctype": "Page",
"icon": "icon-bar-chart",
"module": "Stock",
"name": "__common__",
"page_name": "stock-analytics", "page_name": "stock-analytics",
"standard": "Yes" "standard": "Yes",
"title": "Stock Analytics"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "stock-analytics", "parent": "stock-analytics",
"parentfield": "roles",
"parenttype": "Page"
},
{
"doctype": "Page",
"name": "stock-analytics"
},
{
"doctype": "Page Role", "doctype": "Page Role",
"parenttype": "Page", "role": "Analytics"
"parentfield": "roles"
}, },
{ {
"name": "stock-analytics", "doctype": "Page Role",
"doctype": "Page" "role": "Material Manager"
},
{
"role": "Analytics",
"doctype": "Page Role"
},
{
"role": "Material Manager",
"doctype": "Page Role"
} }
] ]

View File

@@ -1,36 +1,37 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-12-27 18:57:47", "creation": "2012-12-27 18:57:47",
"docstatus": 0,
"modified": "2013-07-11 14:44:15",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2013-01-09 17:16:51" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Stock Balance",
"doctype": "Page", "doctype": "Page",
"icon": "icon-table",
"module": "Stock", "module": "Stock",
"name": "__common__",
"page_name": "stock-balance",
"standard": "Yes", "standard": "Yes",
"page_name": "stock-balance" "title": "Stock Balance"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "stock-balance", "parent": "stock-balance",
"parentfield": "roles",
"parenttype": "Page"
},
{
"doctype": "Page",
"name": "stock-balance"
},
{
"doctype": "Page Role", "doctype": "Page Role",
"parenttype": "Page", "role": "Material Manager"
"parentfield": "roles"
}, },
{ {
"name": "stock-balance", "doctype": "Page Role",
"doctype": "Page" "role": "Analytics"
},
{
"role": "Material Manager",
"doctype": "Page Role"
},
{
"role": "Analytics",
"doctype": "Page Role"
} }
] ]

View File

@@ -1,21 +1,22 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-02-21 13:23:22", "creation": "2012-02-21 13:23:22",
"docstatus": 0,
"modified": "2013-07-11 14:44:17",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-02-21 13:23:22" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Stock Home",
"module": "Stock",
"doctype": "Page", "doctype": "Page",
"icon": "icon-th",
"module": "Stock",
"name": "__common__",
"page_name": "stock-home", "page_name": "stock-home",
"standard": "Yes" "standard": "Yes",
"title": "Stock Home"
}, },
{ {
"name": "stock-home", "doctype": "Page",
"doctype": "Page" "name": "stock-home"
} }
] ]

View File

@@ -1,40 +1,41 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-09-21 20:15:14", "creation": "2012-09-21 20:15:14",
"docstatus": 0,
"modified": "2013-07-11 14:44:19",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-10-04 17:25:35" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Stock Ledger",
"module": "Stock",
"doctype": "Page", "doctype": "Page",
"icon": "icon-table",
"module": "Stock",
"name": "__common__",
"page_name": "stock-ledger", "page_name": "stock-ledger",
"standard": "Yes" "standard": "Yes",
"title": "Stock Ledger"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "stock-ledger", "parent": "stock-ledger",
"parentfield": "roles",
"parenttype": "Page"
},
{
"doctype": "Page",
"name": "stock-ledger"
},
{
"doctype": "Page Role", "doctype": "Page Role",
"parenttype": "Page", "role": "Analytics"
"parentfield": "roles"
}, },
{ {
"name": "stock-ledger", "doctype": "Page Role",
"doctype": "Page" "role": "Material Manager"
}, },
{ {
"role": "Analytics", "doctype": "Page Role",
"doctype": "Page Role" "role": "Material User"
},
{
"role": "Material Manager",
"doctype": "Page Role"
},
{
"role": "Material User",
"doctype": "Page Role"
} }
] ]

View File

@@ -1,36 +1,37 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-12-31 10:52:14", "creation": "2012-12-31 10:52:14",
"docstatus": 0,
"modified": "2013-07-11 14:44:21",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2013-01-09 17:16:57" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Stock Level",
"doctype": "Page", "doctype": "Page",
"icon": "icon-table",
"module": "Stock", "module": "Stock",
"name": "__common__",
"page_name": "stock-level",
"standard": "Yes", "standard": "Yes",
"page_name": "stock-level" "title": "Stock Level"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "stock-level", "parent": "stock-level",
"parentfield": "roles",
"parenttype": "Page"
},
{
"doctype": "Page",
"name": "stock-level"
},
{
"doctype": "Page Role", "doctype": "Page Role",
"parenttype": "Page", "role": "Material Manager"
"parentfield": "roles"
}, },
{ {
"name": "stock-level", "doctype": "Page Role",
"doctype": "Page" "role": "Analytics"
},
{
"role": "Material Manager",
"doctype": "Page Role"
},
{
"role": "Analytics",
"doctype": "Page Role"
} }
] ]

View File

@@ -1,30 +1,31 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2013-01-04 15:31:45", "creation": "2013-01-04 15:31:45",
"docstatus": 0,
"modified": "2013-07-11 14:44:24",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2013-01-04 15:38:44" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Support Analytics",
"doctype": "Page", "doctype": "Page",
"icon": "icon-bar-chart",
"module": "Support", "module": "Support",
"name": "__common__",
"page_name": "support-analytics",
"standard": "Yes", "standard": "Yes",
"page_name": "support-analytics" "title": "Support Analytics"
}, },
{ {
"doctype": "Page Role",
"name": "__common__", "name": "__common__",
"parent": "support-analytics", "parent": "support-analytics",
"doctype": "Page Role", "parentfield": "roles",
"parenttype": "Page", "parenttype": "Page",
"role": "Support Team", "role": "Support Team"
"parentfield": "roles"
}, },
{ {
"name": "support-analytics", "doctype": "Page",
"doctype": "Page" "name": "support-analytics"
}, },
{ {
"doctype": "Page Role" "doctype": "Page Role"

View File

@@ -1,21 +1,22 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-02-21 13:23:35", "creation": "2012-02-21 13:23:35",
"docstatus": 0,
"modified": "2013-07-11 14:44:26",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-02-21 13:23:35" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Support Home",
"module": "Support",
"doctype": "Page", "doctype": "Page",
"icon": "icon-th",
"module": "Support",
"name": "__common__",
"page_name": "support-home", "page_name": "support-home",
"standard": "Yes" "standard": "Yes",
"title": "Support Home"
}, },
{ {
"name": "support-home", "doctype": "Page",
"doctype": "Page" "name": "support-home"
} }
] ]

View File

@@ -1,21 +1,22 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-08-07 12:35:30", "creation": "2012-08-07 12:35:30",
"docstatus": 0,
"modified": "2013-07-11 14:43:28",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-08-07 12:35:30" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Markdown Reference",
"module": "Utilities",
"doctype": "Page", "doctype": "Page",
"icon": "icon-code",
"module": "Utilities",
"name": "__common__",
"page_name": "Markdown Reference", "page_name": "Markdown Reference",
"standard": "Yes" "standard": "Yes",
"title": "Markdown Reference"
}, },
{ {
"name": "markdown-reference", "doctype": "Page",
"doctype": "Page" "name": "markdown-reference"
} }
] ]

View File

@@ -18,6 +18,19 @@ img {
padding-bottom: 30px; padding-bottom: 30px;
} }
.outer {
padding: 0px 20px;
}
.navbar {
margin: 0px -20px;
}
.banner {
margin-top: 20px;
padding: 0px 20px;
}
.missing-image { .missing-image {
background-color: #eee; background-color: #eee;
padding: 40px; padding: 40px;
@@ -42,7 +55,6 @@ img {
} }
div.web-footer { div.web-footer {
border-top: 1px solid #dddddd;
padding-top: 10px; padding-top: 10px;
} }

View File

@@ -29,7 +29,7 @@ body {
{% endif %} {% endif %}
div.outer { div.outer {
background-color: #{{ doc.page_background or "fffffff" }}; background-color: #{{ doc.page_background }};
} }
{% if doc.google_web_font_for_heading or doc.heading_font %}h1, h2, h3, h4, h5 { {% if doc.google_web_font_for_heading or doc.heading_font %}h1, h2, h3, h4, h5 {
@@ -52,9 +52,9 @@ div.outer {
-webkibox-shadow: 0 0 8px rgba(0, 0, 0, 0.2); -webkibox-shadow: 0 0 8px rgba(0, 0, 0, 0.2);
} }
{% else %} {% else %}
{% if doc.background_color == doc.page_background %} {% if doc.background_color.lower() == doc.page_background.lower() %}
div.web-footer { div.web-footer {
border-top: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }}; border-top: 1px solid #{{ get_hex_shade(doc.page_background, 15) }};
padding-top: 10px; padding-top: 10px;
} }
{% endif %} {% endif %}
@@ -62,60 +62,55 @@ div.web-footer {
div.web-footer, div.web-footer a { div.web-footer, div.web-footer a {
font-size: 90%; font-size: 90%;
color: #{{ get_hex_shade(doc.background_color or "ffffff", 70) }}; color: #{{ get_hex_shade(doc.background_color, 70) }};
} }
/* Bootstrap Navbar */ /* Bootstrap Navbar */
.navbar-inverse { .navbar {
box-shadow: none; box-shadow: none;
border-radius: 0px; border-radius: 0px;
background-color: #{{ doc.top_bar_background or "444444"}}; background-color: #{{ doc.top_bar_background}};
background-repeat: repeat-x; background-repeat: repeat-x;
background-image: none; background-image: none;
border-bottom: 1px solid {% if doc.top_bar_background == doc.page_background -%} border-bottom: 1px solid {% if doc.top_bar_background.lower() == doc.page_background.lower() -%}
#{{ get_hex_shade(doc.page_background or "ffffff", 15) }}; #{{ get_hex_shade(doc.page_background, 15) }};
{%- else -%} {%- else -%}
transparent; transparent;
{%- endif %} {%- endif %}
} }
.navbar-inverse .navbar-brand, .navbar .navbar-brand,
.navbar-inverse .navbar-brand:hover, .navbar .navbar-brand:hover,
.navbar-inverse .navbar-brand:focus, .navbar .navbar-brand:focus,
.navbar-inverse .nav > li > a { .navbar .nav > li > a {
color: #{{ doc.top_bar_foreground or "fffffff"}}; color: #{{ doc.top_bar_foreground }};
text-shadow: none; text-shadow: none;
} }
.navbar-inverse .nav > li > a:hover, .navbar .nav > li > a:hover,
.navbar-inverse .nav > li > a:focus { .navbar .nav > li > a:focus {
color: #{{ doc.top_bar_background or "0000000"}}; color: #{{ doc.top_bar_foreground }};
}
.navbar-inverse .navbar-text {
color: #999999;
}
.navbar-inverse .nav > li > a:focus,
.navbar-inverse .nav > li > a:hover {
color: #{{ doc.top_bar_foreground or "fffffff"}};
background-color: transparent; background-color: transparent;
} }
.navbar-inverse .nav .active > a, .navbar .navbar-text {
.navbar-inverse .nav .active > a:hover,
.navbar-inverse .nav .active > a:focus {
color: #{{ doc.top_bar_foreground or "fffffff"}};
background-color: transparent;
}
.navbar-inverse .navbar-link {
color: #999999; color: #999999;
} }
.navbar-inverse .navbar-link:hover, .navbar .nav .active > a,
.navbar-inverse .navbar-link:focus { .navbar .nav .active > a:hover,
color: #{{ doc.top_bar_foreground or "fffffff"}}; .navbar .nav .active > a:focus {
color: #{{ doc.top_bar_foreground }};
background-color: transparent;
}
.navbar .navbar-link {
color: #444444;
}
.navbar .navbar-link:hover,
.navbar .navbar-link:focus {
color: #{{ doc.top_bar_foreground}};
} }
.navbar-fixed-top, .navbar-fixed-top,
@@ -136,55 +131,55 @@ div.web-footer, div.web-footer a {
box-shadow: none; box-shadow: none;
} }
.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret, .navbar .nav li.dropdown > .dropdown-toggle .caret,
.navbar-inverse .nav li.dropdown > .dropdown-toggle:hover .caret { .navbar .nav li.dropdown > .dropdown-toggle:hover .caret {
border-top-color: #{{ doc.top_bar_foreground or "fffffff"}}; border-top-color: #{{ doc.top_bar_foreground}};
border-bottom-color: #{{ doc.top_bar_foreground or "fffffff"}}; border-bottom-color: #{{ doc.top_bar_foreground}};
} }
.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, .navbar .nav li.dropdown.open > .dropdown-toggle .caret,
.navbar-inverse .nav li.dropdown.open > .dropdown-toggle:hover .caret { .navbar .nav li.dropdown.open > .dropdown-toggle:hover .caret {
border-top-color: #{{ doc.top_bar_background or "0000000"}}; border-top-color: #{{ doc.top_bar_background}};
border-bottom-color: #{{ doc.top_bar_background or "0000000"}}; border-bottom-color: #{{ doc.top_bar_background}};
} }
.navbar-inverse .nav li.dropdown.open > .dropdown-toggle { .navbar .nav li.dropdown.open > .dropdown-toggle {
color: #{{ doc.top_bar_background or "0000000"}}; color: #{{ doc.top_bar_background}};
background-color: #{{ doc.top_bar_foreground or "fffffff"}}; background-color: #{{ doc.top_bar_foreground}};
} }
@media (max-width: 800px) { @media (max-width: 800px) {
.navbar-inverse .nav-collapse .nav > li > a, .navbar .nav-collapse .nav > li > a,
.navbar-inverse .nav-collapse .dropdown-menu a { .navbar .nav-collapse .dropdown-menu a {
background-color: #{{ doc.top_bar_background or "0000000"}}; background-color: #{{ doc.top_bar_background}};
color: #{{ doc.top_bar_foreground or "fffffff"}}; color: #{{ doc.top_bar_foreground}};
} }
.navbar-inverse .nav-collapse .nav > li > a:hover, .navbar .nav-collapse .nav > li > a:hover,
.navbar-inverse .nav-collapse .dropdown-menu a:hover { .navbar .nav-collapse .dropdown-menu a:hover {
background-color: #{{ doc.top_bar_foreground or "fffffff"}}; background-color: #{{ doc.top_bar_foreground}};
color: #{{ doc.top_bar_background or "0000000"}}; color: #{{ doc.top_bar_background}};
} }
.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { .navbar .nav li.dropdown > .dropdown-toggle .caret {
border-top-color: #{{ doc.top_bar_foreground or "fffffff" }}; border-top-color: #{{ doc.top_bar_foreground }};
border-bottom-color: #{{ doc.top_bar_foreground or "fffffff" }}; border-bottom-color: #{{ doc.top_bar_foreground }};
} }
.navbar-inverse .nav li.dropdown > .dropdown-toggle:hover .caret { .navbar .nav li.dropdown > .dropdown-toggle:hover .caret {
border-top-color: #{{ doc.top_bar_background or "0000000" }}; border-top-color: #{{ doc.top_bar_background }};
border-bottom-color: #{{ doc.top_bar_background or "0000000" }}; border-bottom-color: #{{ doc.top_bar_background }};
} }
.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, .navbar .nav li.dropdown.open > .dropdown-toggle .caret,
.navbar-inverse .nav li.dropdown.open > .dropdown-toggle:hover .caret { .navbar .nav li.dropdown.open > .dropdown-toggle:hover .caret {
border-top-color: #{{ doc.top_bar_background or "0000000" }}; border-top-color: #{{ doc.top_bar_background }};
border-bottom-color: #{{ doc.top_bar_background or "0000000" }}; border-bottom-color: #{{ doc.top_bar_background }};
} }
} }
.breadcrumb { .breadcrumb {
background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 10) }}; background-color: #{{ get_hex_shade(doc.page_background, 10) }};
} }
.breadcrumb > li { .breadcrumb > li {
@@ -194,39 +189,39 @@ div.web-footer, div.web-footer a {
.table-striped tbody > tr:nth-child(odd) > td, .table-striped tbody > tr:nth-child(odd) > td,
.table-striped tbody > tr:nth-child(odd) > th { .table-striped tbody > tr:nth-child(odd) > th {
background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 5) }}; background-color: #{{ get_hex_shade(doc.page_background, 5) }};
} }
.table-hover tbody tr:hover td, .table-hover tbody tr:hover td,
.table-hover tbody tr:hover th { .table-hover tbody tr:hover th {
background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 10) }}; background-color: #{{ get_hex_shade(doc.page_background, 10) }};
} }
.table-bordered { .table-bordered {
border: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }}; border: 1px solid #{{ get_hex_shade(doc.page_background, 15) }};
} }
.table th, .table th,
.table td { .table td {
border-top: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }}; border-top: 1px solid #{{ get_hex_shade(doc.page_background, 15) }};
} }
.table-bordered th, .table-bordered th,
.table-bordered td { .table-bordered td {
border-left: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }}; border-left: 1px solid #{{ get_hex_shade(doc.page_background, 15) }};
} }
.hero-unit { .hero-unit {
background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 15) }}; background-color: #{{ get_hex_shade(doc.page_background, 15) }};
} }
pre, code { pre, code {
background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 5) }}; background-color: #{{ get_hex_shade(doc.page_background, 5) }};
} }
hr { hr {
border-top: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }}; border-top: 1px solid #{{ get_hex_shade(doc.page_background, 15) }};
border-bottom: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 5) }}; border-bottom: 1px solid #{{ get_hex_shade(doc.page_background, 5) }};
} }

View File

@@ -30,6 +30,19 @@ class DocType:
from webnotes.webutils import get_hex_shade from webnotes.webutils import get_hex_shade
import os import os
default_colours = {
"background_color": "FFFFFF",
"page_background": "FFFFFF",
"top_bar_background": "FFFFFF",
"top_bar_foreground": "444444",
"page_headings": "222222",
"page_text": "000000"
}
for d in default_colours:
if not self.doc.fields.get(d):
self.doc.fields[d] = default_colours[d]
self.validate_colors() self.validate_colors()
with open(os.path.join( with open(os.path.join(

View File

@@ -1,21 +1,22 @@
[ [
{ {
"owner": "Administrator",
"docstatus": 0,
"creation": "2012-02-21 13:23:51", "creation": "2012-02-21 13:23:51",
"docstatus": 0,
"modified": "2013-07-11 14:45:29",
"modified_by": "Administrator", "modified_by": "Administrator",
"modified": "2012-02-21 13:23:51" "owner": "Administrator"
}, },
{ {
"name": "__common__",
"title": "Website Home",
"module": "Website",
"doctype": "Page", "doctype": "Page",
"icon": "icon-th",
"module": "Website",
"name": "__common__",
"page_name": "website-home", "page_name": "website-home",
"standard": "Yes" "standard": "Yes",
"title": "Website Home"
}, },
{ {
"name": "website-home", "doctype": "Page",
"doctype": "Page" "name": "website-home"
} }
] ]

View File

@@ -1,4 +1,4 @@
<div class="navbar" style="margin: 0px -15px"> <div class="navbar">
{%- if brand_html %}<a class="navbar-brand" href="index">{{ brand_html }}</a>{% endif -%} {%- if brand_html %}<a class="navbar-brand" href="index">{{ brand_html }}</a>{% endif -%}
<div class="container"> <div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" <button type="button" class="navbar-toggle" data-toggle="collapse"

View File

@@ -17,7 +17,7 @@
<a href="server.py?cmd=web_logout" title="Sign Out"><i class="icon-signout"></i></a> <a href="server.py?cmd=web_logout" title="Sign Out"><i class="icon-signout"></i></a>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
{% if banner_html %}<div class="row" style="margin-top: 30px;"> {% if banner_html %}<div class="row banner">
<div class="col col-lg-12">{{ banner_html }}</div> <div class="col col-lg-12">{{ banner_html }}</div>
</div>{% endif %} </div>{% endif %}
<div class="outer"> <div class="outer">