details: /erp/devel/pi/rev/bdd23d4981c5
changeset: 12924:bdd23d4981c5
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Jun 22 11:35:33 2011 +0200
summary: Fixed issue 17438. Toolbar buttons will be correct in Alert
Management window
details: /erp/devel/pi/rev/92e3b5cdff44
changeset: 12925:92e3b5cdff44
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Jun 22 12:31:01 2011 +0200
summary: Fixed issue 17533. Several styling issues in the attachments popup:
- Unneeded buttons in window header removed
- Left a bit more space around the items inside the popup
- Added a title to the popup
- Made the popup a bit wider
- Changed the styling of the Submit button to make it OB-standard
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 11 +++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js
| 20 +++++++---
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
| 4 +-
3 files changed, 28 insertions(+), 7 deletions(-)
diffs (83 lines):
diff -r 3f9e713156f8 -r 92e3b5cdff44
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Wed Jun 22 12:29:41 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Wed Jun 22 12:31:01 2011 +0200
@@ -1333,6 +1333,17 @@
<!--FF808081304A29B901304A4693C2009D-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF808081304A29B901304A4693C2009D--></AD_MESSAGE>
+<!--FF80808130B667BD0130B6C07695001F--><AD_MESSAGE>
+<!--FF80808130B667BD0130B6C07695001F-->
<AD_MESSAGE_ID><![CDATA[FF80808130B667BD0130B6C07695001F]]></AD_MESSAGE_ID>
+<!--FF80808130B667BD0130B6C07695001F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF80808130B667BD0130B6C07695001F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF80808130B667BD0130B6C07695001F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF80808130B667BD0130B6C07695001F-->
<VALUE><![CDATA[OBUIAPP_AttachFile]]></VALUE>
+<!--FF80808130B667BD0130B6C07695001F--> <MSGTEXT><![CDATA[Attach
File]]></MSGTEXT>
+<!--FF80808130B667BD0130B6C07695001F--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF80808130B667BD0130B6C07695001F-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF80808130B667BD0130B6C07695001F--></AD_MESSAGE>
+
<!--FF8081812D6761CF012D676DF2A70045--><AD_MESSAGE>
<!--FF8081812D6761CF012D676DF2A70045-->
<AD_MESSAGE_ID><![CDATA[FF8081812D6761CF012D676DF2A70045]]></AD_MESSAGE_ID>
<!--FF8081812D6761CF012D676DF2A70045-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 3f9e713156f8 -r 92e3b5cdff44
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js
Wed Jun 22 12:29:41 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js
Wed Jun 22 12:31:01 2011 +0200
@@ -221,13 +221,13 @@
action: './businessUtility/TabAttachments_FS.html',
target: "background_target",
numCols: 4,
- align: 'right',
+ align: 'center',
height: '30px',
redraw: function(){
},
theCanvas: this.canvas
});
- var submitbutton = isc.Button.create({
+ var submitbutton = isc.OBFormButton.create({
title: OB.I18N.getLabel('OBUIAPP_AttachmentSubmit'),
theForm: form,
canvas: me,
@@ -274,16 +274,24 @@
var horizontalLayout = isc.HLayout.create({
width: '100%',
height: '30px',
- align: 'right'
+ align: 'center'
});
var popup = isc.OBPopup.create({
height: 30,
- width: 300,
- align: 'right',
+ width: 450,
+ align: 'center',
+ showMinimizeButton : false,
+ showMaximizeButton : false,
+ title: OB.I18N.getLabel('OBUIAPP_AttachFile'),
initWidget: function(args){
horizontalLayout.addMember(form);
horizontalLayout.addMember(submitbutton);
- this.items = horizontalLayout;
+ //An empty HLayout is added to move the form items a bit down
(styling)
+ this.addItem(isc.HLayout.create({
+ width: '100%',
+ height: '10px'
+ }));
+ this.addItem(horizontalLayout);
this.Super('initWidget', arguments);
}
});
diff -r 3f9e713156f8 -r 92e3b5cdff44
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Wed Jun 22 12:29:41 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Wed Jun 22 12:31:01 2011 +0200
@@ -442,7 +442,9 @@
this.members = null;
var newMembers = [], i = 0, j = 0;
- this.leftMembers = OB.ToolbarRegistry.getButtons(this.view.tabId);
+ if(!this.leftMembers || this.leftMembers.length===0){
+ this.leftMembers = OB.ToolbarRegistry.getButtons(this.view.tabId);
+ }
newMembers[j] = isc.HLayout.create({
width: this.leftMargin,
height: 1
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
