From aa51377e94880a2805a7eb6c8e1384193597467b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 May 2012 13:03:41 +0530 Subject: [PATCH] custom startup --- css/all-web.css | 2 +- erpnext/startup/startup.js | 4 ++-- erpnext/website/css/website.css | 2 +- js/all-app.js | 3 ++- js/all-web.js | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/css/all-web.css b/css/all-web.css index 1d8f8d6e30..8f9003c8b1 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -2553,7 +2553,7 @@ header .container, .content { } div#body_div { - padding-top: 90px; + padding-top: 80px; min-height: 400px; } diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 455b850ca0..959c8540fe 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -110,8 +110,8 @@ erpnext.startup.start = function() { } erpnext.set_about(); - - $('#startup_div').toggle(false); + if(wn.control_panel.custom_startup_code) + eval(wn.control_panel.custom_startup_code); } // chart of accounts diff --git a/erpnext/website/css/website.css b/erpnext/website/css/website.css index a68209f439..eb9e6cc834 100644 --- a/erpnext/website/css/website.css +++ b/erpnext/website/css/website.css @@ -3,7 +3,7 @@ header .container, .content { } div#body_div { - padding-top: 90px; + padding-top: 80px; min-height: 400px; } diff --git a/js/all-app.js b/js/all-app.js index bafe125daa..74ffb18cb5 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2241,7 +2241,8 @@ if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil. ',{expiry_string:expiry_string}));}else if(diff<0){$('header').append(repl('
\ This ERPNext subscription has expired. \
',{expiry_string:expiry_string}));}}} -erpnext.set_about();$('#startup_div').toggle(false);} +erpnext.set_about();if(wn.control_panel.custom_startup_code) +eval(wn.control_panel.custom_startup_code);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} else if(nm=='Accounts Browser') pscript.make_chart(chart_type);} diff --git a/js/all-web.js b/js/all-web.js index 8c2e3370dd..6dd52b3bd4 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -852,7 +852,8 @@ if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil. ',{expiry_string:expiry_string}));}else if(diff<0){$('header').append(repl('
\ This ERPNext subscription has expired. \
',{expiry_string:expiry_string}));}}} -erpnext.set_about();$('#startup_div').toggle(false);} +erpnext.set_about();if(wn.control_panel.custom_startup_code) +eval(wn.control_panel.custom_startup_code);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} else if(nm=='Accounts Browser') pscript.make_chart(chart_type);}