From df92a553cb53006b7e636fbdf7f72e9a17d55bac Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 11 Jul 2013 14:50:43 +0530 Subject: [PATCH 1/3] [style] Added Icons to Pages --- .../accounts_browser/accounts_browser.txt | 37 ++++++------ accounts/page/accounts_home/accounts_home.txt | 19 ++++--- .../financial_analytics.txt | 3 +- .../financial_statements.txt | 3 +- .../page/general_ledger/general_ledger.txt | 43 +++++++------- accounts/page/trial_balance/trial_balance.txt | 3 +- .../voucher_import_tool.txt | 35 ++++++------ buying/page/buying_home/buying_home.txt | 19 ++++--- .../purchase_analytics/purchase_analytics.txt | 39 ++++++------- home/page/activity/activity.txt | 3 +- home/page/attributions/attributions.txt | 19 ++++--- home/page/latest_updates/latest_updates.txt | 23 ++++---- hr/page/hr_home/hr_home.txt | 19 ++++--- .../manufacturing_home/manufacturing_home.txt | 19 ++++--- patches/patch_list.py | 2 +- projects/page/projects_home/projects_home.txt | 19 ++++--- .../page/sales_analytics/sales_analytics.txt | 43 +++++++------- selling/page/sales_browser/sales_browser.txt | 57 ++++++++++--------- selling/page/selling_home/selling_home.txt | 35 ++++++------ setup/page/setup/setup.txt | 33 +++++------ stock/page/stock_ageing/stock_ageing.txt | 39 ++++++------- .../page/stock_analytics/stock_analytics.txt | 39 ++++++------- stock/page/stock_balance/stock_balance.txt | 37 ++++++------ stock/page/stock_home/stock_home.txt | 19 ++++--- stock/page/stock_ledger/stock_ledger.txt | 43 +++++++------- stock/page/stock_level/stock_level.txt | 37 ++++++------ .../support_analytics/support_analytics.txt | 23 ++++---- support/page/support_home/support_home.txt | 19 ++++--- .../markdown_reference/markdown_reference.txt | 19 ++++--- website/page/website_home/website_home.txt | 19 ++++--- 30 files changed, 398 insertions(+), 369 deletions(-) diff --git a/accounts/page/accounts_browser/accounts_browser.txt b/accounts/page/accounts_browser/accounts_browser.txt index 35a345ba8e..e83759c44e 100644 --- a/accounts/page/accounts_browser/accounts_browser.txt +++ b/accounts/page/accounts_browser/accounts_browser.txt @@ -1,35 +1,36 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-06-14 15:07:28", + "docstatus": 0, + "modified": "2013-07-11 14:39:42", "modified_by": "Administrator", - "modified": "2012-10-04 16:57:27" + "owner": "Administrator" }, { - "name": "__common__", - "module": "Accounts", - "page_name": "Accounts Browser", "doctype": "Page", + "icon": "icon-sitemap", + "module": "Accounts", + "name": "__common__", + "page_name": "Accounts Browser", "standard": "Yes" }, { + "doctype": "Page Role", "name": "__common__", "parent": "Accounts Browser", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "Accounts Browser" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Accounts User" }, { - "name": "Accounts Browser", - "doctype": "Page" - }, - { - "role": "Accounts User", - "doctype": "Page Role" - }, - { - "role": "Accounts Manager", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Accounts Manager" } ] \ No newline at end of file diff --git a/accounts/page/accounts_home/accounts_home.txt b/accounts/page/accounts_home/accounts_home.txt index 6000241e27..3753617339 100644 --- a/accounts/page/accounts_home/accounts_home.txt +++ b/accounts/page/accounts_home/accounts_home.txt @@ -1,21 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-06-14 15:07:28", + "docstatus": 0, + "modified": "2013-07-11 14:40:16", "modified_by": "Administrator", - "modified": "2012-10-05 16:30:46" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Accounts Home", - "module": "Accounts", "doctype": "Page", + "icon": "icon-th", + "module": "Accounts", + "name": "__common__", "page_name": "accounts-home", - "standard": "Yes" + "standard": "Yes", + "title": "Accounts Home" }, { - "name": "accounts-home", - "doctype": "Page" + "doctype": "Page", + "name": "accounts-home" } ] \ No newline at end of file diff --git a/accounts/page/financial_analytics/financial_analytics.txt b/accounts/page/financial_analytics/financial_analytics.txt index 499320077f..94a9b8e1bf 100644 --- a/accounts/page/financial_analytics/financial_analytics.txt +++ b/accounts/page/financial_analytics/financial_analytics.txt @@ -2,12 +2,13 @@ { "creation": "2013-01-27 16:30:52", "docstatus": 0, - "modified": "2013-01-29 13:11:00", + "modified": "2013-07-11 14:42:16", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "Page", + "icon": "icon-bar-chart", "module": "Accounts", "name": "__common__", "page_name": "financial-analytics", diff --git a/accounts/page/financial_statements/financial_statements.txt b/accounts/page/financial_statements/financial_statements.txt index b8226d0b24..78c2c308e2 100644 --- a/accounts/page/financial_statements/financial_statements.txt +++ b/accounts/page/financial_statements/financial_statements.txt @@ -2,12 +2,13 @@ { "creation": "2013-01-27 16:30:52", "docstatus": 0, - "modified": "2013-01-29 13:11:17", + "modified": "2013-07-11 14:41:59", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "Page", + "icon": "icon-money", "module": "Accounts", "name": "__common__", "page_name": "Financial Statements", diff --git a/accounts/page/general_ledger/general_ledger.txt b/accounts/page/general_ledger/general_ledger.txt index 94b93e20c4..2cc8a601e9 100644 --- a/accounts/page/general_ledger/general_ledger.txt +++ b/accounts/page/general_ledger/general_ledger.txt @@ -1,40 +1,41 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-09-14 11:25:48", + "docstatus": 0, + "modified": "2013-07-11 14:42:21", "modified_by": "Administrator", - "modified": "2012-10-04 17:00:09" + "owner": "Administrator" }, { - "name": "__common__", - "title": "General Ledger", - "module": "Accounts", "doctype": "Page", + "icon": "icon-table", + "module": "Accounts", + "name": "__common__", "page_name": "general-ledger", - "standard": "Yes" + "standard": "Yes", + "title": "General Ledger" }, { + "doctype": "Page Role", "name": "__common__", "parent": "general-ledger", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "general-ledger" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Analytics" }, { - "name": "general-ledger", - "doctype": "Page" + "doctype": "Page Role", + "role": "Accounts Manager" }, { - "role": "Analytics", - "doctype": "Page Role" - }, - { - "role": "Accounts Manager", - "doctype": "Page Role" - }, - { - "role": "Accounts User", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Accounts User" } ] \ No newline at end of file diff --git a/accounts/page/trial_balance/trial_balance.txt b/accounts/page/trial_balance/trial_balance.txt index 7c8560160f..f65146c8b2 100644 --- a/accounts/page/trial_balance/trial_balance.txt +++ b/accounts/page/trial_balance/trial_balance.txt @@ -2,12 +2,13 @@ { "creation": "2013-01-27 16:30:52", "docstatus": 0, - "modified": "2013-01-29 13:11:43", + "modified": "2013-07-11 14:44:49", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "Page", + "icon": "icon-table", "module": "Accounts", "name": "__common__", "page_name": "trial-balance", diff --git a/accounts/page/voucher_import_tool/voucher_import_tool.txt b/accounts/page/voucher_import_tool/voucher_import_tool.txt index 8e5ad0b7f0..187ee58430 100644 --- a/accounts/page/voucher_import_tool/voucher_import_tool.txt +++ b/accounts/page/voucher_import_tool/voucher_import_tool.txt @@ -1,30 +1,31 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-10-02 18:51:49", + "docstatus": 0, + "modified": "2013-07-11 14:45:25", "modified_by": "Administrator", - "modified": "2012-10-04 17:04:18" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Voucher Import Tool", - "module": "Accounts", "doctype": "Page", - "page_name": "voucher-import-tool", - "standard": "Yes" - }, - { - "parent": "voucher-import-tool", + "icon": "icon-upload", + "module": "Accounts", "name": "__common__", - "doctype": "Page Role", - "parenttype": "Page", - "role": "Accounts Manager", - "parentfield": "roles" + "page_name": "voucher-import-tool", + "standard": "Yes", + "title": "Voucher Import Tool" }, { - "name": "voucher-import-tool", - "doctype": "Page" + "doctype": "Page Role", + "name": "__common__", + "parent": "voucher-import-tool", + "parentfield": "roles", + "parenttype": "Page", + "role": "Accounts Manager" + }, + { + "doctype": "Page", + "name": "voucher-import-tool" }, { "doctype": "Page Role" diff --git a/buying/page/buying_home/buying_home.txt b/buying/page/buying_home/buying_home.txt index 96a67f8cf3..49a782fff8 100644 --- a/buying/page/buying_home/buying_home.txt +++ b/buying/page/buying_home/buying_home.txt @@ -1,21 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-02-21 13:22:54", + "docstatus": 0, + "modified": "2013-07-11 14:41:50", "modified_by": "Administrator", - "modified": "2012-02-21 13:22:54" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Buying Home", - "module": "Buying", "doctype": "Page", + "icon": "icon-th", + "module": "Buying", + "name": "__common__", "page_name": "buying-home", - "standard": "Yes" + "standard": "Yes", + "title": "Buying Home" }, { - "name": "buying-home", - "doctype": "Page" + "doctype": "Page", + "name": "buying-home" } ] \ No newline at end of file diff --git a/buying/page/purchase_analytics/purchase_analytics.txt b/buying/page/purchase_analytics/purchase_analytics.txt index 0368b8f8c3..34ba8e1a8b 100644 --- a/buying/page/purchase_analytics/purchase_analytics.txt +++ b/buying/page/purchase_analytics/purchase_analytics.txt @@ -1,36 +1,37 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-09-21 20:15:16", + "docstatus": 0, + "modified": "2013-07-11 14:43:52", "modified_by": "Administrator", - "modified": "2012-10-04 17:24:17" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Purchase Analytics", - "module": "Buying", "doctype": "Page", + "icon": "icon-bar-chart", + "module": "Buying", + "name": "__common__", "page_name": "purchase-analytics", - "standard": "Yes" + "standard": "Yes", + "title": "Purchase Analytics" }, { + "doctype": "Page Role", "name": "__common__", "parent": "purchase-analytics", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "purchase-analytics" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Analytics" }, { - "name": "purchase-analytics", - "doctype": "Page" - }, - { - "role": "Analytics", - "doctype": "Page Role" - }, - { - "role": "Purchase Manager", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Purchase Manager" } ] \ No newline at end of file diff --git a/home/page/activity/activity.txt b/home/page/activity/activity.txt index f00fac1f46..7c9783dbea 100644 --- a/home/page/activity/activity.txt +++ b/home/page/activity/activity.txt @@ -2,12 +2,13 @@ { "creation": "2013-04-09 11:45:31", "docstatus": 0, - "modified": "2013-04-09 11:47:32", + "modified": "2013-07-11 14:40:20", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "Page", + "icon": "icon-play", "module": "Home", "name": "__common__", "page_name": "activity", diff --git a/home/page/attributions/attributions.txt b/home/page/attributions/attributions.txt index aea8fbb827..547d9bc59c 100644 --- a/home/page/attributions/attributions.txt +++ b/home/page/attributions/attributions.txt @@ -1,21 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-03-01 12:30:42", + "docstatus": 0, + "modified": "2013-07-11 14:41:47", "modified_by": "Administrator", - "modified": "2012-03-01 12:30:42" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Attributions", - "module": "Home", "doctype": "Page", + "icon": "icon-trophy", + "module": "Home", + "name": "__common__", "page_name": "attributions", - "standard": "Yes" + "standard": "Yes", + "title": "Attributions" }, { - "name": "attributions", - "doctype": "Page" + "doctype": "Page", + "name": "attributions" } ] \ No newline at end of file diff --git a/home/page/latest_updates/latest_updates.txt b/home/page/latest_updates/latest_updates.txt index 7f44e7f978..db22b70a21 100644 --- a/home/page/latest_updates/latest_updates.txt +++ b/home/page/latest_updates/latest_updates.txt @@ -1,30 +1,31 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-11-19 12:06:54", + "docstatus": 0, + "modified": "2013-07-11 14:43:20", "modified_by": "Administrator", - "modified": "2012-11-23 18:03:48" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Latest Updates", "doctype": "Page", + "icon": "icon-asterisk", "module": "Home", + "name": "__common__", + "page_name": "latest-updates", "standard": "Yes", - "page_name": "latest-updates" + "title": "Latest Updates" }, { + "doctype": "Page Role", "name": "__common__", "parent": "latest-updates", - "doctype": "Page Role", + "parentfield": "roles", "parenttype": "Page", - "role": "All", - "parentfield": "roles" + "role": "All" }, { - "name": "latest-updates", - "doctype": "Page" + "doctype": "Page", + "name": "latest-updates" }, { "doctype": "Page Role" diff --git a/hr/page/hr_home/hr_home.txt b/hr/page/hr_home/hr_home.txt index e58fa6ff58..3d53582955 100644 --- a/hr/page/hr_home/hr_home.txt +++ b/hr/page/hr_home/hr_home.txt @@ -1,21 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-02-21 13:24:05", + "docstatus": 0, + "modified": "2013-07-11 14:42:23", "modified_by": "Administrator", - "modified": "2012-02-21 13:24:05" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Human Resources Home", - "module": "HR", "doctype": "Page", + "icon": "icon-th", + "module": "HR", + "name": "__common__", "page_name": "hr-home", - "standard": "Yes" + "standard": "Yes", + "title": "Human Resources Home" }, { - "name": "hr-home", - "doctype": "Page" + "doctype": "Page", + "name": "hr-home" } ] \ No newline at end of file diff --git a/manufacturing/page/manufacturing_home/manufacturing_home.txt b/manufacturing/page/manufacturing_home/manufacturing_home.txt index 7fdbd6a627..5a946f3fc6 100644 --- a/manufacturing/page/manufacturing_home/manufacturing_home.txt +++ b/manufacturing/page/manufacturing_home/manufacturing_home.txt @@ -1,21 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-02-21 13:24:34", + "docstatus": 0, + "modified": "2013-07-11 14:43:23", "modified_by": "Administrator", - "modified": "2012-12-10 18:30:00" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Manufacturing Home", - "module": "Manufacturing", "doctype": "Page", + "icon": "icon-th", + "module": "Manufacturing", + "name": "__common__", "page_name": "manufacturing-home", - "standard": "Yes" + "standard": "Yes", + "title": "Manufacturing Home" }, { - "name": "manufacturing-home", - "doctype": "Page" + "doctype": "Page", + "name": "manufacturing-home" } ] \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index 032297f12d..80e3102cd1 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -20,7 +20,7 @@ patch_list = [ "execute:webnotes.reload_doc('core', 'doctype', 'docperm') # 2013-04-07", "execute:webnotes.reload_doc('core', 'doctype', 'report')", "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.april_2012.naming_series_patch", "patches.mar_2012.cleanup_control_panel", diff --git a/projects/page/projects_home/projects_home.txt b/projects/page/projects_home/projects_home.txt index 41161499db..d944156cd3 100644 --- a/projects/page/projects_home/projects_home.txt +++ b/projects/page/projects_home/projects_home.txt @@ -1,21 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-02-21 13:24:22", + "docstatus": 0, + "modified": "2013-07-11 14:43:49", "modified_by": "Administrator", - "modified": "2012-02-21 13:24:22" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Projects Home", - "module": "Projects", "doctype": "Page", + "icon": "icon-th", + "module": "Projects", + "name": "__common__", "page_name": "projects-home", - "standard": "Yes" + "standard": "Yes", + "title": "Projects Home" }, { - "name": "projects-home", - "doctype": "Page" + "doctype": "Page", + "name": "projects-home" } ] \ No newline at end of file diff --git a/selling/page/sales_analytics/sales_analytics.txt b/selling/page/sales_analytics/sales_analytics.txt index 3e773e45e4..8753be6b28 100644 --- a/selling/page/sales_analytics/sales_analytics.txt +++ b/selling/page/sales_analytics/sales_analytics.txt @@ -1,40 +1,41 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-09-21 20:15:12", + "docstatus": 0, + "modified": "2013-07-11 14:43:59", "modified_by": "Administrator", - "modified": "2012-10-04 17:17:39" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Sales Analytics", - "module": "Selling", "doctype": "Page", + "icon": "icon-bar-chart", + "module": "Selling", + "name": "__common__", "page_name": "sales-analytics", - "standard": "Yes" + "standard": "Yes", + "title": "Sales Analytics" }, { + "doctype": "Page Role", "name": "__common__", "parent": "sales-analytics", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "sales-analytics" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Analytics" }, { - "name": "sales-analytics", - "doctype": "Page" + "doctype": "Page Role", + "role": "Sales Manager" }, { - "role": "Analytics", - "doctype": "Page Role" - }, - { - "role": "Sales Manager", - "doctype": "Page Role" - }, - { - "role": "Maintenance Manager", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Maintenance Manager" } ] \ No newline at end of file diff --git a/selling/page/sales_browser/sales_browser.txt b/selling/page/sales_browser/sales_browser.txt index 4b9eecf3cd..5a047e27de 100644 --- a/selling/page/sales_browser/sales_browser.txt +++ b/selling/page/sales_browser/sales_browser.txt @@ -1,55 +1,56 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-06-14 15:07:26", + "docstatus": 0, + "modified": "2013-07-11 14:43:56", "modified_by": "Administrator", - "modified": "2012-10-04 17:34:55" + "owner": "Administrator" }, { - "name": "__common__", - "module": "Selling", - "page_name": "Sales Browser", "doctype": "Page", + "icon": "icon-sitemap", + "module": "Selling", + "name": "__common__", + "page_name": "Sales Browser", "standard": "Yes" }, { + "doctype": "Page Role", "name": "__common__", "parent": "Sales Browser", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "Sales Browser" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Sales Master Manager" }, { - "name": "Sales Browser", - "doctype": "Page" + "doctype": "Page Role", + "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" - }, - { - "role": "Purchase Master Manager", - "doctype": "Page Role" - }, - { - "role": "Material Manager", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Material Manager" } ] \ No newline at end of file diff --git a/selling/page/selling_home/selling_home.txt b/selling/page/selling_home/selling_home.txt index 9dc3c98656..9cff04d8d9 100644 --- a/selling/page/selling_home/selling_home.txt +++ b/selling/page/selling_home/selling_home.txt @@ -1,30 +1,31 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-02-20 15:46:39", + "docstatus": 0, + "modified": "2013-07-11 14:44:01", "modified_by": "Administrator", - "modified": "2012-02-20 15:46:57" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Selling Home", - "module": "Selling", "doctype": "Page", - "page_name": "selling-home", - "standard": "Yes" - }, - { - "parent": "selling-home", + "icon": "icon-th", + "module": "Selling", "name": "__common__", - "doctype": "Page Role", - "parenttype": "Page", - "role": "All", - "parentfield": "roles" + "page_name": "selling-home", + "standard": "Yes", + "title": "Selling Home" }, { - "name": "selling-home", - "doctype": "Page" + "doctype": "Page Role", + "name": "__common__", + "parent": "selling-home", + "parentfield": "roles", + "parenttype": "Page", + "role": "All" + }, + { + "doctype": "Page", + "name": "selling-home" }, { "doctype": "Page Role" diff --git a/setup/page/setup/setup.txt b/setup/page/setup/setup.txt index b3790d570e..723a9018f6 100644 --- a/setup/page/setup/setup.txt +++ b/setup/page/setup/setup.txt @@ -1,29 +1,30 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-06-14 15:07:28", + "docstatus": 0, + "modified": "2013-07-11 14:44:04", "modified_by": "Administrator", - "modified": "2012-10-04 16:52:41" + "owner": "Administrator" }, { - "name": "__common__", + "doctype": "Page", + "icon": "icon-cog", "module": "Setup", - "standard": "Yes", - "page_name": "Setup", - "doctype": "Page" - }, - { - "parent": "Setup", "name": "__common__", - "doctype": "Page Role", - "parenttype": "Page", - "role": "System Manager", - "parentfield": "roles" + "page_name": "Setup", + "standard": "Yes" }, { - "name": "Setup", - "doctype": "Page" + "doctype": "Page Role", + "name": "__common__", + "parent": "Setup", + "parentfield": "roles", + "parenttype": "Page", + "role": "System Manager" + }, + { + "doctype": "Page", + "name": "Setup" }, { "doctype": "Page Role" diff --git a/stock/page/stock_ageing/stock_ageing.txt b/stock/page/stock_ageing/stock_ageing.txt index fb9fc373bb..cd1cfbd1c9 100644 --- a/stock/page/stock_ageing/stock_ageing.txt +++ b/stock/page/stock_ageing/stock_ageing.txt @@ -1,36 +1,37 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-09-21 20:15:14", + "docstatus": 0, + "modified": "2013-07-11 14:44:08", "modified_by": "Administrator", - "modified": "2012-10-04 17:34:24" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Stock Ageing", - "module": "Stock", "doctype": "Page", + "icon": "icon-table", + "module": "Stock", + "name": "__common__", "page_name": "stock-ageing", - "standard": "Yes" + "standard": "Yes", + "title": "Stock Ageing" }, { + "doctype": "Page Role", "name": "__common__", "parent": "stock-ageing", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "stock-ageing" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Analytics" }, { - "name": "stock-ageing", - "doctype": "Page" - }, - { - "role": "Analytics", - "doctype": "Page Role" - }, - { - "role": "Material Manager", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Material Manager" } ] \ No newline at end of file diff --git a/stock/page/stock_analytics/stock_analytics.txt b/stock/page/stock_analytics/stock_analytics.txt index 0310bc840f..140b1024f7 100644 --- a/stock/page/stock_analytics/stock_analytics.txt +++ b/stock/page/stock_analytics/stock_analytics.txt @@ -1,36 +1,37 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-09-21 20:15:14", + "docstatus": 0, + "modified": "2013-07-11 14:44:10", "modified_by": "Administrator", - "modified": "2012-10-04 17:32:20" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Stock Analytics", - "module": "Stock", "doctype": "Page", + "icon": "icon-bar-chart", + "module": "Stock", + "name": "__common__", "page_name": "stock-analytics", - "standard": "Yes" + "standard": "Yes", + "title": "Stock Analytics" }, { + "doctype": "Page Role", "name": "__common__", "parent": "stock-analytics", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "stock-analytics" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Analytics" }, { - "name": "stock-analytics", - "doctype": "Page" - }, - { - "role": "Analytics", - "doctype": "Page Role" - }, - { - "role": "Material Manager", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Material Manager" } ] \ No newline at end of file diff --git a/stock/page/stock_balance/stock_balance.txt b/stock/page/stock_balance/stock_balance.txt index 24fffc2065..536448c072 100644 --- a/stock/page/stock_balance/stock_balance.txt +++ b/stock/page/stock_balance/stock_balance.txt @@ -1,36 +1,37 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-12-27 18:57:47", + "docstatus": 0, + "modified": "2013-07-11 14:44:15", "modified_by": "Administrator", - "modified": "2013-01-09 17:16:51" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Stock Balance", "doctype": "Page", + "icon": "icon-table", "module": "Stock", + "name": "__common__", + "page_name": "stock-balance", "standard": "Yes", - "page_name": "stock-balance" + "title": "Stock Balance" }, { + "doctype": "Page Role", "name": "__common__", "parent": "stock-balance", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "stock-balance" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Material Manager" }, { - "name": "stock-balance", - "doctype": "Page" - }, - { - "role": "Material Manager", - "doctype": "Page Role" - }, - { - "role": "Analytics", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Analytics" } ] \ No newline at end of file diff --git a/stock/page/stock_home/stock_home.txt b/stock/page/stock_home/stock_home.txt index ea6cf26598..81e78bb041 100644 --- a/stock/page/stock_home/stock_home.txt +++ b/stock/page/stock_home/stock_home.txt @@ -1,21 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-02-21 13:23:22", + "docstatus": 0, + "modified": "2013-07-11 14:44:17", "modified_by": "Administrator", - "modified": "2012-02-21 13:23:22" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Stock Home", - "module": "Stock", "doctype": "Page", + "icon": "icon-th", + "module": "Stock", + "name": "__common__", "page_name": "stock-home", - "standard": "Yes" + "standard": "Yes", + "title": "Stock Home" }, { - "name": "stock-home", - "doctype": "Page" + "doctype": "Page", + "name": "stock-home" } ] \ No newline at end of file diff --git a/stock/page/stock_ledger/stock_ledger.txt b/stock/page/stock_ledger/stock_ledger.txt index 4eeae8b9f7..9c2a4b75e5 100644 --- a/stock/page/stock_ledger/stock_ledger.txt +++ b/stock/page/stock_ledger/stock_ledger.txt @@ -1,40 +1,41 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-09-21 20:15:14", + "docstatus": 0, + "modified": "2013-07-11 14:44:19", "modified_by": "Administrator", - "modified": "2012-10-04 17:25:35" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Stock Ledger", - "module": "Stock", "doctype": "Page", + "icon": "icon-table", + "module": "Stock", + "name": "__common__", "page_name": "stock-ledger", - "standard": "Yes" + "standard": "Yes", + "title": "Stock Ledger" }, { + "doctype": "Page Role", "name": "__common__", "parent": "stock-ledger", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "stock-ledger" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Analytics" }, { - "name": "stock-ledger", - "doctype": "Page" + "doctype": "Page Role", + "role": "Material Manager" }, { - "role": "Analytics", - "doctype": "Page Role" - }, - { - "role": "Material Manager", - "doctype": "Page Role" - }, - { - "role": "Material User", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Material User" } ] \ No newline at end of file diff --git a/stock/page/stock_level/stock_level.txt b/stock/page/stock_level/stock_level.txt index 4b567136df..bae3d9c9b2 100644 --- a/stock/page/stock_level/stock_level.txt +++ b/stock/page/stock_level/stock_level.txt @@ -1,36 +1,37 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-12-31 10:52:14", + "docstatus": 0, + "modified": "2013-07-11 14:44:21", "modified_by": "Administrator", - "modified": "2013-01-09 17:16:57" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Stock Level", "doctype": "Page", + "icon": "icon-table", "module": "Stock", + "name": "__common__", + "page_name": "stock-level", "standard": "Yes", - "page_name": "stock-level" + "title": "Stock Level" }, { + "doctype": "Page Role", "name": "__common__", "parent": "stock-level", + "parentfield": "roles", + "parenttype": "Page" + }, + { + "doctype": "Page", + "name": "stock-level" + }, + { "doctype": "Page Role", - "parenttype": "Page", - "parentfield": "roles" + "role": "Material Manager" }, { - "name": "stock-level", - "doctype": "Page" - }, - { - "role": "Material Manager", - "doctype": "Page Role" - }, - { - "role": "Analytics", - "doctype": "Page Role" + "doctype": "Page Role", + "role": "Analytics" } ] \ No newline at end of file diff --git a/support/page/support_analytics/support_analytics.txt b/support/page/support_analytics/support_analytics.txt index 587bd93547..3b9f190a56 100644 --- a/support/page/support_analytics/support_analytics.txt +++ b/support/page/support_analytics/support_analytics.txt @@ -1,30 +1,31 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2013-01-04 15:31:45", + "docstatus": 0, + "modified": "2013-07-11 14:44:24", "modified_by": "Administrator", - "modified": "2013-01-04 15:38:44" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Support Analytics", "doctype": "Page", + "icon": "icon-bar-chart", "module": "Support", + "name": "__common__", + "page_name": "support-analytics", "standard": "Yes", - "page_name": "support-analytics" + "title": "Support Analytics" }, { + "doctype": "Page Role", "name": "__common__", "parent": "support-analytics", - "doctype": "Page Role", + "parentfield": "roles", "parenttype": "Page", - "role": "Support Team", - "parentfield": "roles" + "role": "Support Team" }, { - "name": "support-analytics", - "doctype": "Page" + "doctype": "Page", + "name": "support-analytics" }, { "doctype": "Page Role" diff --git a/support/page/support_home/support_home.txt b/support/page/support_home/support_home.txt index a1990b4e26..7d9fc9def6 100644 --- a/support/page/support_home/support_home.txt +++ b/support/page/support_home/support_home.txt @@ -1,21 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-02-21 13:23:35", + "docstatus": 0, + "modified": "2013-07-11 14:44:26", "modified_by": "Administrator", - "modified": "2012-02-21 13:23:35" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Support Home", - "module": "Support", "doctype": "Page", + "icon": "icon-th", + "module": "Support", + "name": "__common__", "page_name": "support-home", - "standard": "Yes" + "standard": "Yes", + "title": "Support Home" }, { - "name": "support-home", - "doctype": "Page" + "doctype": "Page", + "name": "support-home" } ] \ No newline at end of file diff --git a/utilities/page/markdown_reference/markdown_reference.txt b/utilities/page/markdown_reference/markdown_reference.txt index 0418029e37..2906644134 100644 --- a/utilities/page/markdown_reference/markdown_reference.txt +++ b/utilities/page/markdown_reference/markdown_reference.txt @@ -1,21 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-08-07 12:35:30", + "docstatus": 0, + "modified": "2013-07-11 14:43:28", "modified_by": "Administrator", - "modified": "2012-08-07 12:35:30" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Markdown Reference", - "module": "Utilities", "doctype": "Page", + "icon": "icon-code", + "module": "Utilities", + "name": "__common__", "page_name": "Markdown Reference", - "standard": "Yes" + "standard": "Yes", + "title": "Markdown Reference" }, { - "name": "markdown-reference", - "doctype": "Page" + "doctype": "Page", + "name": "markdown-reference" } ] \ No newline at end of file diff --git a/website/page/website_home/website_home.txt b/website/page/website_home/website_home.txt index 5fa93a11d2..eeede04589 100644 --- a/website/page/website_home/website_home.txt +++ b/website/page/website_home/website_home.txt @@ -1,21 +1,22 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-02-21 13:23:51", + "docstatus": 0, + "modified": "2013-07-11 14:45:29", "modified_by": "Administrator", - "modified": "2012-02-21 13:23:51" + "owner": "Administrator" }, { - "name": "__common__", - "title": "Website Home", - "module": "Website", "doctype": "Page", + "icon": "icon-th", + "module": "Website", + "name": "__common__", "page_name": "website-home", - "standard": "Yes" + "standard": "Yes", + "title": "Website Home" }, { - "name": "website-home", - "doctype": "Page" + "doctype": "Page", + "name": "website-home" } ] \ No newline at end of file From 80d83f5ae3c1f2cd0d2f8eb2b44493ddc0212a74 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 11 Jul 2013 15:19:13 +0530 Subject: [PATCH 2/3] [style] Style Fixes for Home Page --- setup/doctype/company/company.py | 3 + website/css/website.css | 14 +- .../style_settings/custom_template.css | 145 +++++++++--------- .../doctype/style_settings/style_settings.py | 13 ++ website/templates/html/navbar.html | 2 +- website/templates/html/outer.html | 2 +- 6 files changed, 101 insertions(+), 78 deletions(-) diff --git a/setup/doctype/company/company.py b/setup/doctype/company/company.py index 968296c901..03ab4396ab 100644 --- a/setup/doctype/company/company.py +++ b/setup/doctype/company/company.py @@ -93,6 +93,9 @@ class DocType: "url": "blog" }) website_settings.save() + style_settings = webnotes.bean("Style Settings", "Style Settings") + style_settings.doc.font_size = "15px" + style_settings.save() 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} diff --git a/website/css/website.css b/website/css/website.css index 3ced12ffcc..b71ff1316e 100644 --- a/website/css/website.css +++ b/website/css/website.css @@ -18,6 +18,19 @@ img { padding-bottom: 30px; } +.outer { + padding: 0px 20px; +} + +.navbar { + margin: 0px -20px; +} + +.banner { + margin-top: 20px; + padding: 0px 20px; +} + .missing-image { background-color: #eee; padding: 40px; @@ -42,7 +55,6 @@ img { } div.web-footer { - border-top: 1px solid #dddddd; padding-top: 10px; } diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css index eb422c96b1..b44298923e 100644 --- a/website/doctype/style_settings/custom_template.css +++ b/website/doctype/style_settings/custom_template.css @@ -29,7 +29,7 @@ body { {% endif %} 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 { @@ -52,9 +52,9 @@ div.outer { -webkibox-shadow: 0 0 8px rgba(0, 0, 0, 0.2); } {% else %} -{% if doc.background_color == doc.page_background %} +{% if doc.background_color.lower() == doc.page_background.lower() %} 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; } {% endif %} @@ -62,60 +62,55 @@ div.web-footer { div.web-footer, div.web-footer a { font-size: 90%; - color: #{{ get_hex_shade(doc.background_color or "ffffff", 70) }}; + color: #{{ get_hex_shade(doc.background_color, 70) }}; } /* Bootstrap Navbar */ -.navbar-inverse { +.navbar { box-shadow: none; border-radius: 0px; - background-color: #{{ doc.top_bar_background or "444444"}}; + background-color: #{{ doc.top_bar_background}}; background-repeat: repeat-x; background-image: none; - border-bottom: 1px solid {% if doc.top_bar_background == doc.page_background -%} - #{{ get_hex_shade(doc.page_background or "ffffff", 15) }}; + border-bottom: 1px solid {% if doc.top_bar_background.lower() == doc.page_background.lower() -%} + #{{ get_hex_shade(doc.page_background, 15) }}; {%- else -%} transparent; {%- endif %} } -.navbar-inverse .navbar-brand, -.navbar-inverse .navbar-brand:hover, -.navbar-inverse .navbar-brand:focus, -.navbar-inverse .nav > li > a { - color: #{{ doc.top_bar_foreground or "fffffff"}}; +.navbar .navbar-brand, +.navbar .navbar-brand:hover, +.navbar .navbar-brand:focus, +.navbar .nav > li > a { + color: #{{ doc.top_bar_foreground }}; text-shadow: none; } -.navbar-inverse .nav > li > a:hover, -.navbar-inverse .nav > li > a:focus { - color: #{{ doc.top_bar_background or "0000000"}}; -} - -.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"}}; +.navbar .nav > li > a:hover, +.navbar .nav > li > a:focus { + color: #{{ doc.top_bar_foreground }}; background-color: transparent; } -.navbar-inverse .nav .active > a, -.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 { +.navbar .navbar-text { color: #999999; } -.navbar-inverse .navbar-link:hover, -.navbar-inverse .navbar-link:focus { - color: #{{ doc.top_bar_foreground or "fffffff"}}; +.navbar .nav .active > a, +.navbar .nav .active > a:hover, +.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, @@ -136,55 +131,55 @@ div.web-footer, div.web-footer a { box-shadow: none; } -.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown > .dropdown-toggle:hover .caret { - border-top-color: #{{ doc.top_bar_foreground or "fffffff"}}; - border-bottom-color: #{{ doc.top_bar_foreground or "fffffff"}}; +.navbar .nav li.dropdown > .dropdown-toggle .caret, +.navbar .nav li.dropdown > .dropdown-toggle:hover .caret { + border-top-color: #{{ doc.top_bar_foreground}}; + border-bottom-color: #{{ doc.top_bar_foreground}}; } -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle:hover .caret { - border-top-color: #{{ doc.top_bar_background or "0000000"}}; - border-bottom-color: #{{ doc.top_bar_background or "0000000"}}; +.navbar .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open > .dropdown-toggle:hover .caret { + border-top-color: #{{ doc.top_bar_background}}; + border-bottom-color: #{{ doc.top_bar_background}}; } -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle { - color: #{{ doc.top_bar_background or "0000000"}}; - background-color: #{{ doc.top_bar_foreground or "fffffff"}}; +.navbar .nav li.dropdown.open > .dropdown-toggle { + color: #{{ doc.top_bar_background}}; + background-color: #{{ doc.top_bar_foreground}}; } @media (max-width: 800px) { - .navbar-inverse .nav-collapse .nav > li > a, - .navbar-inverse .nav-collapse .dropdown-menu a { - background-color: #{{ doc.top_bar_background or "0000000"}}; - color: #{{ doc.top_bar_foreground or "fffffff"}}; + .navbar .nav-collapse .nav > li > a, + .navbar .nav-collapse .dropdown-menu a { + background-color: #{{ doc.top_bar_background}}; + color: #{{ doc.top_bar_foreground}}; } - .navbar-inverse .nav-collapse .nav > li > a:hover, - .navbar-inverse .nav-collapse .dropdown-menu a:hover { - background-color: #{{ doc.top_bar_foreground or "fffffff"}}; - color: #{{ doc.top_bar_background or "0000000"}}; + .navbar .nav-collapse .nav > li > a:hover, + .navbar .nav-collapse .dropdown-menu a:hover { + background-color: #{{ doc.top_bar_foreground}}; + color: #{{ doc.top_bar_background}}; } - .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #{{ doc.top_bar_foreground or "fffffff" }}; - border-bottom-color: #{{ doc.top_bar_foreground or "fffffff" }}; + .navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: #{{ doc.top_bar_foreground }}; + border-bottom-color: #{{ doc.top_bar_foreground }}; } - .navbar-inverse .nav li.dropdown > .dropdown-toggle:hover .caret { - border-top-color: #{{ doc.top_bar_background or "0000000" }}; - border-bottom-color: #{{ doc.top_bar_background or "0000000" }}; + .navbar .nav li.dropdown > .dropdown-toggle:hover .caret { + border-top-color: #{{ doc.top_bar_background }}; + border-bottom-color: #{{ doc.top_bar_background }}; } - .navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, - .navbar-inverse .nav li.dropdown.open > .dropdown-toggle:hover .caret { - border-top-color: #{{ doc.top_bar_background or "0000000" }}; - border-bottom-color: #{{ doc.top_bar_background or "0000000" }}; + .navbar .nav li.dropdown.open > .dropdown-toggle .caret, + .navbar .nav li.dropdown.open > .dropdown-toggle:hover .caret { + border-top-color: #{{ doc.top_bar_background }}; + border-bottom-color: #{{ doc.top_bar_background }}; } } .breadcrumb { - background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 10) }}; + background-color: #{{ get_hex_shade(doc.page_background, 10) }}; } .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) > 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 th { - background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 10) }}; + background-color: #{{ get_hex_shade(doc.page_background, 10) }}; } .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 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 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 { - background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 15) }}; + background-color: #{{ get_hex_shade(doc.page_background, 15) }}; } pre, code { - background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 5) }}; + background-color: #{{ get_hex_shade(doc.page_background, 5) }}; } hr { - border-top: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }}; - border-bottom: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 5) }}; + border-top: 1px solid #{{ get_hex_shade(doc.page_background, 15) }}; + border-bottom: 1px solid #{{ get_hex_shade(doc.page_background, 5) }}; } diff --git a/website/doctype/style_settings/style_settings.py b/website/doctype/style_settings/style_settings.py index ddfcf5c52a..f05a8eb4fe 100644 --- a/website/doctype/style_settings/style_settings.py +++ b/website/doctype/style_settings/style_settings.py @@ -30,6 +30,19 @@ class DocType: from webnotes.webutils import get_hex_shade 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() with open(os.path.join( diff --git a/website/templates/html/navbar.html b/website/templates/html/navbar.html index 11f2fb000a..9166cde84d 100644 --- a/website/templates/html/navbar.html +++ b/website/templates/html/navbar.html @@ -1,4 +1,4 @@ -
+
{%- if brand_html %}{{ brand_html }}{% endif -%}
- {% if banner_html %}
+ {% if banner_html %}{% endif %}
From e464105c8e126c1d3f5f6f5df7d16cbfd6717ae6 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 11 Jul 2013 15:28:05 +0530 Subject: [PATCH 3/3] [style] Style Fixes for Home Page --- setup/doctype/company/company.py | 1 + setup/doctype/company/sample_home_page.html | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/setup/doctype/company/company.py b/setup/doctype/company/company.py index 03ab4396ab..1835bf9ba7 100644 --- a/setup/doctype/company/company.py +++ b/setup/doctype/company/company.py @@ -94,6 +94,7 @@ class DocType: }) 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() diff --git a/setup/doctype/company/sample_home_page.html b/setup/doctype/company/sample_home_page.html index 32e58bd540..d6a05195b9 100644 --- a/setup/doctype/company/sample_home_page.html +++ b/setup/doctype/company/sample_home_page.html @@ -1,4 +1,4 @@ -

Sample Home Page

+

Sample Home Page


This is a sample home page for your company %(name)s's website. This was created from the Website Module inside ERPNext. ERPNext provides you with simple @@ -19,4 +19,7 @@ erpnext.com website is built on ERPNext itself.

-

For more help, click here

+

Login to your Account

+ +

For more help, + click here