From 70f7674aed30e799372990245e88de9a93c1fae8 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 1 Mar 2012 18:42:05 +0530 Subject: [PATCH] browse support and images --- build.json | 2 -- css/all-app.css | 1 + css/all-web.css | 1 + erpnext/startup/startup.css | 1 + erpnext/startup/startup.js | 27 +++++++++++++++++++++++++++ js/all-app.js | 27 ++++++++++++++++----------- js/all-web.js | 27 ++++++++++++++++----------- version.num | 2 +- 8 files changed, 63 insertions(+), 25 deletions(-) diff --git a/build.json b/build.json index 635e73d9dc..1aa3b20d8c 100644 --- a/build.json +++ b/build.json @@ -81,7 +81,6 @@ "lib/js/core.min.js:concat", "lib/js/legacy/globals.js", "lib/js/legacy/utils/datatype.js", - "lib/js/legacy/utils/browser_detect.js", "lib/js/legacy/utils/datetime.js", "lib/js/legacy/utils/dom.js", "lib/js/legacy/utils/handler.js", @@ -125,7 +124,6 @@ "lib/js/core.min.js:concat", "lib/js/legacy/globals.js", "lib/js/legacy/utils/datatype.js", - "lib/js/legacy/utils/browser_detect.js", "lib/js/legacy/utils/datetime.js", "lib/js/legacy/utils/dom.js", "lib/js/legacy/utils/handler.js", diff --git a/css/all-app.css b/css/all-app.css index f3a07ec9da..2ac3c75210 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -2766,6 +2766,7 @@ span, div, td, input, textarea, button, select { } body { + background: url(../erpnext/images/stripedbg.png) repeat; } .erpnext-footer { diff --git a/css/all-web.css b/css/all-web.css index 967c32b65c..9b4ef72608 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -1574,6 +1574,7 @@ span, div, td, input, textarea, button, select { } body { + background: url(../erpnext/images/stripedbg.png) repeat; } .erpnext-footer { diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css index 1ce026449b..64d6deacd2 100644 --- a/erpnext/startup/startup.css +++ b/erpnext/startup/startup.css @@ -13,6 +13,7 @@ span, div, td, input, textarea, button, select { } body { + background: url(../erpnext/images/stripedbg.png) repeat; } .erpnext-footer { diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 6448574917..ecd4a4da00 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -46,6 +46,10 @@ 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(); if(wn.boot.custom_css) { @@ -86,6 +90,29 @@ 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('
\ +

Unsupported Browser

\ +

ERPNext requires a modern web browser to function correctly

\ +

Supported browsers are: \ +

') + } + return s; +} + // chart of accounts // ==================================================================== show_chart_browser = function(nm, chart_type){ diff --git a/js/all-app.js b/js/all-app.js index 24bd724b7f..bcdcbfda77 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -312,14 +312,6 @@ if(remainder){if(remainder>=100)comma=',' else comma='' return bestguess+comma+' '+in_words(remainder);}else{return bestguess;}} function roundNumber(num,dec){var result=Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);return result;} -/* - * lib/js/legacy/utils/browser_detect.js - */ -var appVer=navigator.appVersion.toLowerCase();var is_minor=parseFloat(appVer);var is_major=parseInt(is_minor);var iePos=appVer.indexOf('msie');if(iePos!=-1){is_minor=parseFloat(appVer.substring(iePos+5,appVer.indexOf(';',iePos))) -is_major=parseInt(is_minor);} -var isIE=(iePos!=-1);var isIE6=(isIE&&is_major<=6);var isIE7=(isIE&&is_major>=7);if(/Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent)){var isFF=1;var ffversion=new Number(RegExp.$1) -if(ffversion>=3)var isFF3=1;else if(ffversion>=2)var isFF2=1;else if(ffversion>=1)var isFF1=1;} -var isSafari=navigator.userAgent.indexOf('Safari')!=-1?1:0;var isChrome=navigator.userAgent.indexOf('Chrome')!=-1?1:0; /* * lib/js/legacy/utils/datetime.js */ @@ -464,7 +456,7 @@ set_it(img);},null,1);user_img_loading.push(username);}} var outUrl="index.cgi";var NULL_CHAR='^\5*';function checkResponse(r,on_timeout,no_spinner,freeze_msg){try{if(r.readyState==4&&r.status==200)return true;else return false;}catch(e){msgprint("error:Request timed out, try again");if(on_timeout) on_timeout();hide_loading();if(freeze_msg) unfreeze();return false;}} -var pending_req=0;function newHttpReq(){if(!isIE) +var pending_req=0;function newHttpReq(){if(!$.browser.msie) var r=new XMLHttpRequest();else if(window.ActiveXObject) var r=new ActiveXObject("Microsoft.XMLHTTP");return r;} function $c(command,args,fn,on_timeout,no_spinner,freeze_msg,btn){var req=newHttpReq();ret_fn=function(){if(checkResponse(req,on_timeout,no_spinner,freeze_msg)){if(btn)$(btn).done_working();if(!no_spinner) @@ -1112,7 +1104,7 @@ function hide_loading(){pending_req--;if(!pending_req){$('body').css('cursor','d /* * lib/js/legacy/webpage/freeze_page.js */ -var fcount=0;var frozen=0;var dialog_message;var dialog_back;function freeze(msg,do_freeze){if(!dialog_back){dialog_back=$a($i('body_div'),'div','dialog_back');if(isIE)dialog_back.style['filter']='alpha(opacity=60)';} +var fcount=0;var frozen=0;var dialog_message;var dialog_back;function freeze(msg,do_freeze){if(!dialog_back){dialog_back=$a($i('body_div'),'div','dialog_back');$(dialog_back).css('opacity',0.6);} $ds(dialog_back);fcount++;frozen=1;} function unfreeze(){if(dialog_message) $dh(dialog_message);if(!fcount)return;fcount--;if(!fcount){$dh(dialog_back);frozen=0;}} @@ -2232,12 +2224,25 @@ wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',f 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);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);if(!erpnext.check_browser_support()) +return;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('
\ ERPNext | Attributions and License
');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('
\ +

Unsupported Browser

\ +

ERPNext requires a modern web browser to function correctly

\ +

Supported browsers are: \ +

')} +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);} diff --git a/js/all-web.js b/js/all-web.js index 08e84bf916..9e07a03064 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -238,14 +238,6 @@ if(remainder){if(remainder>=100)comma=',' else comma='' return bestguess+comma+' '+in_words(remainder);}else{return bestguess;}} function roundNumber(num,dec){var result=Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);return result;} -/* - * lib/js/legacy/utils/browser_detect.js - */ -var appVer=navigator.appVersion.toLowerCase();var is_minor=parseFloat(appVer);var is_major=parseInt(is_minor);var iePos=appVer.indexOf('msie');if(iePos!=-1){is_minor=parseFloat(appVer.substring(iePos+5,appVer.indexOf(';',iePos))) -is_major=parseInt(is_minor);} -var isIE=(iePos!=-1);var isIE6=(isIE&&is_major<=6);var isIE7=(isIE&&is_major>=7);if(/Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent)){var isFF=1;var ffversion=new Number(RegExp.$1) -if(ffversion>=3)var isFF3=1;else if(ffversion>=2)var isFF2=1;else if(ffversion>=1)var isFF1=1;} -var isSafari=navigator.userAgent.indexOf('Safari')!=-1?1:0;var isChrome=navigator.userAgent.indexOf('Chrome')!=-1?1:0; /* * lib/js/legacy/utils/datetime.js */ @@ -390,7 +382,7 @@ set_it(img);},null,1);user_img_loading.push(username);}} var outUrl="index.cgi";var NULL_CHAR='^\5*';function checkResponse(r,on_timeout,no_spinner,freeze_msg){try{if(r.readyState==4&&r.status==200)return true;else return false;}catch(e){msgprint("error:Request timed out, try again");if(on_timeout) on_timeout();hide_loading();if(freeze_msg) unfreeze();return false;}} -var pending_req=0;function newHttpReq(){if(!isIE) +var pending_req=0;function newHttpReq(){if(!$.browser.msie) var r=new XMLHttpRequest();else if(window.ActiveXObject) var r=new ActiveXObject("Microsoft.XMLHTTP");return r;} function $c(command,args,fn,on_timeout,no_spinner,freeze_msg,btn){var req=newHttpReq();ret_fn=function(){if(checkResponse(req,on_timeout,no_spinner,freeze_msg)){if(btn)$(btn).done_working();if(!no_spinner) @@ -835,7 +827,7 @@ function hide_loading(){pending_req--;if(!pending_req){$('body').css('cursor','d /* * lib/js/legacy/webpage/freeze_page.js */ -var fcount=0;var frozen=0;var dialog_message;var dialog_back;function freeze(msg,do_freeze){if(!dialog_back){dialog_back=$a($i('body_div'),'div','dialog_back');if(isIE)dialog_back.style['filter']='alpha(opacity=60)';} +var fcount=0;var frozen=0;var dialog_message;var dialog_back;function freeze(msg,do_freeze){if(!dialog_back){dialog_back=$a($i('body_div'),'div','dialog_back');$(dialog_back).css('opacity',0.6);} $ds(dialog_back);fcount++;frozen=1;} function unfreeze(){if(dialog_message) $dh(dialog_message);if(!fcount)return;fcount--;if(!fcount){$dh(dialog_back);frozen=0;}} @@ -1080,12 +1072,25 @@ wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',f 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);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);if(!erpnext.check_browser_support()) +return;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('
\ ERPNext | Attributions and License
');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('
\ +

Unsupported Browser

\ +

ERPNext requires a modern web browser to function correctly

\ +

Supported browsers are: \ +

')} +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);} diff --git a/version.num b/version.num index e791c500d1..25c4e5246c 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -787 +796 \ No newline at end of file