browse support
diff --git a/css/all-app.css b/css/all-app.css
index 2ac3c75..0dea8b7 100644
--- a/css/all-app.css
+++ b/css/all-app.css
@@ -2766,7 +2766,7 @@
}
body {
- background: url(../erpnext/images/stripedbg.png) repeat;
+ background: url(../images/stripedbg.png) repeat;
}
.erpnext-footer {
diff --git a/css/all-web.css b/css/all-web.css
index 9b4ef72..36d9cda 100644
--- a/css/all-web.css
+++ b/css/all-web.css
@@ -1574,7 +1574,7 @@
}
body {
- background: url(../erpnext/images/stripedbg.png) repeat;
+ background: url(../images/stripedbg.png) repeat;
}
.erpnext-footer {
diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css
index 64d6dea..225e444 100644
--- a/erpnext/startup/startup.css
+++ b/erpnext/startup/startup.css
@@ -13,7 +13,7 @@
}
body {
- background: url(../erpnext/images/stripedbg.png) repeat;
+ background: url(../images/stripedbg.png) repeat;
}
.erpnext-footer {
diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js
index ecd4a4d..6747bae 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -46,9 +46,6 @@
erpnext.startup.start = function() {
$('#startup_div').html('Starting up...').toggle(true);
- if(!erpnext.check_browser_support())
- return;
-
erpnext.startup.set_globals();
@@ -90,29 +87,6 @@
$('#startup_div').toggle(false);
}
-erpnext.check_browser_support = function() {
- var is_supported = function() {
- if($.browser.mozilla && flt($.browser.version)<4) return false;
- if($.browser.msie && flt($.browser.version)<9) return false;
- if($.browser.webkit && flt($.browser.version)<534) return false;
- return true;
- }
- var s = is_supported();
- if(!s) {
- $('body').html('<div style="width: 900px; margin: 20px auto; padding: 20px;\
- background-color: #fff; border: 2px solid #aaa; font-family: Arial">\
- <h3>Unsupported Browser</h3> \
- <p><i>ERPNext requires a modern web browser to function correctly</i></p> \
- <p>Supported browsers are: \
- <ul><li><a href="http://mozilla.com/firefox">Mozilla Firfox 4+</a>, \
- <li><a href="http://google.com/chrome">Google Chorme 14+</a>, \
- <li><a href="http://apple.com/safari">Apple Safari 5+</a>, \
- <li><a href="http://ie.microsoft.com">Microsoft Internet Explorer 9+</a>, \
- <li><a href="http://www.opera.com/">Opera</a></p></ul>')
- }
- return s;
-}
-
// chart of accounts
// ====================================================================
show_chart_browser = function(nm, chart_type){
@@ -178,6 +152,29 @@
// =======================================
+$(document).bind('ready', function() {
+ (function() {
+ var is_supported = function() {
+ if($.browser.mozilla && flt($.browser.version)<4) return false;
+ if($.browser.msie && flt($.browser.version)<9) return false;
+ if($.browser.webkit && flt($.browser.version)<534) return false;
+ return true;
+ }
+ if(!is_supported()) {
+ $('body').html('<div style="width: 900px; margin: 20px auto; padding: 20px;\
+ background-color: #fff; border: 2px solid #aaa; font-family: Arial">\
+ <h3>Unsupported Browser</h3> \
+ <p><i>ERPNext requires a modern web browser to function correctly</i></p> \
+ <p>Supported browsers are: \
+ <ul><li><a href="http://mozilla.com/firefox">Mozilla Firfox 4+</a>, \
+ <li><a href="http://google.com/chrome">Google Chorme 14+</a>, \
+ <li><a href="http://apple.com/safari">Apple Safari 5+</a>, \
+ <li><a href="http://ie.microsoft.com">Microsoft Internet Explorer 9+</a>, \
+ <li><a href="http://www.opera.com/">Opera</a></p></ul>');
+ }
+ })();
+})
+
// start
$(document).bind('startup', function() {
erpnext.startup.start();
diff --git a/js/all-app.js b/js/all-app.js
index bcdcbfd..c72de9a 100644
--- a/js/all-app.js
+++ b/js/all-app.js
Binary files differ
diff --git a/js/all-web.js b/js/all-web.js
index 9e07a03..156f7c5 100644
--- a/js/all-web.js
+++ b/js/all-web.js
@@ -1072,25 +1072,12 @@
var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'}
erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
if(inList(user_roles,'System Manager'))is_system_manager=1;}
-erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);if(!erpnext.check_browser_support())
-return;erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
+erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="web-footer erpnext-footer">\
<a href="#!attributions">ERPNext | Attributions and License</a></div>');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}}
$('#startup_div').toggle(false);}
-erpnext.check_browser_support=function(){var is_supported=function(){if($.browser.mozilla&&flt($.browser.version)<4)return false;if($.browser.msie&&flt($.browser.version)<9)return false;if($.browser.webkit&&flt($.browser.version)<534)return false;return true;}
-var s=is_supported();if(!s){$('body').html('<div style="width: 900px; margin: 20px auto; padding: 20px;\
- background-color: #fff; border: 2px solid #aaa; font-family: Arial">\
- <h3>Unsupported Browser</h3> \
- <p><i>ERPNext requires a modern web browser to function correctly</i></p> \
- <p>Supported browsers are: \
- <ul><li><a href="http://mozilla.com/firefox">Mozilla Firfox 4+</a>, \
- <li><a href="http://google.com/chrome">Google Chorme 14+</a>, \
- <li><a href="http://apple.com/safari">Apple Safari 5+</a>, \
- <li><a href="http://ie.microsoft.com">Microsoft Internet Explorer 9+</a>, \
- <li><a href="http://www.opera.com/">Opera</a></p></ul>')}
-return s;}
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);}
@@ -1101,6 +1088,17 @@
erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
wn.updates.id=setInterval(update_messages,60000);}
erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat !important;}',{src:src}))}
+$(document).bind('ready',function(){(function(){var is_supported=function(){if($.browser.mozilla&&flt($.browser.version)<4)return false;if($.browser.msie&&flt($.browser.version)<9)return false;if($.browser.webkit&&flt($.browser.version)<534)return false;return true;}
+if(!is_supported()){$('body').html('<div style="width: 900px; margin: 20px auto; padding: 20px;\
+ background-color: #fff; border: 2px solid #aaa; font-family: Arial">\
+ <h3>Unsupported Browser</h3> \
+ <p><i>ERPNext requires a modern web browser to function correctly</i></p> \
+ <p>Supported browsers are: \
+ <ul><li><a href="http://mozilla.com/firefox">Mozilla Firfox 4+</a>, \
+ <li><a href="http://google.com/chrome">Google Chorme 14+</a>, \
+ <li><a href="http://apple.com/safari">Apple Safari 5+</a>, \
+ <li><a href="http://ie.microsoft.com">Microsoft Internet Explorer 9+</a>, \
+ <li><a href="http://www.opera.com/">Opera</a></p></ul>');}})();})
$(document).bind('startup',function(){erpnext.startup.start();});
/*
* erpnext/website/js/topbar.js
diff --git a/version.num b/version.num
index 25c4e52..4c88dcf 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-796
\ No newline at end of file
+805
\ No newline at end of file