details: /erp/devel/pi/rev/0cc82d06c927
changeset: 9808:0cc82d06c927
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Jan 14 09:57:57 2011 +0100
summary: Only display first callout message in messagebar
details: /erp/devel/pi/rev/7ad5d94ceb3b
changeset: 9809:7ad5d94ceb3b
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Jan 14 09:58:39 2011 +0100
summary: Changed readonly styling of OBSearchItem and OBSelectorLinkItem
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
|
5 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 17 ++++++++++
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 6 +-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.userinterface.selector/ob-selector-item-styles.js
| 6 +++
5 files changed, 30 insertions(+), 6 deletions(-)
diffs (122 lines):
diff -r 0e7ed1458d1f -r 7ad5d94ceb3b
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Fri Jan 14 07:58:28 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Fri Jan 14 09:58:39 2011 +0100
@@ -221,9 +221,10 @@
}
}
}
- if (calloutMessages && calloutMessages.length > 0) {
+ // apparently sometimes an empty string is returned
+ if (calloutMessages && calloutMessages.length > 0 && calloutMessages[0]
!== '') {
// TODO: check as what type should call out messages be displayed
- this.view.messageBar.setMessage(isc.OBMessageBar.TYPE_INFO, null,
calloutMessages);
+ this.view.messageBar.setMessage(isc.OBMessageBar.TYPE_INFO, null,
calloutMessages[0]);
}
if (auxInputs) {
this.auxInputs = {};
diff -r 0e7ed1458d1f -r 7ad5d94ceb3b
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
Fri Jan 14 07:58:28 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
Fri Jan 14 09:58:39 2011 +0100
@@ -94,7 +94,7 @@
isc.OBSearchItem.addProperties({
cellStyle: 'OBFormField',
titleStyle: 'OBFormFieldLabel',
- textBoxStyle: 'OBFormFieldInput',
+ textBoxStyle: 'OBFormFieldStatic',
pickerIconHeight: 21,
pickerIconWidth: 21,
height: 21,
diff -r 0e7ed1458d1f -r 7ad5d94ceb3b
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
Fri Jan 14 07:58:28 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
Fri Jan 14 09:58:39 2011 +0100
@@ -66,6 +66,12 @@
color: #acacac;
}
+.OBFormFieldStatic,
+.OBFormFieldStaticDisabled,
+.OBFormFieldStaticFocused,
+.OBFormFieldStaticError,
+.OBFormFieldStaticHint,
+
.OBFormFieldInput,
.OBFormFieldInputDisabled,
.OBFormFieldInputFocused,
@@ -90,6 +96,13 @@
/*width: 100%;*/
}
+.OBFormFieldStatic,
+.OBFormFieldStaticFocused,
+.OBFormFieldStaticError,
+.OBFormFieldStaticHint {
+ color: #333333;
+}
+
.OBFormFieldInput,
.OBFormFieldInputFocused,
.OBFormFieldInputError,
@@ -109,6 +122,10 @@
color: #333333;
}
+.OBFormFieldStaticDisabled {
+ color: #acacac;
+}
+
.OBFormFieldInputDisabled,
.OBFormFieldSelectInputDisabled,
.OBFormFieldDateInputDisabled {
diff -r 0e7ed1458d1f -r 7ad5d94ceb3b
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
---
a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
Fri Jan 14 07:58:28 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
Fri Jan 14 09:58:39 2011 +0100
@@ -336,7 +336,7 @@
item.openSelectorWindow();
}
}];
-
+
if (this.disabled) {
// TODO: disable, remove icons
this.icons = null;
@@ -356,7 +356,7 @@
});
}
- return this.Super('init', arguments);
+ return this.Super('init', arguments);
},
setValueFromGrid: function(record){
@@ -441,7 +441,7 @@
isc.OBSelectorLinkItem.addProperties({
canFocus: true,
-
+
setValue: function(value){
var ret = this.Super('setValue', arguments);
// in this case the clearIcon needs to be shown or hidden
diff -r 0e7ed1458d1f -r 7ad5d94ceb3b
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.userinterface.selector/ob-selector-item-styles.js
---
a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.userinterface.selector/ob-selector-item-styles.js
Fri Jan 14 07:58:28 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.userinterface.selector/ob-selector-item-styles.js
Fri Jan 14 09:58:39 2011 +0100
@@ -44,6 +44,9 @@
});
isc.OBSelectorItem.addProperties({
+ cellStyle: 'OBFormField',
+ titleStyle: 'OBFormFieldLabel',
+ textBoxStyle: 'OBFormFieldInput',
newTabIconSrc:
'[SKINIMG]../../org.openbravo.client.application/images/form/ico-to-new-tab.png',
newTabIconSize: 8,
@@ -53,6 +56,9 @@
});
isc.OBSelectorLinkItem.addProperties({
+ cellStyle: 'OBFormField',
+ titleStyle: 'OBFormFieldLabel',
+ textBoxStyle: 'OBFormFieldStatic',
newTabIconSrc:
'[SKINIMG]../../org.openbravo.client.application/images/form/ico-to-new-tab.png',
newTabIconSize: 8,
pickerIconHeight: 21,
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
