details: https://code.openbravo.com/erp/devel/pi/rev/87a191c834a2 changeset: 15329:87a191c834a2 user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Feb 01 23:08:53 2012 +0100 summary: Fixed issue 19462: moved hardcoded 'pick and execute' values to the skin
details: https://code.openbravo.com/erp/devel/pi/rev/6a54382cbfa2 changeset: 15330:6a54382cbfa2 user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Feb 02 15:32:51 2012 +0100 summary: Fixed issue 19348: 'Pin' column is now fixed in 'Pick & Execute' details: https://code.openbravo.com/erp/devel/pi/rev/c2df24bab7bf changeset: 15331:c2df24bab7bf user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Feb 02 15:48:16 2012 +0100 summary: Fixed issue 19352: 'Pick & Executed' button layout now has a fixed height diffstat: modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/images/iconPin.png | 0 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 13 +++- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/process/iconPin.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-process-styles.js | 26 ++++++++++ 5 files changed, 41 insertions(+), 4 deletions(-) diffs (96 lines): diff -r cdb3da352133 -r c2df24bab7bf modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java Thu Feb 02 14:19:18 2012 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java Thu Feb 02 15:48:16 2012 +0100 @@ -11,7 +11,7 @@ * 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 portions are Copyright (C) 2010-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -351,6 +351,10 @@ globalResources.add(createStaticResource( "web/org.openbravo.userinterface.smartclient/openbravo/skins/" + KernelConstants.SKIN_PARAMETER + + "/org.openbravo.client.application/ob-process-styles.js", false)); + globalResources.add(createStaticResource( + "web/org.openbravo.userinterface.smartclient/openbravo/skins/" + + KernelConstants.SKIN_PARAMETER + "/org.openbravo.client.application/ob-dialog-styles.js", false)); globalResources.add(createStaticResource( diff -r cdb3da352133 -r c2df24bab7bf modules/org.openbravo.client.application/web/org.openbravo.client.application/images/iconPin.png Binary file modules/org.openbravo.client.application/web/org.openbravo.client.application/images/iconPin.png has changed diff -r cdb3da352133 -r c2df24bab7bf modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js Thu Feb 02 14:19:18 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js Thu Feb 02 15:48:16 2012 +0100 @@ -82,7 +82,7 @@ this.viewGrid = isc.OBPickAndExecuteGrid.create({ view: this, fields: this.gridFields, - height: '80%', + height: '*', dataSource: this.dataSource, gridProperties: this.viewProperties.gridProperties }); @@ -118,6 +118,7 @@ this.items = [this.viewGrid, isc.HLayout.create({ align: 'center', width: '100%', + height: OB.Styles.Process.PickAndExecute.buttonLayoutHeight, members: [isc.HLayout.create({ width: 1, overflow: 'visible', @@ -174,10 +175,16 @@ canEdit: false, canFilter: false, canSort: false, - width: 32, + canReorder: false, + canHide: false, + canFreeze: false, + canDragResize: false, + canGroupBy: false, + autoExpand: false, + width: OB.Styles.Process.PickAndExecute.pinColumnWidth, formatCellValue: function (value, record, rowNum, colNum, grid) { if (record[grid.selectionProperty]) { - return '<img src="web/org.openbravo.client.application/images/iconPin.png" />'; + return '<img src="' + OB.Styles.Process.PickAndExecute.iconPinSrc + '" />'; } return ''; }, diff -r cdb3da352133 -r c2df24bab7bf modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/process/iconPin.png Binary file modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/process/iconPin.png has changed diff -r cdb3da352133 -r c2df24bab7bf modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-process-styles.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-process-styles.js Thu Feb 02 15:48:16 2012 +0100 @@ -0,0 +1,26 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * 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 + * 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) 2012 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ +*/ + +OB.Styles.Process = {}; + +OB.Styles.Process.PickAndExecute = { + pinColumnWidth: 26, + iconPinSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/process/iconPin.png', + buttonLayoutHeight: 80 +}; ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
