details: /erp/devel/main/rev/3f03e0964d79
changeset: 6399:3f03e0964d79
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Feb 17 00:50:20 2010 +0100
summary: Fixed issue 11979: Added message in Login_F1.html to check supported
browser
details: /erp/devel/main/rev/ac1613679301
changeset: 6400:ac1613679301
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Feb 17 01:40:02 2010 +0100
summary: Related to issue 11979: Changed alert order
details: /erp/devel/main/rev/3c64aceaf7f8
changeset: 6401:3c64aceaf7f8
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Feb 17 12:17:55 2010 +0100
summary: Related to issue 11979: Changed alert text
diffstat:
src/org/openbravo/erpCommon/security/Login_F1.html | 6 +-
web/js/utils.js | 90 +++++++++++++++++++++-
2 files changed, 94 insertions(+), 2 deletions(-)
diffs (125 lines):
diff -r 5ae4a54f2372 -r 3c64aceaf7f8
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Tue Feb 16
01:40:40 2010 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Wed Feb 17
12:17:55 2010 +0100
@@ -78,9 +78,13 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('6383')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('6446')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert("Your browser's cache has outdated files. Please clean it and
reload the page.");
}
+
+ if (!checkBrowserCompatibility()) {
+ alert("Your browser is not officially supported.\n\nYou can continue at
your own risk or access the application with one of the supported browsers:\n *
Mozilla Firefox 3.0 or higher\n * Microsoft Internet Explorer 7.0 or higher");
+ }
}
function onResizeDo() {
diff -r 5ae4a54f2372 -r 3c64aceaf7f8 web/js/utils.js
--- a/web/js/utils.js Tue Feb 16 01:40:40 2010 +0100
+++ b/web/js/utils.js Wed Feb 17 12:17:55 2010 +0100
@@ -70,7 +70,7 @@
* Return a number that would be checked at the Login screen to know if the
file is cached with the correct version
*/
function getCurrentRevision() {
- var number = '6383';
+ var number = '6446';
return number;
}
@@ -87,6 +87,94 @@
}
}
+/**
+* Gets information of the browser
+* @param {name} string Required - It could be "name", "version",
"nameAndVersion" or "complete"
+*/
+function getBrowserInfo(param) {
+ var navUserAgent = navigator.userAgent.toUpperCase();
+ var browserName = "Unknown";
+ var browserVersion = "";
+ var browserMajorVersion = "";
+ var i=0
+ if (navUserAgent.indexOf("MSIE") >= 0) {
+ browserName = "Microsoft Internet Explorer";
+ i=navUserAgent.indexOf("MSIE")+5;
+ } else if (navUserAgent.indexOf("FIREFOX") >= 0) {
+ browserName = "Mozilla Firefox";
+ i=navUserAgent.indexOf("FIREFOX")+8;
+ } else if (navUserAgent.indexOf("ICEWEASEL") >= 0) {
+ browserName = "IceWeasel";
+ i=navUserAgent.indexOf("ICEWEASEL")+10;
+ } else if (navUserAgent.indexOf("CHROME") >= 0) {
+ browserName = "Google Chrome";
+ i=navUserAgent.indexOf("CHROME")+7;
+ } else if (navUserAgent.indexOf("OPERA") >= 0) {
+ browserName = "Opera";
+ if (navUserAgent.indexOf("VERSION") != -1) {
+ i=navUserAgent.indexOf("VERSION")+8;
+ } else {
+ i=navUserAgent.indexOf("OPERA")+6;
+ }
+ } else if (navUserAgent.indexOf("SAFARI") >= 0) {
+ browserName = "Safari";
+ if (navUserAgent.indexOf("VERSION") != -1) {
+ i=navUserAgent.indexOf("VERSION")+8;
+ } else {
+ i=navUserAgent.indexOf("SAFARI")+7;
+ }
+ } else if (navUserAgent.indexOf("NETSCAPE") >= 0) {
+ browserName = "Netscape";
+ i=navUserAgent.indexOf("NETSCAPE")+9;
+ } else if (navUserAgent.indexOf("KONQUEROR") >= 0) {
+ browserName = "Konqueror";
+ i=navUserAgent.indexOf("KONQUEROR")+10;
+ }
+ if (i!=0) {
+ while (navUserAgent.substring(i, i+1) != " " && navUserAgent.substring(i,
i+1) != ";" && i < navUserAgent.length) {
+ browserVersion += navUserAgent.substring(i, i+1);
+ i++;
+ }
+ }
+ var browserNameAndVersion = browserName + " " + browserVersion;
+ browserMajorVersion = browserVersion;
+ if (browserMajorVersion.indexOf(".") != -1) {
+ browserMajorVersion = browserMajorVersion.substring(0,
browserVersion.indexOf("."));
+ browserMajorVersion = parseInt(browserMajorVersion);
+ }
+ if (param == "name") {
+ return browserName;
+ } else if (param == "version") {
+ return browserVersion;
+ } else if (param == "majorVersion") {
+ return browserMajorVersion;
+ } else if (param == "nameAndVersion" || typeof param == "undefined" || param
== "" || param == null) {
+ return browserNameAndVersion;
+ } else {
+ return false;
+ }
+}
+
+/**
+* Checks if the browser is a supported one
+*/
+function checkBrowserCompatibility() {
+ var browserName = getBrowserInfo("name");
+ var browserVersion = getBrowserInfo("version");
+ var browserMajorVersion = getBrowserInfo("majorVersion");
+ var isValid = false;
+ if (browserName.toUpperCase().indexOf('FIREFOX') != -1 ||
browserName.toUpperCase().indexOf('ICEWEASEL') != -1) {
+ if (browserMajorVersion >= 3) {
+ isValid = true;
+ }
+ } else if (browserName.toUpperCase().indexOf('INTERNET EXPLORER') != -1) {
+ if (browserMajorVersion >= 7) {
+ isValid = true;
+ }
+ }
+ return isValid;
+}
+
function getObjAttribute(obj, attribute) {
attribute = attribute.toLowerCase();
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
