details: /erp/devel/pi/rev/e39af0a1ad38
changeset: 10639:e39af0a1ad38
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Tue Feb 15 10:05:14 2011 +0100
summary: Added language string to OB.Application object
details: /erp/devel/pi/rev/df6a133093e5
changeset: 10640:df6a133093e5
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Tue Feb 15 10:06:44 2011 +0100
summary: Getting Started widget: URL modified
diffstat:
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java
| 4 ++++
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
| 3 ++-
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-getting-started-widget.js
| 5 +++--
3 files changed, 9 insertions(+), 3 deletions(-)
diffs (45 lines):
diff -r 1e7676e478c6 -r df6a133093e5
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java
Tue Feb 15 08:39:25 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/ApplicationComponent.java
Tue Feb 15 10:06:44 2011 +0100
@@ -90,6 +90,10 @@
return OBContext.getOBContext().getLanguage().getId();
}
+ public String getLanguage() {
+ return OBContext.getOBContext().getLanguage().getLanguage();
+ }
+
public String getDateFormat() {
final Properties props =
OBPropertiesProvider.getInstance().getOpenbravoProperties();
return props.getProperty(KernelConstants.DATE_FORMAT_PROPERTY,
"dd-MM-yyyy");
diff -r 1e7676e478c6 -r df6a133093e5
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
Tue Feb 15 08:39:25 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
Tue Feb 15 10:06:44 2011 +0100
@@ -20,7 +20,8 @@
var OB = {
Application : {
- language : '${data.languageId?js_string}',
+ language: '${data.languageId?js_string}',
+ language_string: '${data.language?js_string}',
systemVersion : '${data.systemVersion?js_string}', // global version
used in all hyperlinks
contextUrl: '${data.contextUrl}',
communityBrandingStaticUrl:
'${data.communityBrandingStaticUrl?js_string}',
diff -r 1e7676e478c6 -r df6a133093e5
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-getting-started-widget.js
---
a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-getting-started-widget.js
Tue Feb 15 08:39:25 2011 +0100
+++
b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-getting-started-widget.js
Tue Feb 15 10:06:44 2011 +0100
@@ -23,11 +23,12 @@
//
isc.defineClass('OBGettingStartedWidget', isc.OBWidget).addProperties({
contentSource: null,
- widgetContentUrl:
'https://butler.openbravo.com/web/static-content/en_US/gettingstarted/widget.html',
+ widgetContentUrl:
'https://butler.openbravo.com/heartbeat-server/org.openbravo.butler.communitybranding/CommunityBranding.html'
+
+ '?uimode=gettingStarted&language=' +
OB.Application.language_string,
createWindowContents: function() {
var loc = document.location;
- this.contentSource = this.widgetContentUrl + '?appurl=' +
+ this.contentSource = this.widgetContentUrl + '&appurl=' +
encodeURIComponent(loc.protocol + '//' +
loc.hostname +
(loc.port ? ':' + loc.port : '') +
OB.Application.contextUrl) +
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
