details: /erp/devel/pi/rev/ec660802c30c
changeset: 12350:ec660802c30c
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon May 23 14:48:52 2011 +0200
summary: Fixes issue 16569: OPTIMIZE-02: Level Awareness
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 2 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 13 ++++++++++
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, 24 insertions(+), 0 deletions(-)
diffs (78 lines):
diff -r 88ee74b1c5de -r ec660802c30c
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Mon May 23 13:35:50 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Mon May 23 14:48:52 2011 +0200
@@ -670,6 +670,7 @@
this.activeBar.setActive(true);
this.setViewFocus();
this.viewGrid.setActive(true);
+ this.viewGrid.markForRedraw();
// if we are in form view
if (this.isShowingForm && !this.viewForm.isNew) {
this.setTargetRecordInWindow(this.viewGrid.getSelectedRecord().id);
@@ -683,6 +684,7 @@
this.statusBar.setActive(false);
this.activeBar.setActive(false);
this.viewGrid.setActive(false);
+ this.viewGrid.markForRedraw();
// note we can not check on viewForm visibility as
// the grid and form can both be hidden when changing
// to another tab, this handles the case that the grid
diff -r 88ee74b1c5de -r ec660802c30c
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 May 23 13:35:50 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Mon May 23 14:48:52 2011 +0200
@@ -1502,6 +1502,19 @@
this.view.toolBar.updateButtonState(true);
},
+ getCellStyle: function (record, rowNum, colNum) {
+ // inactive, selected
+ if (record && record[this.recordCustomStyleProperty] !== null) {
+ return record[this.recordCustomStyleProperty];
+ }
+
+ if (!this.view.isActiveView() && record[this.selection.selectionProperty])
{
+ return this.recordStyleSelectedViewInActive;
+ }
+
+ return this.Super('getCellStyle', arguments);
+ },
+
discardEdits: function(rowNum, colNum, dontHideEditor, editCompletionEvent,
preventConfirm){
var localArguments = arguments;
var me = this, record = this.getRecord(rowNum);
diff -r 88ee74b1c5de -r ec660802c30c
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 May 23 13:35:50 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css
Mon May 23 14:48:52 2011 +0200
@@ -36,6 +36,9 @@
.OBGridCellDisabled,
.OBGridCellDisabledDark,
+.OBGridCellSelectedViewInactive,
+.OBGridCellSelectedViewInactiveDark,
+
.OBGridCellEdit,
.OBGridCellEditOver,
.OBGridCellEditDark,
@@ -119,6 +122,11 @@
background-color: #ffe1c0; /* Orange for active grid, for non active grid:
#b8d587 */
}
+.OBGridCellSelectedViewInactive,
+.OBGridCellSelectedViewInactiveDark {
+ background-color: #e1e1e1;
+}
+
.OBGridCellEditSelected,
.OBGridCellEditSelectedDark {
background-color: #ffe1c0;
diff -r 88ee74b1c5de -r ec660802c30c
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 May 23 13:35:50 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
Mon May 23 14:48:52 2011 +0200
@@ -24,6 +24,7 @@
baseStyle: 'OBGridCell',
baseStyleEdit: 'OBGridCellEdit', // for use in ob-view-grid.js while editing
a cell
recordStyleError: 'OBGridCellError',
+ recordStyleSelectedViewInActive: 'OBGridCellSelectedViewInactive',
headerBaseStyle: 'OBGridHeaderCell',
headerBarStyle: 'OBGridHeaderBar',
headerTitleStyle: 'OBGridHeaderCellTitle',
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
