Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Nabin Hait
2012-03-01 18:56:33 +05:30
7 changed files with 51 additions and 58 deletions

View File

@@ -13,7 +13,7 @@ span, div, td, input, textarea, button, select {
}
body {
background: url(../erpnext/images/stripedbg.png) repeat;
background: url(../images/stripedbg.png) repeat;
}
.erpnext-footer {

View File

@@ -46,9 +46,6 @@ erpnext.startup.set_globals = function() {
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 @@ erpnext.startup.start = function() {
$('#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 @@ erpnext.set_user_background = function(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>');
}
})();
})
// start
$(document).bind('startup', function() {
erpnext.startup.start();