details: https://code.openbravo.com/erp/devel/pi/rev/1dca0763b990
changeset: 13322:1dca0763b990
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Jul 28 13:55:10 2011 +0200
summary: [imageBLOB] added proper 'Image Not Available' image
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
| 186 +++++----
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/imageNotAvailable.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
| 13 -
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
| 14 +-
4 files changed, 110 insertions(+), 103 deletions(-)
diffs (290 lines):
diff -r 8ca5a1c79fda -r 1dca0763b990
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
Thu Jul 28 12:48:25 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
Thu Jul 28 13:55:10 2011 +0200
@@ -22,7 +22,7 @@
isc.ClassFactory.defineClass('OBImageItemSmallImage', isc.Img);
isc.OBImageItemSmallImage.addProperties({
- imageType: "stretch"
+ showDisabled: false
});
//== OBImageItemSmallImageContainer ==
@@ -77,6 +77,13 @@
//This class is used for the big image shown within the popup
isc.ClassFactory.defineClass('OBImageItemBigImage', isc.Img);
+isc.OBImageItemBigImage.addProperties({
+ initWidget: function() {
+ this.setCursor('url("' + this.zoomOutCursorSrc + '"), pointer');
+ return this.Super('initWidget', arguments);
+ }
+});
+
//== OBImageItemButton ==
//This class is used for the buttons shown in the OBImageItem
isc.ClassFactory.defineClass('OBImageItemButton', isc.ImgButton);
@@ -94,93 +101,98 @@
isc.ClassFactory.defineClass('OBImageCanvas', isc.HLayout);
OBImageCanvas.addProperties({
- height: '0px',
- initWidget: function(){
- var imageLayout = isc.OBImageItemSmallImageContainer.create({
- imageItem: this.creator
- });
- if (this.creator.required) {
- imageLayout.setStyleName(imageLayout.styleName + 'Required');
- } else {
- imageLayout.setStyleName(imageLayout.styleName);
+ height: '0px',
+ initWidget: function(){
+ this.imageLayout = isc.OBImageItemSmallImageContainer.create({
+ imageItem: this.creator
+ });
+ if (this.creator.required) {
+ this.imageLayout.setStyleName(this.imageLayout.styleName + 'Required');
+ } else {
+ this.imageLayout.setStyleName(this.imageLayout.styleName);
+ }
+ this.addMember(this.imageLayout);
+ this.image=isc.OBImageItemSmallImage.create({
+ width: '100%'
+ });
+ this.imageLayout.addMember(this.image);
+
this.image.setSrc('../web/skins/ltr/Default/Common/Image/imageNotAvailable_medium.png');
+ var buttonLayout = isc.VLayout.create({
+ width: '1%'
+ });
+ var selectorButton = isc.OBImageItemButton.create({
+ buttonType: 'upload',
+ imageItem: this.creator,
+ action: function(){
+ var selector = isc.OBImageSelector.create({
+ columnName: this.imageItem.columnName,
+ form: this.imageItem.form,
+ imageItem: this.imageItem
+ });
+ selector.show();
+ }
+ });
+ var deleteButton = isc.OBImageItemButton.create({
+ buttonType: 'erase',
+ imageItem: this.creator,
+ deleteFunction: function(){
+ var imageId = this.imageItem.getValue();
+ var view = this.imageItem.form.view;
+ var d = {
+ inpimageId: this.imageItem.getValue(),
+ inpTabId: this.imageItem.form.view.tabId,
+ inpColumnName: this.imageItem.columnName,
+ parentObjectId: this.imageItem.form.values.id,
+ command: 'DELETE'
+ };
+ var imageItem = this.imageItem;
+ isc.confirm(OB.I18N.getLabel('OBUIAPP_ConfirmDeleteImage'),
function(clickedOK){
+ if(clickedOK){
+
OB.RemoteCallManager.call('org.openbravo.client.application.window.ImagesActionHandler',
{}, d, function(response, data, request){
+ imageItem.refreshImage();
+ });
+ }
+ });
+ },
+ click: function(form, item){
+ //On click, we autosave before showing the selector,
+ //because after delete we will reload the form
+ if (!this.imageItem.form.validateForm()) {
+ return;
+ }
+ var actionObject = {
+ target: this,
+ method: this.deleteFunction,
+ parameters: []
+ };
+
this.imageItem.form.view.standardWindow.doActionAfterAutoSave(actionObject,
true, true);
+ },
+ updateState: function(value){
+ if(value){
+ this.setDisabled(false);
+ }else{
+ this.setDisabled(true);
+ }
}
- this.addMember(imageLayout);
- this.image=isc.OBImageItemSmallImage.create({
- width: '100%'
- });
- imageLayout.addMember(this.image);
-
this.image.setSrc('../web/skins/ltr/Default/Common/Image/imageNotAvailable_medium.png');
- var buttonLayout = isc.VLayout.create({
- width: '1%'
- });
- var selectorButton = isc.OBImageItemButton.create({
- buttonType: 'upload',
- imageItem: this.creator,
- action: function(){
- var selector = isc.OBImageSelector.create({
- columnName: this.imageItem.columnName,
- form: this.imageItem.form,
- imageItem: this.imageItem
- });
- selector.show();
- }
- });
- var deleteButton = isc.OBImageItemButton.create({
- buttonType: 'erase',
- imageItem: this.creator,
- deleteFunction: function(){
- var imageId = this.imageItem.getValue();
- var view = this.imageItem.form.view;
- var d = {
- inpimageId: this.imageItem.getValue(),
- inpTabId: this.imageItem.form.view.tabId,
- inpColumnName: this.imageItem.columnName,
- parentObjectId: this.imageItem.form.values.id,
- command: 'DELETE'
- };
- var imageItem = this.imageItem;
- isc.confirm(OB.I18N.getLabel('OBUIAPP_ConfirmDeleteImage'),
function(clickedOK){
- if(clickedOK){
-
OB.RemoteCallManager.call('org.openbravo.client.application.window.ImagesActionHandler',
{}, d, function(response, data, request){
- imageItem.refreshImage();
- });
- }
- });
- },
- click: function(form, item){
- //On click, we autosave before showing the selector,
- //because after delete we will reload the form
- if (!this.imageItem.form.validateForm()) {
- return;
- }
- var actionObject = {
- target: this,
- method: this.deleteFunction,
- parameters: []
- };
-
this.imageItem.form.view.standardWindow.doActionAfterAutoSave(actionObject,
true, true);
- },
- updateState: function(value){
- if(value){
- this.setDisabled(false);
- }else{
- this.setDisabled(true);
- }
- }
- });
- this.deleteButton = deleteButton;
- buttonLayout.addMember(selectorButton);
- buttonLayout.addMember(deleteButton);
- this.addMember(buttonLayout);
- },
- setImage: function(url){
+ });
+ this.deleteButton = deleteButton;
+ buttonLayout.addMember(selectorButton);
+ buttonLayout.addMember(deleteButton);
+ this.addMember(buttonLayout);
+ },
+ setImage: function(url){
+ if (!url) {
+ this.image.setSrc(this.imageNotAvailableSrc);
+ this.image.setHeight(this.imageNotAvailableHeight);
+ this.image.setWidth(this.imageNotAvailableWidth);
+ this.image.setCursor('default');
+ this.imageLayout.setCursor('default');
+ } else {
this.image.setSrc(url);
- if(url.contains('ShowImage')){
- this.image.setImageType('stretch');
- }else{
- this.image.setImageType('normal');
- }
+ this.image.setCursor('url("' + this.zoomInCursorSrc + '"), pointer');
+ this.imageLayout.setCursor('url("' + this.zoomInCursorSrc + '"),
pointer');
}
+ }
});
// == OBImageItem ==
@@ -192,7 +204,7 @@
canvasConstructor: 'OBImageCanvas',
setValue: function(newValue){
if(!newValue || newValue === '') {
-
this.canvas.setImage('../web/skins/ltr/Default/Common/Image/imageNotAvailable_medium.png');
+ this.canvas.setImage('');
} else {
this.canvas.setImage("../utility/ShowImage?id="+newValue+'&nocache='+Math.random());
var d = {
@@ -200,7 +212,7 @@
command: 'GETSIZE'
};
var image = this.canvas.image;
- var imageLayout = this.canvas.getMember(0);
+ var imageLayout = this.canvas.imageLayout;
OB.RemoteCallManager.call('org.openbravo.client.application.window.ImagesActionHandler',
{}, d, function(response, data, request){
var maxHeight = imageLayout.getHeight() - 12;
var maxWidth = imageLayout.getWidth() - 12;
diff -r 8ca5a1c79fda -r 1dca0763b990
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/imageNotAvailable.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/imageNotAvailable.png
has changed
diff -r 8ca5a1c79fda -r 1dca0763b990
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
Thu Jul 28 12:48:25 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
Thu Jul 28 13:55:10 2011 +0200
@@ -734,19 +734,6 @@
* Image Item
=======================================================================*/
-.OBFormFieldImageInput,
-.OBFormFieldImageInputRequired {
- cursor: url("images/system/zoomIn.cur"), pointer;
-}
-
-.OBImageItemSmallImage img {
- cursor: url("images/system/zoomIn.cur"), pointer;
-}
-
-.OBImageItemBigImage img {
- cursor: url("images/system/zoomOut.cur"), pointer;
-}
-
/*=======================================================================
* LinkButton Item
=======================================================================*/
diff -r 8ca5a1c79fda -r 1dca0763b990
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
Thu Jul 28 12:48:25 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
Thu Jul 28 13:55:10 2011 +0200
@@ -403,23 +403,31 @@
titleStyle: 'OBFormFieldLabel'
});
+isc.OBImageCanvas.addProperties({
+ zoomInCursorSrc: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/system/zoomIn.cur',
+ zoomOutCursorSrc: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/system/zoomOut.cur',
+ imageNotAvailableSrc: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/form/imageNotAvailable.png',
+ imageNotAvailableHeight: 49,
+ imageNotAvailableWidth: 57
+});
+
isc.OBImageItemSmallImageContainer.addProperties({
styleName: 'OBFormFieldImageInput',
height: 66,
width:'100%',
- cursor: '', //To allow set the cursor from the CSS
align: 'center',
defaultLayoutAlign: 'center'
});
isc.OBImageItemSmallImage.addProperties({
styleName: 'OBImageItemSmallImage',
- cursor: '' //To allow set the cursor from the CSS
+ imageType: 'stretch'
});
isc.OBImageItemBigImage.addProperties({
styleName: 'OBImageItemBigImage',
- cursor: '', //To allow set the cursor from the CSS
+ zoomInCursorSrc: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/system/zoomIn.cur',
+ zoomOutCursorSrc: OB.Styles.skinsPath +
'Default/org.openbravo.client.application/images/system/zoomOut.cur',
align: 'center'
});
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
