details: /erp/devel/pi/rev/2c42262f9467
changeset: 12950:2c42262f9467
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Jun 23 15:51:09 2011 +0200
summary: [SKIN] Removed unneeded initWidgetStyle from 'tab' files
details: /erp/devel/pi/rev/2edccb0a48d7
changeset: 12951:2edccb0a48d7
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Jun 23 15:57:37 2011 +0200
summary: [SKIN] Improved navigation bar styles
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
| 2 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl
| 34 ++++---
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl
| 24 +-----
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js
| 12 --
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-logout-widget.js
| 44
++++++++++
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-asterisk.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-createNew.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-forward.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-quickLaunch.png
| 0
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.js
| 19 +--
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tab-styles.js
| 18 +---
11 files changed, 77 insertions(+), 76 deletions(-)
diffs (279 lines):
diff -r cb54bd08e767 -r 2edccb0a48d7
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 Jun 23 15:02:48 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
Thu Jun 23 15:57:37 2011 +0200
@@ -200,6 +200,8 @@
globalResources.add(createStaticResource(
"web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js",
false));
globalResources.add(createStaticResource(
+ "web/org.openbravo.client.application/js/navbar/ob-logout-widget.js",
false));
+ globalResources.add(createStaticResource(
"web/org.openbravo.client.application/js/navbar/ob-help-about-widget.js",
false));
globalResources.add(createStaticResource(
"web/org.openbravo.client.application/js/toolbar/ob-action-button.js",
false));
diff -r cb54bd08e767 -r 2edccb0a48d7
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
Thu Jun 23 15:02:48 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl
Thu Jun 23 15:57:37 2011 +0200
@@ -18,20 +18,24 @@
*/
/* jslint */
-isc.OBQuickLaunch.create(OB.QuickLaunchNavbarComponentStylingProperties, {
- title: '',
- prompt: OB.I18N.getLabel('${data.label}'),
- buttonType: '${data.buttonType}',
- prefixLabel: '${data.prefixRecent}',
- keyboardShortcutId : '${data.keyboardShortcutId}',
- recentPropertyName: '${data.recentPropertyName}',
- titleLabel: '${data.label}',
- dataSourceId: '${data.dataSourceId}',
- command: '${data.command}',
- initWidget: function(){
- if (this.initWidgetStyle) {
- this.initWidgetStyle();
- }
- this.Super('initWidget', arguments);
+isc.OBQuickLaunch.create({
+ title: '',
+ prompt: OB.I18N.getLabel('${data.label}'),
+ buttonType: '${data.buttonType}',
+ prefixLabel: '${data.prefixRecent}',
+ keyboardShortcutId : '${data.keyboardShortcutId}',
+ recentPropertyName: '${data.recentPropertyName}',
+ titleLabel: '${data.label}',
+ dataSourceId: '${data.dataSourceId}',
+ command: '${data.command}',
+ initWidget: function(){
+ if (this.buttonType) {
+ if (this.buttonType === 'createNew' && this.createNew_src) {
+ this.setSrc(this.createNew_src);
+ } else if (this.buttonType === 'quickLaunch' && this.quickLaunch_src) {
+ this.setSrc(this.quickLaunch_src);
}
+ }
+ this.Super('initWidget', arguments);
+ }
})
\ No newline at end of file
diff -r cb54bd08e767 -r 2edccb0a48d7
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl
Thu Jun 23 15:02:48 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl
Thu Jun 23 15:57:37 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): ______________________________________.
************************************************************************
@@ -19,24 +19,4 @@
/* jslint */
OBUserProfile.create({}),
- isc.ImgButton.create(OB.LogoutNavbarComponentStylingProperties, {
- prompt: OB.I18N.getLabel('UINAVBA_EndSession'),
-
- keyboardShortcutId : 'NavBar_OBLogout',
-
- draw : function() {
- var me = this;
- var ksAction = function() {
- OB.Utilities.logout();
- return false; //To avoid keyboard shortcut propagation
- };
- OB.KeyboardManager.KS.set(this.keyboardShortcutId, ksAction);
- this.Super("draw", arguments);
-
OB.TestRegistry.register('org.openbravo.client.application.navigationbarcomponents.QuitButton',
this);
- },
-
- click: function() {
- var handle = this.getHandle();
- OB.Utilities.logout();
- }
- })
\ No newline at end of file
+ isc.OBLogout.create({})
\ No newline at end of file
diff -r cb54bd08e767 -r 2edccb0a48d7
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js
Thu Jun 23 15:02:48 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js
Thu Jun 23 15:57:37 2011 +0200
@@ -94,9 +94,6 @@
initWidget: function() {
this.tabBarProperties.tabSet = this;
- if (this.initWidgetStyle) {
- this.initWidgetStyle();
- }
this.Super('initWidget', arguments);
},
@@ -286,9 +283,6 @@
isc.OBTabBarMain.addProperties({
initWidget: function() {
- if (this.initWidgetStyle) {
- this.initWidgetStyle();
- }
this.Super('initWidget', arguments);
},
@@ -632,9 +626,6 @@
initWidget: function(){
this.tabBarProperties.tabSet = this;
- if (this.initWidgetStyle) {
- this.initWidgetStyle();
- }
this.Super('initWidget', arguments);
}
});
@@ -643,9 +634,6 @@
isc.OBTabBarChild.addProperties({
initWidget: function() {
- if (this.initWidgetStyle) {
- this.initWidgetStyle();
- }
this.Super('initWidget', arguments);
}
});
diff -r cb54bd08e767 -r 2edccb0a48d7
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-logout-widget.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-logout-widget.js
Thu Jun 23 15:57:37 2011 +0200
@@ -0,0 +1,44 @@
+/*
+ *************************************************************************
+ * 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) 2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
+ */
+
+isc.ClassFactory.defineClass('OBLogout', isc.ImgButton);
+
+// = OBLogout =
+// The OBLogout implements a widget to logout the application
+isc.OBLogout.addProperties({
+ prompt: OB.I18N.getLabel('UINAVBA_EndSession'),
+
+ keyboardShortcutId : 'NavBar_OBLogout',
+
+ draw : function() {
+ var me = this;
+ var ksAction = function() {
+ OB.Utilities.logout();
+ return false; //To avoid keyboard shortcut propagation
+ };
+ OB.KeyboardManager.KS.set(this.keyboardShortcutId, ksAction);
+ this.Super("draw", arguments);
+
OB.TestRegistry.register('org.openbravo.client.application.navigationbarcomponents.QuitButton',
this);
+ },
+
+ click: function() {
+ var handle = this.getHandle();
+ OB.Utilities.logout();
+ }
+});
\ No newline at end of file
diff -r cb54bd08e767 -r 2edccb0a48d7
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-asterisk.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-asterisk.png
has changed
diff -r cb54bd08e767 -r 2edccb0a48d7
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-createNew.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-createNew.png
has changed
diff -r cb54bd08e767 -r 2edccb0a48d7
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-forward.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-forward.png
has changed
diff -r cb54bd08e767 -r 2edccb0a48d7
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-quickLaunch.png
Binary file
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/navbar/ico-quickLaunch.png
has changed
diff -r cb54bd08e767 -r 2edccb0a48d7
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.js
Thu Jun 23 15:02:48 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.js
Thu Jun 23 15:57:37 2011 +0200
@@ -76,7 +76,7 @@
// Styling properties for the quick launch and quick create components
// See also isc.OBQuickRun styling properties
-OB.QuickLaunchNavbarComponentStylingProperties = {
+isc.OBQuickLaunch.addProperties({
// todo: it is nicer to move this to a style but then this issue occurs:
// https://issues.openbravo.com/view.php?id=13786
width: 57,
@@ -86,19 +86,12 @@
membersMargin: 10
},
- initWidgetStyle: function() {
- if (this.buttonType) {
- if (this.buttonType === 'createNew') {
- this.setSrc(OB.SkinsPath +
'Default/org.openbravo.client.application/images/navbar/ico-asterisk.png');
- } else if (this.buttonType === 'quickLaunch') {
- this.setSrc(OB.SkinsPath +
'Default/org.openbravo.client.application/images/navbar/ico-forward.png');
- }
- }
- }
-};
+ createNew_src: OB.SkinsPath +
'Default/org.openbravo.client.application/images/navbar/ico-createNew.png',
+ quickLaunch_src: OB.SkinsPath +
'Default/org.openbravo.client.application/images/navbar/ico-quickLaunch.png'
+});
// Styling properties for the logout button in the navbar
-OB.LogoutNavbarComponentStylingProperties = {
+isc.OBLogout.addProperties({
baseStyle: 'OBNavBarImgButton',
height: 14,
width: 36,
@@ -110,4 +103,4 @@
showRollOver: false,
showFocused: false,
showDown: false
-};
\ No newline at end of file
+});
\ No newline at end of file
diff -r cb54bd08e767 -r 2edccb0a48d7
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tab-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tab-styles.js
Thu Jun 23 15:02:48 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tab-styles.js
Thu Jun 23 15:57:37 2011 +0200
@@ -59,16 +59,11 @@
//symmetricScroller:true,
scrollerSrc: OB.SkinsPath +
'Default/org.openbravo.client.application/images/tab/tabBarButtonMain_OverflowIcon.png',
- pickerButtonSrc: OB.SkinsPath +
'Default/org.openbravo.client.application/images/tab/tabBarButtonMain_OverflowIconPicker.png',
-
- initWidgetStyle: function() {
- }
+ pickerButtonSrc: OB.SkinsPath +
'Default/org.openbravo.client.application/images/tab/tabBarButtonMain_OverflowIconPicker.png'
});
isc.OBTabBarMain.addProperties({
- styleName: 'OBTabBarMain',
- initWidgetStyle: function() {
- }
+ styleName: 'OBTabBarMain'
});
@@ -103,14 +98,9 @@
paneContainerClassName: 'OBTabSetChildContainer',
scrollerSrc: OB.SkinsPath +
'Default/org.openbravo.client.application/images/tab/tabBarButtonChild_OverflowIcon.png',
- pickerButtonSrc: OB.SkinsPath +
'Default/org.openbravo.client.application/images/tab/tabBarButtonChild_OverflowIconPicker.png',
-
- initWidgetStyle: function() {
- }
+ pickerButtonSrc: OB.SkinsPath +
'Default/org.openbravo.client.application/images/tab/tabBarButtonChild_OverflowIconPicker.png'
});
isc.OBTabBarChild.addProperties({
- styleName: 'OBTabBarChild',
- initWidgetStyle: function() {
- }
+ styleName: 'OBTabBarChild'
});
------------------------------------------------------------------------------
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
