details: /erp/devel/pi/rev/9685a3560779
changeset: 9105:9685a3560779
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Dec 13 18:39:10 2010 +0100
summary: [grid][style] - Added cells and header OB styles
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 5 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeaderMenuButton.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Disabled.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Down.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Over.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Selected.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Selected_Down.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Selected_Over.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_sortAscending.gif
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_sortDescending.gif
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 5 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.css
| 112 ++++++++++
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-grid-styles.js
| 56 ++++-
14 files changed, 173 insertions(+), 5 deletions(-)
diffs (281 lines):
diff -r 354ce81fe5da -r 9685a3560779
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 13 18:29:33 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Mon Dec 13 18:39:10 2010 +0100
@@ -167,6 +167,7 @@
initWidget: function(){
var thisGrid = this, localEditLinkField;
+ this.tallBaseStyle = this.tallBaseStyleView;
if (this.editGrid) {
// add the edit pencil in the beginning
localEditLinkField = isc.addProperties({}, this.editLinkFieldProperties);
@@ -635,6 +636,7 @@
},
showInlineEditor: function(rowNum, colNum, newCell, newRow, suppressFocus){
+ this.tallBaseStyle = this.tallBaseStyleEdit;
var result = this.Super('showInlineEditor', arguments);
var record = this.getRecord(rowNum);
@@ -646,6 +648,7 @@
},
hideInlineEditor: function(){
+ this.tallBaseStyle = this.tallBaseStyleView;
isc.Log.logDebug('hideInlineEditor ' + this.getEditRow(), 'OB');
var rowNum = this.getEditRow();
var record = this.getRecord(rowNum);
@@ -735,7 +738,7 @@
buttonSeparator2 = isc.OBGridToolStripSeparator.create({});
this.OBGridToolStrip = isc.OBGridToolStrip.create({
- members: [editIcon, buttonSeparator1, formIcon, cancelIcon,
buttonSeparator2, saveIcon]
+ members: [formIcon, buttonSeparator1, editIcon, cancelIcon,
buttonSeparator2, saveIcon]
});
this.addMember(this.OBGridToolStrip);
diff -r 354ce81fe5da -r 9685a3560779
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeaderMenuButton.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeaderMenuButton.png
has changed
diff -r 354ce81fe5da -r 9685a3560779
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg.png
has changed
diff -r 354ce81fe5da -r 9685a3560779
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Disabled.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Disabled.png
has changed
diff -r 354ce81fe5da -r 9685a3560779
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Down.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Down.png
has changed
diff -r 354ce81fe5da -r 9685a3560779
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Over.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Over.png
has changed
diff -r 354ce81fe5da -r 9685a3560779
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Selected.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Selected.png
has changed
diff -r 354ce81fe5da -r 9685a3560779
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Selected_Down.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Selected_Down.png
has changed
diff -r 354ce81fe5da -r 9685a3560779
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Selected_Over.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_bg_Selected_Over.png
has changed
diff -r 354ce81fe5da -r 9685a3560779
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_sortAscending.gif
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_sortAscending.gif
has changed
diff -r 354ce81fe5da -r 9685a3560779
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_sortDescending.gif
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/images/grid/gridHeader_sortDescending.gif
has changed
diff -r 354ce81fe5da -r 9685a3560779
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 Dec 13 18:29:33 2010 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
Mon Dec 13 18:39:10 2010 +0100
@@ -41,7 +41,7 @@
.OBFormFieldLabelFocused {
font-family: 'lucida sans',sans-serif;
font-size: 11px;
- color: #333333;
+ color: #333333;
font-weight: bold;
}
@@ -57,10 +57,11 @@
.OBFormFieldSelectInputDisabled {
padding: 2px;
border: 1px solid #cdd7bb;
- background: #fff;
+ background-color: #F5F7F1;
color: #333333;
font-family: arial, sans-serif;
font-size: 12px;
+ line-height: normal;
width: 100%;
}
diff -r 354ce81fe5da -r 9685a3560779
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 13 18:29:33 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 13 18:39:10 2010 +0100
@@ -23,4 +23,116 @@
}
.OBGridToolStripIcon {
+}
+
+.OBGridCell,
+.OBGridCellOver,
+.OBGridCellDark,
+.OBGridCellOverDark,
+.OBGridCellSelected,
+.OBGridCellSelectedDark,
+.OBGridCellSelectedOver,
+.OBGridCellSelectedOverDark,
+.OBGridCellDisabled,
+.OBGridCellDisabledDark,
+
+.OBGridCellEdit,
+.OBGridCellEditOver,
+.OBGridCellEditDark,
+.OBGridCellEditOverDark,
+.OBGridCellEditSelected,
+.OBGridCellEditSelectedDark,
+.OBGridCellEditSelectedOver,
+.OBGridCellEditSelectedOverDark,
+.OBGridCellEditDisabled,
+.OBGridCellEditDisabledDark {
+ font-family: arial, sans-serif;
+ vertical-align: middle;
+ border-right: 1px solid #cdd7bb;
+ border-bottom: 1px solid #cdd7bb;
+/* margin: 0px; */
+ padding: 0px 4px 0px 4px;
+}
+
+.OBGridCellEditSelected,
+.OBGridCellEditSelectedDark,
+.OBGridCellEditSelectedOver,
+.OBGridCellEditSelectedOverDark {
+ padding: 0px 0px 0px 0px;
+}
+
+.OBGridCellDark,
+.OBGridCellEditDark {
+ background-color: #f5f5f5;
+}
+
+.OBGridCellOver,
+.OBGridCellOverDark,
+.OBGridCellEditOver,
+.OBGridCellEditOverDark {
+ background-color: #ffe1c0; /* Orange for active grid, for non active grid:
#dbe6c7 */
+}
+
+.OBGridCellSelected,
+.OBGridCellSelectedDark {
+ background-color: #ffba6e; /* Orange for active grid, for non active grid:
#b8d587 */
+}
+
+.OBGridCellEditSelected,
+.OBGridCellEditSelectedDark {
+ background-color: #e1e1e1;
+}
+
+.OBGridCellSelectedOver,
+.OBGridCellSelectedOverDark {
+ background-color: #ffba6e;
+}
+
+.OBGridCellEditSelectedOver,
+.OBGridCellEditSelectedOverDark {
+ background-color: #e1e1e1;
+}
+
+.OBGridFilterCell {
+ /* border-top: 1px solid #b2b5b0 */
+ border-left: 1px solid #b2b5b0; /*#BBBFB6*/;
+ background-repeat: repeat-x;
+ background-position: left top;
+ background-color: #CDD7BB;
+ vertical-align: middle;
+}
+
+.OBGridFilterBase {
+ border-top: 1px solid #b2b5b0;
+}
+
+
+.OBGridHeaderCellTitle,
+.OBGridHeaderCellTitleOver,
+.OBGridHeaderCellTitleDown,
+.OBGridHeaderCellTitleSelected,
+.OBGridHeaderCellTitleSelectedOver,
+.OBGridHeaderCellTitleSelectedDown,
+.OBGridHeaderCellTitleDisabled,
+.OBGridHeaderCellTitleSelectedDisabled {
+ font-size: 11px;
+ font-family: 'lucida sans', sans-serif;
+ font-weight: bold;
+ /* border-top: 1px solid #BBBFB6;*/
+ border-right: 1px solid #BBBFB6;
+ text-align: center;
+ background: none;
+}
+
+.OBGridHeaderBar {
+ background-repeat: repeat-x;
+ background-position: left -22px;
+ background-color: #FFFFFF;
+ border-bottom: 1px solid #BBBFB6;
+}
+
+.OBGridHeaderCell {
+ background-image: none;
+ background: none;
+ background-color: #ECEEE9;
}
\ No newline at end of file
diff -r 354ce81fe5da -r 9685a3560779
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 13 18:29:33 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 13 18:39:10 2010 +0100
@@ -17,13 +17,65 @@
************************************************************************
*/
+isc.ClassFactory.defineClass('OBGridHeaderImgButton', isc.ImgButton);
+
+isc.OBGridHeaderImgButton.addProperties({
+ showFocused: false,
+ showRollOver: false,
+ showFocusedAsOver: false,
+ showDown: false
+});
// Styling properties for main grid shown in a standard view
isc.OBViewGrid.addProperties({
+ tallBaseStyleView: 'OBGridCell',
+ tallBaseStyleEdit: 'OBGridCellEdit',
+ headerBaseStyle: 'OBGridHeaderCell',
+ headerBarStyle: 'OBGridHeaderBar',
+ headerTitleStyle: 'OBGridHeaderCellTitle',
+ cellPadding: 0, /* Set in the CSS */
+ cellHeight: 22,
+
sortAscendingImage:{src:'[SKIN]/../../../org.openbravo.client.application/images/grid/gridHeader_sortAscending.gif',
width:7, height:11},
+
sortDescendingImage:{src:'[SKIN]/../../../org.openbravo.client.application/images/grid/gridHeader_sortDescending.gif',
width:7, height:11},
+ headerMenuButtonConstructor: 'OBGridHeaderImgButton',
+ headerMenuButtonWidth: 17,
+ headerMenuButtonSrc:
'[SKIN]/../../org.openbravo.client.application/images/grid/gridHeaderMenuButton.png',
hoverWidth: 200,
- editLinkColumnWidth: 60
+ editLinkColumnWidth: 58
});
+
+isc.OBViewGrid.changeDefaults('filterEditorDefaults', {
+ height: 22,
+ styleName: 'OBGridFilterBase',
+ baseStyle: 'OBGridFilterCell'
+});
+
+
+isc.OBViewGrid.changeDefaults('sorterDefaults', {
+ // baseStyle / titleStyle is auto-assigned from headerBaseStyle
+ showFocused: false,
+// src: '[SKIN]ListGrid/header.png',
+ src:
'[SKIN]/../../org.openbravo.client.application/images/grid/gridHeader_bg.png',
+ baseStyle: 'OBGridSorterButton'
+});
+
+isc.OBViewGrid.changeDefaults('headerButtonDefaults', {
+ showTitle: true,
+ showDown: true,
+ showFocused: false,
+ // baseStyle / titleStyle is auto-assigned from headerBaseStyle
+ src:
'[SKIN]/../../org.openbravo.client.application/images/grid/gridHeader_bg.png'
+});
+
+isc.OBViewGrid.changeDefaults('headerMenuButtonDefaults', {
+ showDown: false,
+ showTitle: true,
+ baseStyle: 'pepe'
+ //src:
'[SKIN]/../../org.openbravo.client.application/images/grid/gridHeader_bg.png'
+});
+
+
isc.OBGridToolStripIcon.addProperties({
width: 21,
height: 19,
@@ -50,7 +102,7 @@
height: '100%',
width: '100%',
styleName: 'OBGridToolStrip',
- membersMargin: 5
+ membersMargin: 4
});
isc.OBGridButtonsComponent.addProperties({
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
