details: /erp/devel/main/rev/9a2732796d3a
changeset: 9060:9a2732796d3a
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Dec 01 12:06:12 2010 +0100
summary: Fixed issue 15340: Now 'Go Pro' text is more accurate while resizing
details: /erp/devel/main/rev/47efb3cb3ff3
changeset: 9061:47efb3cb3ff3
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Dec 01 12:34:26 2010 +0100
summary: Fixed issue 15340: Now 'Go Pro' text is more accurate while resizing
- part2
details: /erp/devel/main/rev/39bec6c1ffae
changeset: 9062:39bec6c1ffae
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Dec 01 23:10:14 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/sourcedata/AD_MODULE.xml | 4 ++--
src/org/openbravo/erpCommon/security/Login.html | 2 +-
src/org/openbravo/erpCommon/security/Login_F1.html | 2 +-
web/html/en_US/StaticCommunityBranding-MyOB-Basic.html | 4 ++--
web/html/en_US/StaticCommunityBranding-MyOB-Comm.html | 4 ++--
web/html/en_US/StaticCommunityBranding-MyOB-STD.html | 2 +-
web/html/en_US/StaticCommunityBranding-MyOB.js | 4 ++--
web/js/utils.js | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diffs (116 lines):
diff -r cb6a144e18fd -r 39bec6c1ffae src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 01 14:55:25 2010 +0530
+++ b/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 01 23:10:14 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[Core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.19053]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.19061]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r cb6a144e18fd -r 39bec6c1ffae
src/org/openbravo/erpCommon/security/Login.html
--- a/src/org/openbravo/erpCommon/security/Login.html Wed Dec 01 14:55:25
2010 +0530
+++ b/src/org/openbravo/erpCommon/security/Login.html Wed Dec 01 23:10:14
2010 +0000
@@ -252,7 +252,7 @@
}
catch (e) { }
- if ((!revisionControl('8958')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('9057')) || (isOpsInstance() !=
isOpsInstanceCached())) {
maskLoginWindow(cacheMsg);
setLoginMessage('Warning', '', cacheMsg);
}
diff -r cb6a144e18fd -r 39bec6c1ffae
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Wed Dec 01
14:55:25 2010 +0530
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Wed Dec 01
23:10:14 2010 +0000
@@ -126,7 +126,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('8958')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('9057')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert(cacheMsg);
}
diff -r cb6a144e18fd -r 39bec6c1ffae
web/html/en_US/StaticCommunityBranding-MyOB-Basic.html
--- a/web/html/en_US/StaticCommunityBranding-MyOB-Basic.html Wed Dec 01
14:55:25 2010 +0530
+++ b/web/html/en_US/StaticCommunityBranding-MyOB-Basic.html Wed Dec 01
23:10:14 2010 +0000
@@ -67,8 +67,8 @@
<div style="float: left; width: 270px; height: 92px; background-color:
#E6E6E6; -moz-border-radius-topleft: 10px; -moz-border-radius-bottomleft: 10px;
border-top-left-radius: 10px; border-bottom-left-radius: 10px; border-top: 1px
solid #D8D8D8; border-left: 1px solid #D8D8D8; border-bottom: 1px solid
#D8D8D8; margin-left: 10px;" id="LogoLeftCont">
<img src="img/LogoLeft_Pro.png" style="border: 0; margin: 6px 0px 0px
8px;" />
</div>
- <div style="float: left; height: 92px; width: 10px; background-color:
#E6E6E6; border-top: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;
font-size: 35px; font-weight: bold; text-align: center; font-family: arial,
sans-serif; color: #959595" id="LogoMiddleCont">
- <div style="margin-top: 25px; display: none;" id="LogoMiddleText">Go
Pro!</div>
+ <div style="float: left; height: 92px; width: 10px; background-color:
#E6E6E6; border-top: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;
font-size: 30px; font-weight: bold; text-align: center; font-family: arial,
sans-serif; color: #959595" id="LogoMiddleCont">
+ <div style="margin-top: 28px; display: none;" id="LogoMiddleText">Go
Pro!</div>
</div>
<div style="float: left; width: 66px; height: 92px; background-color:
#E6E6E6; -moz-border-radius-topright: 10px; -moz-border-radius-bottomright:
10px; border-top-right-radius: 10px; border-bottom-right-radius: 10px;
border-top: 1px solid #D8D8D8; border-right: 1px solid #D8D8D8; border-bottom:
1px solid #D8D8D8;" id="LogoRightCont">
<div style="width: 65px; height: 90px;">
diff -r cb6a144e18fd -r 39bec6c1ffae
web/html/en_US/StaticCommunityBranding-MyOB-Comm.html
--- a/web/html/en_US/StaticCommunityBranding-MyOB-Comm.html Wed Dec 01
14:55:25 2010 +0530
+++ b/web/html/en_US/StaticCommunityBranding-MyOB-Comm.html Wed Dec 01
23:10:14 2010 +0000
@@ -68,8 +68,8 @@
<div style="float: left; width: 270px; height: 92px; background-color:
#E6E6E6; -moz-border-radius-topleft: 10px; -moz-border-radius-bottomleft: 10px;
border-top-left-radius: 10px; border-bottom-left-radius: 10px; border-top: 1px
solid #D8D8D8; border-left: 1px solid #D8D8D8; border-bottom: 1px solid
#D8D8D8; margin-left: 10px;" id="LogoLeftCont">
<img src="img/LogoLeft_Basic.png" style="border: 0; margin: 6px 0px
0px 8px;" />
</div>
- <div style="float: left; height: 92px; width: 10px; background-color:
#E6E6E6; border-top: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;
font-size: 35px; font-weight: bold; text-align: center; font-family: arial,
sans-serif; color: #959595" id="LogoMiddleCont">
- <div style="margin-top: 25px; display: none;" id="LogoMiddleText">Get
Basic!</div>
+ <div style="float: left; height: 92px; width: 10px; background-color:
#E6E6E6; border-top: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;
font-size: 30px; font-weight: bold; text-align: center; font-family: arial,
sans-serif; color: #959595" id="LogoMiddleCont">
+ <div style="margin-top: 28px; display: none;" id="LogoMiddleText">Get
Basic!</div>
</div>
<div style="float: left; width: 66px; height: 92px; background-color:
#E6E6E6; -moz-border-radius-topright: 10px; -moz-border-radius-bottomright:
10px; border-top-right-radius: 10px; border-bottom-right-radius: 10px;
border-top: 1px solid #D8D8D8; border-right: 1px solid #D8D8D8; border-bottom:
1px solid #D8D8D8;" id="LogoRightCont">
<div style="width: 65px; height: 90px;">
diff -r cb6a144e18fd -r 39bec6c1ffae
web/html/en_US/StaticCommunityBranding-MyOB-STD.html
--- a/web/html/en_US/StaticCommunityBranding-MyOB-STD.html Wed Dec 01
14:55:25 2010 +0530
+++ b/web/html/en_US/StaticCommunityBranding-MyOB-STD.html Wed Dec 01
23:10:14 2010 +0000
@@ -68,7 +68,7 @@
<img src="img/LogoLeft_Pro.png" style="border: 0; margin: 6px 0px 0px
8px;" />
</div>
<div style="float: left; height: 92px; width: 10px; background-color:
#E6E6E6; border-top: 1px solid #D8D8D8; border-bottom: 1px solid #D8D8D8;
font-size: 30px; font-weight: bold; text-align: center; font-family: arial,
sans-serif; color: #959595" id="LogoMiddleCont">
- <div style="margin-top: 25px; display: none;" id="LogoMiddleText">ERP
for Life</div>
+ <div style="margin-top: 28px; display: none;" id="LogoMiddleText">ERP
for Life</div>
</div>
<div style="float: left; width: 66px; height: 92px; background-color:
#E6E6E6; -moz-border-radius-topright: 10px; -moz-border-radius-bottomright:
10px; border-top-right-radius: 10px; border-bottom-right-radius: 10px;
border-top: 1px solid #D8D8D8; border-right: 1px solid #D8D8D8; border-bottom:
1px solid #D8D8D8;" id="LogoRightCont">
<div style="width: 65px; height: 90px;">
diff -r cb6a144e18fd -r 39bec6c1ffae
web/html/en_US/StaticCommunityBranding-MyOB.js
--- a/web/html/en_US/StaticCommunityBranding-MyOB.js Wed Dec 01 14:55:25
2010 +0530
+++ b/web/html/en_US/StaticCommunityBranding-MyOB.js Wed Dec 01 23:10:14
2010 +0000
@@ -100,13 +100,13 @@
}
LogoMiddleCont.style.width = LogoMiddleCont_style_width;
- if (LogoMiddleCont.clientWidth > 180) {
+ var minimumLogoMiddleContWidth =
(document.getElementById('LogoMiddleText').innerHTML.length * 13) + 20;
+ if (LogoMiddleCont.clientWidth > minimumLogoMiddleContWidth) {
document.getElementById('LogoMiddleText').style.display = '';
} else {
document.getElementById('LogoMiddleText').style.display = 'none';
}
}
-
var step = 1;
var timerDown;
var timerUp;
diff -r cb6a144e18fd -r 39bec6c1ffae web/js/utils.js
--- a/web/js/utils.js Wed Dec 01 14:55:25 2010 +0530
+++ b/web/js/utils.js Wed Dec 01 23:10:14 2010 +0000
@@ -95,7 +95,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 = '8958';
+ var number = '9057';
return number;
}
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
