details: /erp/devel/pi/rev/b5ce9e2929fd
changeset: 11818:b5ce9e2929fd
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Mon May 02 10:48:39 2011 +0200
summary: Issue 16608: Changed UI definition of date and number to half size
details: /erp/devel/pi/rev/05ebdc0d568f
changeset: 11819:05ebdc0d568f
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Mon May 02 10:49:21 2011 +0200
summary: Fixes issue 16608: Reduce the width of date and number fields to
half size
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 95 ++++++++-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
| 2 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java
| 13 +
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java
| 17 +-
4 files changed, 108 insertions(+), 19 deletions(-)
diffs (277 lines):
diff -r b04aa00321fa -r 05ebdc0d568f
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
Mon May 02 10:25:37 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
Mon May 02 10:49:21 2011 +0200
@@ -4,15 +4,15 @@
* Version 1.1 (the "License"), being the Mozilla Public License
* Version 1.1 with a permitted attribution clause; you may not use this
* file except in compliance with the License. You may obtain a copy of
- * the License at http://www.openbravo.com/legal/license.html
+ * the License at http://www.openbravo.com/legal/license.html
* Software distributed under the License is distributed on an "AS IS"
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
* License for the specific language governing rights and limitations
- * under the License.
- * The Original Code is Openbravo ERP.
- * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
- * All Rights Reserved.
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
*/
@@ -46,7 +46,6 @@
.OBFormFieldError {
font-family: 'lucida sans', sans-serif;
padding: 4px 8px 4px 8px;
- /*width: 100%;*/
}
.OBFormFieldLabel,
@@ -108,11 +107,50 @@
.OBFormFieldDateInputDisabled,
.OBFormFieldDateInputFocused,
.OBFormFieldDateInputError,
-.OBFormFieldDateInputHint {
- font-family: arial, sans-serif;
+.OBFormFieldDateInputHint,
+
+.OBFormFieldNumberInput,
+.OBFormFieldNumberDisabled,
+.OBFormFieldNumberFocused,
+.OBFormFieldNumberError,
+.OBFormFieldNumberHint,
+
+.OBFormFieldDateInputRequired,
+.OBFormFieldDateInputRequiredFocused,
+.OBFormFieldDateInputRequiredDisabled,
+.OBFormFieldDateInputRequiredError,
+.OBFormFieldDateInputRequiredHint {
+ font-family: arial, sans-serif;
font-size: 12px;
padding: 2px 2px 0px 2px;
- /*width: 100%;*/
+}
+
+.OBFormFieldDateInputRequired,
+.OBFormFieldDateInputRequiredFocused,
+.OBFormFieldDateInputRequiredDisabled,
+.OBFormFieldDateInputRequiredError,
+.OBFormFieldDateInputRequiredHint,
+
+.OBFormFieldDateInput,
+.OBFormFieldDateInputDisabled,
+.OBFormFieldDateInputFocused,
+.OBFormFieldDateInputError,
+.OBFormFieldDateInputHint {
+ width: 100%;
+}
+
+.OBFormFieldNumberInput,
+.OBFormFieldNumberInputDisabled,
+.OBFormFieldNumberInputFocused,
+.OBFormFieldNumberInputError,
+.OBFormFieldNumberInputHint,
+
+.OBFormFieldNumberInputRequired,
+.OBFormFieldNumberInputRequiredDisabled,
+.OBFormFieldNumberInputRequiredFocused,
+.OBFormFieldNumberInputRequiredError,
+.OBFormFieldNumberInputRequiredHint {
+ width: 50%;
}
.OBFormFieldStatic,
@@ -150,7 +188,19 @@
.OBFormFieldDateInput,
.OBFormFieldDateInputFocused,
.OBFormFieldDateInputError,
-.OBFormFieldDateInputHint {
+.OBFormFieldDateInputHint,
+
+.OBFormFieldNumberInput,
+.OBFormFieldNumberInputDisabled,
+.OBFormFieldNumberInputFocused,
+.OBFormFieldNumberInputError,
+.OBFormFieldNumberInputHint,
+
+.OBFormFieldNumberInputRequired,
+.OBFormFieldNumberInputRequiredDisabled,
+.OBFormFieldNumberInputRequiredFocused,
+.OBFormFieldNumberInputRequiredError,
+.OBFormFieldNumberInputRequiredHint {
border: 1px solid #cdd7bb;
background-color: #F5F7F1;
color: #333333;
@@ -164,6 +214,7 @@
.OBFormFieldInputRequiredDisabled,
.OBFormFieldSelectInputRequiredDisabled,
.OBFormFieldDateInputRequiredDisabled,
+.OBFormFieldNumberInputRequiredDisabled,
.OBFormFieldInputDisabled,
.OBFormFieldSelectInputDisabled,
.OBFormFieldDateInputDisabled {
@@ -185,7 +236,6 @@
.OBFormFieldDateInputError,
.OBFormFieldDateInputHint {
margin-right: -6px;
- /*height: 17px !important;*/
}
.OBFormFieldSelectControl,
@@ -196,12 +246,12 @@
font-family: arial, sans-serif;
font-size: 12px;
color: #333;
- /*width: 100%;*/
border: 0px 0px 0px 0px;
}
.OBFormFieldInputRequiredError,
.OBFormFieldDateInputRequiredError,
+.OBFormFieldNumberInputRequiredError,
.OBFormFieldInputError,
.OBFormFieldSelectInputError,
.OBFormFieldDateInputError,
@@ -238,6 +288,9 @@
.OBFormFieldDateInputRequired:focus,
.OBFormFieldDateInputRequiredFocused,
.OBFormFieldDateInputRequiredSelectedFocused,
+.OBFormFieldNumberInputRequired:focus,
+.OBFormFieldNumberInputRequiredFocused,
+.OBFormFieldNumberInputRequiredSelectedFocused,
.OBFormFieldInput:focus,
.OBFormFieldInputFocused,
@@ -247,7 +300,10 @@
.OBFormFieldSelectInput:focus,
.OBFormFieldDateInput:focus,
.OBFormFieldDateInputFocused,
-.OBFormFieldDateInputSelectedFocused {
+.OBFormFieldDateInputSelectedFocused
+.OBFormFieldNumberInput:focus,
+.OBFormFieldNumberInputFocused,
+.OBFormFieldNumberInputSelectedFocused {
-moz-outline-offset: -1;
outline-offset: -1;
border: 1px solid #fa962f;
@@ -271,6 +327,7 @@
.OBFormFieldInputRequiredHint,
.OBFormFieldSelectInputRequiredHint,
.OBFormFieldDateInputRequiredHint,
+.OBFormFieldNumberInputRequiredHint,
.OBFormFieldInputHint,
.OBFormFieldSelectInputHint,
.OBFormFieldDateInputHint {
@@ -306,7 +363,6 @@
.OBFormFieldPickListCellSelectedFocused,
.OBFormFieldPickListCellSelectedDark {
background-color: #ddf0ff;
- //background: url(./images/form/picklist-rollover.png) repeat-x scroll;
}
.OBFormFieldInputRequired,
@@ -322,7 +378,12 @@
.OBFormFieldDateInputRequired,
.OBFormFieldDateInputRequiredFocused,
.OBFormFieldDateInputRequiredError,
-.OBFormFieldDateInputRequiredHint {
+.OBFormFieldDateInputRequiredHint,
+
+.OBFormFieldNumberInputRequired,
+.OBFormFieldNumberInputRequiredFocused,
+.OBFormFieldNumberInputRequiredError,
+.OBFormFieldNumberInputRequiredHint {
background-color: #ffffcc;
}
@@ -366,7 +427,7 @@
.OBDateChooserWeekendSelectedOver,
.OBDateChooserWeekendSelectedDown,
.OBDateChooserWeekendDisabled {
- font-family: arial, sans-serif;
+ font-family: 'lucida sans', sans-serif;
font-size: 12px;
background-color: transparent;
color: #333333;
diff -r b04aa00321fa -r 05ebdc0d568f
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
Mon May 02 10:25:37 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
Mon May 02 10:49:21 2011 +0200
@@ -243,7 +243,7 @@
isc.OBNumberItem.addProperties({
cellStyle: 'OBFormField',
titleStyle: 'OBFormFieldLabel',
- textBoxStyle: 'OBFormFieldInput',
+ textBoxStyle: 'OBFormFieldNumberInput',
errorOrientation: 'left'
});
diff -r b04aa00321fa -r 05ebdc0d568f
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java
Mon May 02 10:25:37 2011 +0200
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java
Mon May 02 10:49:21 2011 +0200
@@ -21,6 +21,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import org.codehaus.jettison.json.JSONObject;
import org.openbravo.base.exception.OBException;
import org.openbravo.base.model.domaintype.PrimitiveDomainType;
import org.openbravo.client.kernel.RequestContext;
@@ -66,6 +67,18 @@
return ", filterOnKeypress: true" + super.getFilterEditorProperties(field);
}
+ @Override
+ public String getFieldProperties(Field field) {
+ String fieldProperties = super.getFieldProperties(field);
+ try {
+ JSONObject o = new JSONObject(fieldProperties);
+ o.put("width", "50%");
+ return o.toString();
+ } catch (Exception e) { // ignore
+ return fieldProperties;
+ }
+ }
+
private SimpleDateFormat getClassicFormat() {
String pattern =
RequestContext.get().getSessionAttribute("#AD_JAVADATEFORMAT").toString();
if (dateFormat == null || !pattern.equals(lastUsedPattern)) {
diff -r b04aa00321fa -r 05ebdc0d568f
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java
Mon May 02 10:25:37 2011 +0200
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java
Mon May 02 10:49:21 2011 +0200
@@ -99,6 +99,18 @@
}
@Override
+ public String getFieldProperties(Field field) {
+ String fieldProperties = super.getFieldProperties(field);
+ try {
+ JSONObject o = new JSONObject(fieldProperties);
+ o.put("width", "50%");
+ return o.toString();
+ } catch (Exception e) { // ignore
+ return fieldProperties;
+ }
+ }
+
+ @Override
public String getFieldProperties(Field field, boolean getValueFromSession) {
try {
// If a column has a numeric reference, and is required, and doesn't
have a default, then
@@ -108,9 +120,12 @@
final JSONObject jsonObject = new JSONObject();
jsonObject.put("value", 0);
jsonObject.put("classicValue", 0);
+ jsonObject.put("width", "50%");
return jsonObject.toString();
}
- return new JSONObject(super.getFieldProperties(field,
getValueFromSession)).toString();
+ JSONObject o = new JSONObject(super.getFieldProperties(field,
getValueFromSession));
+ o.put("width", "50%");
+ return o.toString();
} catch (JSONException e) {
throw new OBException(e);
}
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
