details: https://code.openbravo.com/erp/devel/pi/rev/940dee23af43
changeset: 16452:940dee23af43
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue May 08 20:12:24 2012 +0200
summary: Related to issue 20207: Classic window borders are now showed again
diffstat:
modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/Openbravo_ERP_250.css
| 8 ++
src/org/openbravo/erpCommon/security/Login.html
| 2 +-
src/org/openbravo/erpCommon/security/Login_F1.html
| 2 +-
web/js/utils.js
| 31
+++++++++-
web/js/windowKeyboard.js
| 4 +-
web/skins/Default/Openbravo_ERP_250.css
| 8 ++
6 files changed, 50 insertions(+), 5 deletions(-)
diffs (140 lines):
diff -r 40337ad8318e -r 940dee23af43
modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/Openbravo_ERP_250.css
---
a/modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/Openbravo_ERP_250.css
Tue May 08 19:18:12 2012 +0200
+++
b/modules/org.openbravo.userinterface.skin.250to300Comp/web/org.openbravo.userinterface.skin.250to300Comp/skins/250to300Comp/Openbravo_ERP_250.css
Tue May 08 20:12:24 2012 +0200
@@ -1468,10 +1468,18 @@
border-collapse: collapse;
}
+.Main_ContentPane_Right_Container {
+ background-color: #3A6B01;
+}
+
.Main_ContentPane_Right {
background-color: #3A6B01;
}
+.Main_ContentPane_Left_Container {
+ background-color: #3A6B01;
+}
+
.Main_ContentPane_Left {
background-color: #3A6B01;
}
diff -r 40337ad8318e -r 940dee23af43
src/org/openbravo/erpCommon/security/Login.html
--- a/src/org/openbravo/erpCommon/security/Login.html Tue May 08 19:18:12
2012 +0200
+++ b/src/org/openbravo/erpCommon/security/Login.html Tue May 08 20:12:24
2012 +0200
@@ -391,7 +391,7 @@
}
catch (e) { }
- if ((!revisionControl('16049')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('16452')) || (isOpsInstance() !=
isOpsInstanceCached())) {
maskLoginWindow(cacheMsg);
setLoginMessage('Warning', '', cacheMsg);
}
diff -r 40337ad8318e -r 940dee23af43
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Tue May 08
19:18:12 2012 +0200
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Tue May 08
20:12:24 2012 +0200
@@ -126,7 +126,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('16049')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('16452')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert(cacheMsg);
}
diff -r 40337ad8318e -r 940dee23af43 web/js/utils.js
--- a/web/js/utils.js Tue May 08 19:18:12 2012 +0200
+++ b/web/js/utils.js Tue May 08 20:12:24 2012 +0200
@@ -33,7 +33,7 @@
if (isWindowInMDIPage) {
adaptSkinToMDIEnvironment();
}
- if (getBrowserInfo('documentMode') >= 8) {
+ if (navigator.userAgent.toUpperCase().indexOf("MSIE") !== -1 &&
getBrowserInfo('documentMode') >= 8) {
isIE8Strict = true;
}
}
@@ -99,7 +99,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 = '16049';
+ var number = '16452';
return number;
}
@@ -5666,6 +5666,33 @@
} catch (e) { }
}
+function fixIE9WindowBorders() {
+ if (isIE8Strict) {
+ var leftContentPane = getElementsByClassName('Main_ContentPane_Left',
'table');
+ if (leftContentPane[0]) {
+ leftContentPane = leftContentPane[0];
+ leftContentPane = leftContentPane.parentNode;
+ if (leftContentPane && !leftContentPane.className) {
+ leftContentPane.className='Main_ContentPane_Left_Container';
+ }
+ }
+
+ var rightContentPane = getElementsByClassName('Main_ContentPane_Right',
'table');
+ if (rightContentPane[0]) {
+ rightContentPane = rightContentPane[0];
+ rightContentPane = rightContentPane.parentNode;
+ if (rightContentPane && !rightContentPane.className) {
+ rightContentPane.className='Main_ContentPane_Right_Container';
+ }
+ }
+ }
+}
+
+function moreOnLoadDoFunctions() {
+ setMDIEnvironment();
+ fixIE9WindowBorders();
+}
+
/**
* End of functions to communicate with 3.0 tabbed interface
diff -r 40337ad8318e -r 940dee23af43 web/js/windowKeyboard.js
--- a/web/js/windowKeyboard.js Tue May 08 19:18:12 2012 +0200
+++ b/web/js/windowKeyboard.js Tue May 08 20:12:24 2012 +0200
@@ -168,7 +168,9 @@
}
function setWindowTableParentElement() {
- setMDIEnvironment();
+ if (moreOnLoadDoFunctions) {
+ moreOnLoadDoFunctions();
+ }
windowTableParentElement = windowTables[focusedWindowTable].tableId;
}
diff -r 40337ad8318e -r 940dee23af43 web/skins/Default/Openbravo_ERP_250.css
--- a/web/skins/Default/Openbravo_ERP_250.css Tue May 08 19:18:12 2012 +0200
+++ b/web/skins/Default/Openbravo_ERP_250.css Tue May 08 20:12:24 2012 +0200
@@ -6001,6 +6001,10 @@
width: 100%;
}
+.Main_ContentPane_Right_Container {
+ background-color: #505050;
+}
+
.Main_ContentPane_Right {
border: 0px none;
text-indent: 0px;
@@ -6013,6 +6017,10 @@
background-color: #505050;
}
+.Main_ContentPane_Left_Container {
+ background-color: #505050;
+}
+
.Main_ContentPane_Left {
border: 0px none;
text-indent: 0px;
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
