Index: lams_central/web/login.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/login.jsp,v diff -u -r1.40.6.2 -r1.40.6.3 --- lams_central/web/login.jsp 18 Apr 2009 23:59:28 -0000 1.40.6.2 +++ lams_central/web/login.jsp 19 Apr 2009 23:55:22 -0000 1.40.6.3 @@ -95,10 +95,12 @@ } function isBrowserNotCompatable() { - if(op) return true; // Opera - else if(saf) return true; // Safari - else if(ie8 || ie7) return false; // IE8 IE7 + if(ie8 || ie7) return false; // IE8 IE7 + else if(saf4) return false; //Safari4 + else if(chrome) return false; //Chrome else if(ie5xwin || ie5 || ie4 || ie5mac || ie5x || ie6) return true; + else if(saf) return true; // Safari + else if(op) return true; // Opera else if(moz) if((moz_brow.indexOf("Firefox") != -1) && (moz_brow_nu >= 1.5)) return false; // Firefox 1.5+ else return true; Index: lams_central/web/includes/javascript/browser_detect.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/browser_detect.js,v diff -u -r1.1.14.1 -r1.1.14.2 --- lams_central/web/includes/javascript/browser_detect.js 19 Apr 2009 02:05:16 -0000 1.1.14.1 +++ lams_central/web/includes/javascript/browser_detect.js 19 Apr 2009 23:55:39 -0000 1.1.14.2 @@ -49,7 +49,7 @@ //initialization, browser, os detection var d, dom, nu='', brow='', ie, ie4, ie5, ie5x, ie6, ie7, ie8; var ns4, moz, moz_rv_sub, release_date='', moz_brow, moz_brow_nu='', moz_brow_nu_sub='', rv_full=''; -var mac, win, old, lin, ie5mac, ie5xwin, konq, saf, op, op4, op5, op6, op7; +var mac, win, old, lin, ie5mac, ie5xwin, konq, saf, saf4, op, op4, op5, op6, op7, chrome; d=document; n=navigator; @@ -76,6 +76,7 @@ saf=(nua.indexOf('Safari')!=-1); konq=(!saf && (nua.indexOf('Konqueror')!=-1) ) ? true : false; moz=( (!saf && !konq ) && ( nua.indexOf('Gecko')!=-1 ) ) ? true : false; +chrome=(nua.indexOf('Chrome')!=-1); ie=((nua.indexOf('MSIE')!=-1)&&!op); if (op) { @@ -87,6 +88,9 @@ { str_pos=nua.indexOf('Safari'); nu=nua.substr((str_pos+7),5); + // checks for webkit 528 or higher introduced + // in safari4 + saf4=(saf&&(nu.substring(0,3)>=528)); brow = 'Safari'; } else if (konq)