details: /erp/devel/pi/rev/65005626e337
changeset: 8947:65005626e337
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Nov 17 15:39:32 2010 +0100
summary: [login] Added 5px margin between text and logo
details: /erp/devel/pi/rev/3b0ba2e87b30
changeset: 8948:3b0ba2e87b30
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Nov 17 15:40:49 2010 +0100
summary: Homogenous button click and focus behavior in FF, IE and Chrome
diffstat:
src/org/openbravo/erpCommon/security/Login.html | 2 +-
src/org/openbravo/erpCommon/security/Login_F1.html | 2 +-
web/js/utils.js | 2 +-
web/js/windowKeyboard.js | 22 +++++++++++++++++++++-
web/skins/Default/Openbravo_ERP_250.css | 2 ++
5 files changed, 26 insertions(+), 4 deletions(-)
diffs (98 lines):
diff -r 17ec9d29412d -r 3b0ba2e87b30
src/org/openbravo/erpCommon/security/Login.html
--- a/src/org/openbravo/erpCommon/security/Login.html Wed Nov 17 13:45:03
2010 +0100
+++ b/src/org/openbravo/erpCommon/security/Login.html Wed Nov 17 15:40:49
2010 +0100
@@ -193,7 +193,7 @@
enableShortcuts('edition');
setWindowElementFocus('user', 'id');
- if ((!revisionControl('8847')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('8947')) || (isOpsInstance() !=
isOpsInstanceCached())) {
setLoginMessage('Warning', cacheMsg);
}
diff -r 17ec9d29412d -r 3b0ba2e87b30
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Wed Nov 17
13:45:03 2010 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Wed Nov 17
15:40:49 2010 +0100
@@ -126,7 +126,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('8847')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('8947')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert(cacheMsg);
}
diff -r 17ec9d29412d -r 3b0ba2e87b30 web/js/utils.js
--- a/web/js/utils.js Wed Nov 17 13:45:03 2010 +0100
+++ b/web/js/utils.js Wed Nov 17 15:40:49 2010 +0100
@@ -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 = '8847';
+ var number = '8947';
return number;
}
diff -r 17ec9d29412d -r 3b0ba2e87b30 web/js/windowKeyboard.js
--- a/web/js/windowKeyboard.js Wed Nov 17 13:45:03 2010 +0100
+++ b/web/js/windowKeyboard.js Wed Nov 17 15:40:49 2010 +0100
@@ -182,11 +182,21 @@
while(obj.tagName != 'SELECT') obj = obj.parentNode;
}
+ if (obj.tagName == 'TD') { /* To check if clicked TD is part of a Button */
+ try {
+ var parentOfTable =
getObjParent(getObjParent(getObjParent(getObjParent(obj))));
+ if (parentOfTable.tagName == 'BUTTON') {
+ obj = parentOfTable;
+ }
+ }
+ catch (e) { }
+ }
+
if (checkGenericTree(obj)) {
return true;
}
- cursorFocus(obj, 'onmousedown');
+ cursorFocus(obj, 'onmousedown');
if (obj.tagName == 'SELECT') {
comboKeyBehaviour(obj,'onmousedown');
@@ -206,6 +216,16 @@
while(obj.tagName != 'SELECT') obj = obj.parentNode;
}
+ if (obj.tagName == 'TD') { /* To check if clicked TD is part of a Button */
+ try {
+ var parentOfTable =
getObjParent(getObjParent(getObjParent(getObjParent(obj))));
+ if (parentOfTable.tagName == 'BUTTON') {
+ obj = parentOfTable;
+ }
+ }
+ catch (e) { }
+ }
+
if (checkGenericTree(obj)) {
return true;
}
diff -r 17ec9d29412d -r 3b0ba2e87b30 web/skins/Default/Openbravo_ERP_250.css
--- a/web/skins/Default/Openbravo_ERP_250.css Wed Nov 17 13:45:03 2010 +0100
+++ b/web/skins/Default/Openbravo_ERP_250.css Wed Nov 17 15:40:49 2010 +0100
@@ -5599,6 +5599,7 @@
.Login_BottomLogos_SupportLogo_Text {
text-align: center;
+ margin-bottom: 5px;
}
.Login_BottomLogos_SupportLogo_Logo_Container {
@@ -5613,6 +5614,7 @@
.Login_BottomLogos_ForgeLogo_Text {
text-align: center;
+ margin-bottom: 5px;
}
.Login_BottomLogos_ForgeLogo_Logo_Container {
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
