From 458ca8eddbfa1a202155c93f05b73738f9b15790 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 9 May 2012 10:17:08 +0530 Subject: [PATCH] cms fixes --- .../doctype/sales_common/sales_common.js | 21 -- erpnext/startup/event_handlers.py | 8 +- erpnext/website/utils.py | 4 +- public/login-page.html | 250 ------------------ 4 files changed, 6 insertions(+), 277 deletions(-) delete mode 100644 public/login-page.html diff --git a/erpnext/selling/doctype/sales_common/sales_common.js b/erpnext/selling/doctype/sales_common/sales_common.js index 32c5d9e6a8d..431ac03766d 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.js +++ b/erpnext/selling/doctype/sales_common/sales_common.js @@ -169,27 +169,6 @@ cur_frm.cscript.hide_price_list_currency = function(doc, cdt, cdn, callback1) { } } - -//====================opens territory tree page ================== -cur_frm.cscript.TerritoryHelp = function(doc,dt,dn){ - var call_back = function(){ - - var sb_obj = new SalesBrowser(); - sb_obj.set_val('Territory'); - } - loadpage('Sales Browser',call_back); -} - -//====================opens customer group tree page ================== -cur_frm.cscript.CGHelp = function(doc,dt,dn){ - var call_back = function(){ - var sb_obj = new SalesBrowser(); - sb_obj.set_val('Customer Group'); - } - loadpage('Sales Browser',call_back); -} - - // TRIGGERS FOR CALCULATIONS // ===================================================================================================== diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py index 7df9839561a..b7228ed12ff 100644 --- a/erpnext/startup/event_handlers.py +++ b/erpnext/startup/event_handlers.py @@ -141,12 +141,12 @@ def get_web_style(): """returns web css""" return webnotes.conn.get_value('Style Settings', None, 'custom_css') or '' -def get_web_header(): +def get_web_header(page_name): """get website header""" from website.utils import get_header - return get_header() + return get_header(page_name) -def get_web_footer(): +def get_web_footer(page_name): """get website footer""" from website.utils import get_footer - return get_footer() + return get_footer(page_name) diff --git a/erpnext/website/utils.py b/erpnext/website/utils.py index 1adc824ae1b..ae6bff4f7eb 100644 --- a/erpnext/website/utils.py +++ b/erpnext/website/utils.py @@ -67,7 +67,7 @@ def add_guest_access_to_page(page): d.role = 'Guest' d.save() -def get_header(): +def get_header(page_name): """get page header""" from webnotes.model.doc import Document @@ -123,7 +123,7 @@ def get_header(): """).render(top_bar_items = top_bar_items, brand=website_settings.brand_html or webnotes.get_default('company') or 'ERPNext') -def get_footer(): +def get_footer(page_name): """get page footer""" from webnotes.model.doc import Document diff --git a/public/login-page.html b/public/login-page.html deleted file mode 100644 index 2f942fc22ca..00000000000 --- a/public/login-page.html +++ /dev/null @@ -1,250 +0,0 @@ - - - - Login Page - - - - - - - - - - - - - - - - -
-
-
- erpnext - - - -
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
Login Id
Password
Remember Me
  
  - -
-

Forgot Password

-
-
-
-
- - \ No newline at end of file