details: /erp/devel/pi/rev/52521d0840b5
changeset: 9421:52521d0840b5
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Dec 27 15:36:55 2010 +0100
summary: [grid][style] Small fix in style code
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 4 +---
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 9 ++++++---
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css
| 8 +-------
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
| 1 -
4 files changed, 8 insertions(+), 14 deletions(-)
diffs (89 lines):
diff -r a54517e0a3f5 -r 52521d0840b5
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Mon Dec 27 15:02:44 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Mon Dec 27 15:36:55 2010 +0100
@@ -103,9 +103,7 @@
if (field.summaryFunction === "sum" && this.summaryRowStyle_sum) {
return this.summaryRowStyle_sum;
} else if (field.summaryFunction === "avg" && this.summaryRowStyle_avg) {
- return this.summaryRowStyle_avg;
- } else if (this.summaryRowStyle_other) {
- return this.summaryRowStyle_other;
+ return this.summaryRowStyle_avg
} else {
return this.summaryRowStyle;
}
diff -r a54517e0a3f5 -r 52521d0840b5
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Mon Dec 27 15:02:44 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Mon Dec 27 15:36:55 2010 +0100
@@ -185,7 +185,6 @@
initWidget: function(){
var thisGrid = this, localEditLinkField;
- this.baseStyle = this.baseStyleView;
if (this.editGrid) {
// add the edit pencil in the beginning
localEditLinkField = isc.addProperties({}, this.editLinkFieldProperties);
@@ -737,7 +736,9 @@
},
showInlineEditor: function(rowNum, colNum, newCell, newRow, suppressFocus){
- this.baseStyle = this.baseStyleEdit;
+ if (this.baseStyleEdit) {
+ this.baseStyle = this.baseStyleEdit;
+ }
var result = this.Super('showInlineEditor', arguments);
var record = this.getRecord(rowNum);
@@ -750,7 +751,9 @@
hideInlineEditor: function(){
isc.Log.logDebug('hideInlineEditor ' + this.getEditRow(), 'OB');
- this.baseStyle = this.baseStyleView;
+ if (this.baseStyleView) {
+ this.baseStyle = this.baseStyleView;
+ }
var rowNum = this.getEditRow();
var record = this.getRecord(rowNum);
var editColumnLayout = record.editColumnLayout;
diff -r a54517e0a3f5 -r 52521d0840b5
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css
Mon Dec 27 15:02:44 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css
Mon Dec 27 15:36:55 2010 +0100
@@ -143,14 +143,12 @@
}
.OBGridSummaryCell div,
-.OBGridSummaryCell_other div,
.OBGridSummaryCell_sum div,
.OBGridSummaryCell_avg div {
width: auto !important;
}
.OBGridSummaryCell,
-.OBGridSummaryCell_other,
.OBGridSummaryCell_sum,
.OBGridSummaryCell_avg {
font-family: arial, sans-serif;
@@ -160,11 +158,7 @@
background-color: #ffffff;
}
-.OBGridSummaryCell, {
- padding: 0px 0px 0px 0px;
-}
-
-.OBGridSummaryCell_other {
+.OBGridSummaryCell {
padding: 0px 4px 0px 4px;
}
diff -r a54517e0a3f5 -r 52521d0840b5
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
Mon Dec 27 15:02:44 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
Mon Dec 27 15:36:55 2010 +0100
@@ -41,7 +41,6 @@
},
summaryRowHeight: 22,
summaryRowStyle: "OBGridSummaryCell",
- summaryRowStyle_other: "OBGridSummaryCell_other",
summaryRowStyle_sum: "OBGridSummaryCell_sum",
summaryRowStyle_avg: "OBGridSummaryCell_avg"
});
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
