details: /erp/devel/pi/rev/4420cb300486
changeset: 12903:4420cb300486
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Jun 17 16:22:21 2011 +0200
summary: [SKIN] Moved 'Quick Launch' icon hardcoded images to styles folder
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateComponent.java
| 6 ++--
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchComponent.java
| 6 ++--
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl
| 12 +++++++--
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
| 12 +++++++++-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-navigation-bar-styles.css
| 2 +-
5 files changed, 27 insertions(+), 11 deletions(-)
diffs (120 lines):
diff -r e42014740a9a -r 4420cb300486
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateComponent.java
Fri Jun 17 15:16:36 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateComponent.java
Fri Jun 17 16:22:21 2011 +0200
@@ -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 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -57,8 +57,8 @@
return "UINAVBA_CREATE_NEW";
}
- public String getIcon() {
- return
"[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-asterisk.png";
+ public String getButtonType() {
+ return "createNew";
}
public String getRecentPropertyName() {
diff -r e42014740a9a -r 4420cb300486
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchComponent.java
Fri Jun 17 15:16:36 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchComponent.java
Fri Jun 17 16:22:21 2011 +0200
@@ -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 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -57,8 +57,8 @@
return "UINAVBA_QUICK_LAUNCH";
}
- public String getIcon() {
- return
"[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-forward.png";
+ public String getButtonType() {
+ return "quickLaunch";
}
public String getRecentPropertyName() {
diff -r e42014740a9a -r 4420cb300486
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl
Fri Jun 17 15:16:36 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl
Fri Jun 17 16:22:21 2011 +0200
@@ -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 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -21,11 +21,17 @@
isc.OBQuickLaunch.create(OB.QuickLaunchNavbarComponentStylingProperties, {
title: '',
prompt: OB.I18N.getLabel('${data.label}'),
- src: '${data.icon}',
+ buttonType: '${data.buttonType}',
prefixLabel: '${data.prefixRecent}',
keyboardShortcutId : '${data.keyboardShortcutId}',
recentPropertyName: '${data.recentPropertyName}',
titleLabel: '${data.label}',
dataSourceId: '${data.dataSourceId}',
- command: '${data.command}'
+ command: '${data.command}',
+ initWidget: function(){
+ if (this.initWidgetStyle) {
+ this.initWidgetStyle();
+ }
+ this.Super('initWidget', arguments);
+ }
})
\ No newline at end of file
diff -r e42014740a9a -r 4420cb300486
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
Fri Jun 17 15:16:36 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
Fri Jun 17 16:22:21 2011 +0200
@@ -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 Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -125,6 +125,16 @@
layoutProperties: {
width: 250,
membersMargin: 10
+ },
+
+ initWidgetStyle: function() {
+ if (this.buttonType) {
+ if (this.buttonType === 'createNew') {
+
this.setSrc('[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-asterisk.png');
+ } else if (this.buttonType === 'quickLaunch') {
+
this.setSrc('[SKINIMG]../../org.openbravo.client.application/images/navbar/ico-forward.png');
+ }
+ }
}
};
diff -r e42014740a9a -r 4420cb300486
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-navigation-bar-styles.css
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-navigation-bar-styles.css
Fri Jun 17 15:16:36 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-navigation-bar-styles.css
Fri Jun 17 16:22:21 2011 +0200
@@ -21,7 +21,7 @@
The main navbar
============================================================*/
.OBNavBarToolStrip {
- margin-left: 2px;
+ margin-left: 4px;
height: 26px;
background-color: #FFFFFF;
}
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
