dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #32400
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16542: PT DV GIS ER EV restructured.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16542 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-08-27 15:12:22 +0200
message:
PT DV GIS ER EV restructured.
removed:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/jquery.calendars.picker.dhis2.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonFacilities.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonmin.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonminValues.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonBaseCoordinate.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroupSets.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroups.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonGeoJsonFiles.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInfrastructuralAggregatedMapValues.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInitialize.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMap.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLayers.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSet.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSets.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelation.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapView.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapViews.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOutputFile.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonPeriods.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonUserSettings.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminAggregatedMapValues.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminDataElements.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapLegendSets.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapOrganisationUnitRelations.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMaps.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnitGroups.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnits.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/void.vm
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/javaProperties.js
renamed:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/i18n/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/images/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/images/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/index.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/manifest.webapp => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/manifest.webapp
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/styles/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/i18n/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/images/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/images/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/index.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/manifest.webapp => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/manifest.webapp
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/styles/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/images/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/index.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/manifest.webapp => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/plugin.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/styles/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/images/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/images/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/index.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/manifest.webapp => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/manifest.webapp
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/plugin.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/styles/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/images/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/images/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/index.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/manifest.webapp => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/manifest.webapp
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/plugin.html => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/styles/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml 2014-08-25 15:20:12 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml 2014-08-27 12:44:38 +0000
@@ -14,31 +14,31 @@
<package name="dhis-web-pivot" extends="dhis-web-commons" namespace="/dhis-web-pivot">
<action name="index" class="org.hisp.dhis.commons.action.NoAction">
- <result name="success" type="redirect">app/index.html</result>
+ <result name="success" type="redirect">index.html</result>
</action>
</package>
<package name="dhis-web-visualizer" extends="dhis-web-commons" namespace="/dhis-web-visualizer">
<action name="index" class="org.hisp.dhis.commons.action.NoAction">
- <result name="success" type="redirect">app/index.html</result>
+ <result name="success" type="redirect">index.html</result>
</action>
</package>
<package name="dhis-web-mapping" extends="dhis-web-commons" namespace="/dhis-web-mapping">
<action name="index" class="org.hisp.dhis.commons.action.NoAction">
- <result name="success" type="redirect">app/index.html</result>
+ <result name="success" type="redirect">index.html</result>
</action>
</package>
<package name="dhis-web-event-reports" extends="dhis-web-commons" namespace="/dhis-web-event-reports">
<action name="index" class="org.hisp.dhis.commons.action.NoAction">
- <result name="success" type="redirect">app/index.html</result>
+ <result name="success" type="redirect">index.html</result>
</action>
</package>
<package name="dhis-web-event-visualizer" extends="dhis-web-commons" namespace="/dhis-event-visualizer">
<action name="index" class="org.hisp.dhis.commons.action.NoAction">
- <result name="success" type="redirect">app/index.html</result>
+ <result name="success" type="redirect">index.html</result>
</action>
</package>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html 2014-08-25 15:20:12 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html 2014-08-27 12:44:38 +0000
@@ -3,11 +3,11 @@
<body>
<h3>Apps</h3>
<ul>
- <li><a href="../dhis-web-pivot/app/index.html">dhis-web-pivot</a></li>
- <li><a href="../dhis-web-visualizer/app/index.html">dhis-web-visualizer</a></li>
- <li><a href="../dhis-web-mapping/app/index.html">dhis-web-mapping</a></li>
- <li><a href="../dhis-web-event-reports/app/index.html">dhis-web-event-reports</a></li>
- <li><a href="../dhis-web-event-visualizer/app/index.html">dhis-web-event-visualizer</a></li>
+ <li><a href="../dhis-web-pivot/index.html">dhis-web-pivot</a></li>
+ <li><a href="../dhis-web-visualizer/index.html">dhis-web-visualizer</a></li>
+ <li><a href="../dhis-web-mapping/index.html">dhis-web-mapping</a></li>
+ <li><a href="../dhis-web-event-reports/index.html">dhis-web-event-reports</a></li>
+ <li><a href="../dhis-web-event-visualizer/index.html">dhis-web-event-visualizer</a></li>
<li><a href="../dhis-web-event-capture/index.html">dhis-web-event-capture</a></li>
<li><a href="../dhis-web-tracker-capture/index.html">dhis-web-tracker-capture</a></li>
</ul>
=== removed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/i18n' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/images' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/images'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/index.html' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/index.html'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/manifest.webapp' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/manifest.webapp'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts'
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-08-27 11:24:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-08-27 13:10:38 +0000
@@ -7045,22 +7045,7 @@
var requests = [],
callbacks = 0,
init = {},
- parseProperties,
- fn;
-
- parseProperties = function(properties) {
- var rows = Ext.Array.clean(properties.split(/\n/)),
- i18n = {};
-
- for (var i = 0, a; i < rows.length; i++) {
- if (!!(typeof rows[i] === 'string' && rows[i].length)) {
- a = rows[i].split('=');
- i18n[a[0].trim()] = eval('"' + a[1].trim().replace(/"/g, '\'') + '"');
- }
- }
-
- return i18n;
- };
+ fn;
fn = function() {
if (++callbacks === requests.length) {
@@ -7126,47 +7111,54 @@
var defaultKeyUiLocale = 'en';
init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
- // i18n
Ext.Ajax.request({
- url: 'i18n/' + init.keyUiLocale + '.properties',
+ url: init.contextPath + '/dhis-web-commons/javascripts/javaProperties.js',
success: function(r) {
- NS.i18n = parseProperties(r.responseText);
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
- success: function(r) {
- Ext.applyIf(NS.i18n, parseProperties(r.responseText));
- },
- callback: fn
- })
- }
- else {
- fn();
- }
- },
- failure: function() {
- var failure = function() {
- alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + init.keyUiLocale + ').');
- NS.i18n = parseProperties(r.responseText);
- },
- failure: function() {
+ var parseProperties = Ext.decode(r.responseText).parseProperties;
+
+ // i18n
+ Ext.Ajax.request({
+ url: 'i18n/' + init.keyUiLocale + '.properties',
+ success: function(r) {
+ NS.i18n = parseProperties(r.responseText);
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ success: function(r) {
+ Ext.applyIf(NS.i18n, parseProperties(r.responseText));
+ },
+ callback: fn
+ })
+ }
+ else {
+ fn();
+ }
+ },
+ failure: function() {
+ var failure = function() {
+ alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ };
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.json',
+ success: function(r) {
+ console.log('No translations found for system locale (' + init.keyUiLocale + ').');
+ NS.i18n = parseProperties(r.responseText);
+ },
+ failure: function() {
+ failure();
+ },
+ callback: fn
+ });
+ }
+ else {
+ fn();
failure();
- },
- callback: fn
- });
- }
- else {
- fn();
- failure();
- }
+ }
+ }
+ });
}
});
}
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/styles' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles'
=== removed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/i18n' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/images' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/images'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/index.html' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/index.html'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/manifest.webapp' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/manifest.webapp'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts'
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js 2014-08-27 11:24:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-08-27 13:10:38 +0000
@@ -6681,22 +6681,7 @@
var requests = [],
callbacks = 0,
init = {},
- parseProperties,
- fn;
-
- parseProperties = function(properties) {
- var rows = Ext.Array.clean(properties.split(/\n/)),
- i18n = {};
-
- for (var i = 0, a; i < rows.length; i++) {
- if (!!(typeof rows[i] === 'string' && rows[i].length)) {
- a = rows[i].split('=');
- i18n[a[0].trim()] = eval('"' + a[1].trim().replace(/"/g, '\'') + '"');
- }
- }
-
- return i18n;
- };
+ fn;
fn = function() {
if (++callbacks === requests.length) {
@@ -6762,47 +6747,54 @@
var defaultKeyUiLocale = 'en';
init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
- // i18n
Ext.Ajax.request({
- url: 'i18n/' + init.keyUiLocale + '.properties',
+ url: init.contextPath + '/dhis-web-commons/javascripts/javaProperties.js',
success: function(r) {
- NS.i18n = parseProperties(r.responseText);
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
- success: function(r) {
- Ext.applyIf(NS.i18n, parseProperties(r.responseText));
- },
- callback: fn
- })
- }
- else {
- fn();
- }
- },
- failure: function() {
- var failure = function() {
- alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + init.keyUiLocale + ').');
- NS.i18n = parseProperties(r.responseText);
- },
- failure: function() {
+ var parseProperties = Ext.decode(r.responseText).parseProperties;
+
+ // i18n
+ Ext.Ajax.request({
+ url: 'i18n/' + init.keyUiLocale + '.properties',
+ success: function(r) {
+ NS.i18n = parseProperties(r.responseText);
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ success: function(r) {
+ Ext.applyIf(NS.i18n, parseProperties(r.responseText));
+ },
+ callback: fn
+ })
+ }
+ else {
+ fn();
+ }
+ },
+ failure: function() {
+ var failure = function() {
+ alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ };
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.json',
+ success: function(r) {
+ console.log('No translations found for system locale (' + init.keyUiLocale + ').');
+ NS.i18n = parseProperties(r.responseText);
+ },
+ failure: function() {
+ failure();
+ },
+ callback: fn
+ });
+ }
+ else {
+ fn();
failure();
- },
- callback: fn
- });
- }
- else {
- fn();
- failure();
- }
+ }
+ }
+ });
}
});
}
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/styles' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles'
=== removed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app'
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/jquery.calendars.picker.dhis2.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/jquery.calendars.picker.dhis2.css 2014-08-15 10:50:41 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/jquery.calendars.picker.dhis2.css 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-.calendars-popup {
- z-index: 100000;
- margin-top: 2px;
-}
-
-.calendars-nav a {
- padding: 2px;
-}
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonFacilities.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonFacilities.vm 2013-09-23 13:31:48 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonFacilities.vm 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#set($size=$object.size())
-#set($groupSetSize=$groupSets.size())
-#if($callback)$!{callback}(#end{ "properties":{},"geojson":[#foreach($unit in $object) {
-"ty": #if(${unit.featureType}=="Point")"2"#else"1"#end,"co":$!encoder.jsonEncode($!{unit.validCoordinates}),"uid":"$!{unit.uid}","iid":$!{unit.id},"na":"$!encoder.jsonEncode(${unit.name})",
-"groupSets": { #foreach($set in $groupSets) #set( $index = ( $velocityCount - 1 ) ) #set( $key = $!encoder.jsonEncode( ${set.uid} ) ) #set( $val = $!encoder.jsonEncode( $unit.groupNames.get(${index}) ) )
-"${key}":"$!{val}"#if($velocityCount<$groupSetSize),#end #end } } #if($velocityCount<$size),#end #end ] }#if($callback))#end
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonmin.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonmin.vm 2013-10-08 12:24:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonmin.vm 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#set($size=$object.size())#if($callback)$!{callback}(#end{"geojson":[#foreach($unit in $object){"ty":#if(${unit.featureType}=="Point")"2"#else"1"#end,"co":$!encoder.jsonEncode($!{unit.validCoordinates}),"uid":"$!{unit.uid}","iid":$!{unit.id},"na":"$!encoder.jsonEncode(${unit.name})","hcd":$!{unit.hasChildrenWithCoordinates()},"hcu":$!{unit.hasCoordinatesUp()},"le":$!{unit.getOrganisationUnitLevel()},"gppg":"$!{unit.parent.parent.getParentGraph()}","gpuid":"$!{unit.parent.parent.uid}","parentGraph":"$!{unit.getParentGraph()}","pi":"$!{unit.getParent().uid}","pn":"$!{unit.getParent().name}"}#if($velocityCount<$size),#end#end]}#if($callback))#end
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonminValues.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonminValues.vm 2012-03-29 15:24:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/geojsonminValues.vm 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#set($size=$object.size())[#foreach($unit in $object){"t":#if(${unit.featureType}=="Point")"2"#else"1"#end,"c":$!encoder.jsonEncode($!{unit.validCoordinates}),"i":"$!{unit.id}","n":"$!encoder.jsonEncode(${unit.name})","v":"$!{unit.value}","h":$!{unit.hasChildrenWithCoordinates()}}#if($velocityCount<$size),#end#end]
\ No newline at end of file
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/i18n' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n'
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n.vm 2014-02-08 18:09:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n.vm 1970-01-01 00:00:00 +0000
@@ -1,429 +0,0 @@
-GIS.i18n = {
-save: '$encoder.jsEscape($i18n.getString( 'save' ) , "'")',
-saved: '$encoder.jsEscape($i18n.getString( 'saved' ) , "'")',
-delete_: '$encoder.jsEscape($i18n.getString( 'delete' ) , "'")',
-deleted: '$encoder.jsEscape($i18n.getString( 'deleted' ) , "'")',
-update: '$encoder.jsEscape($i18n.getString( 'update' ) , "'")',
-updated: '$encoder.jsEscape($i18n.getString( 'updated' ) , "'")',
-register: '$encoder.jsEscape($i18n.getString( 'register' ) , "'")',
-registered: '$encoder.jsEscape($i18n.getString( 'registered' ) , "'")',
-add: '$encoder.jsEscape($i18n.getString( 'add' ) , "'")',
-added: '$encoder.jsEscape($i18n.getString( 'added' ) , "'")',
-assign: '$encoder.jsEscape($i18n.getString( 'assign' ) , "'")',
-assigned: '$encoder.jsEscape($i18n.getString( 'assigned' ) , "'")',
-refresh: '$encoder.jsEscape($i18n.getString( 'refresh' ) , "'")',
-refreshed: '$encoder.jsEscape($i18n.getString( 'refreshed' ) , "'")',
-select: '$encoder.jsEscape($i18n.getString( 'select' ) , "'")',
-selected: '$encoder.jsEscape($i18n.getString( 'selected' ) , "'")',
-cancel: '$encoder.jsEscape($i18n.getString( 'cancel' ) , "'")',
-cancelled: '$encoder.jsEscape($i18n.getString( 'cancelled' ) , "'")',
-apply: '$encoder.jsEscape($i18n.getString( 'apply' ) , "'")',
-applied: '$encoder.jsEscape($i18n.getString( 'applied' ) , "'")',
-show: '$encoder.jsEscape($i18n.getString( 'show' ) , "'")',
-hide: '$encoder.jsEscape($i18n.getString( 'hide' ) , "'")',
-showhide: '$encoder.jsEscape($i18n.getString( 'showhide' ) , "'")',
-toggle: '$encoder.jsEscape($i18n.getString( 'toggle' ) , "'")',
-boundary: '$encoder.jsEscape($i18n.getString( 'boundary' ) , "'")',
-level: '$encoder.jsEscape($i18n.getString( 'level' ) , "'")',
-type: '$encoder.jsEscape($i18n.getString( 'type' ) , "'")',
-new_: '$encoder.jsEscape($i18n.getString( 'new' ) , "'")',
-edit: '$encoder.jsEscape($i18n.getString( 'edit' ) , "'")',
-export_: '$encoder.jsEscape($i18n.getString( 'export' ) , "'")',
-map: '$encoder.jsEscape($i18n.getString( 'map' ) , "'")',
-favorite: '$encoder.jsEscape($i18n.getString( 'favorite' ) , "'")',
-favorites: '$encoder.jsEscape($i18n.getString( 'favorites' ) , "'")',
-legend: '$encoder.jsEscape($i18n.getString( 'legend' ) , "'")',
-legendset: '$encoder.jsEscape($i18n.getString( 'legendset' ) , "'")',
-group: '$encoder.jsEscape($i18n.getString( 'group' ) , "'")',
-groups: '$encoder.jsEscape($i18n.getString( 'groups' ) , "'")',
-groupset: '$encoder.jsEscape($i18n.getString( 'groupset' ) , "'")',
-groupsets: '$encoder.jsEscape($i18n.getString( 'groupsets' ) , "'")',
-indicators: '$encoder.jsEscape($i18n.getString( 'indicators' ) , "'")',
-dataelements: '$encoder.jsEscape($i18n.getString( 'dataelements' ) , "'")',
-thematic_map: '$encoder.jsEscape($i18n.getString( 'thematic_map' ) , "'")',
-polygon_layer: '$encoder.jsEscape($i18n.getString( 'polygon_layer' ) , "'")',
-point_layer: '$encoder.jsEscape($i18n.getString( 'point_layer' ) , "'")',
-indicator_group: '$encoder.jsEscape($i18n.getString( 'indicator_group' ) , "'")',
-indicator: '$encoder.jsEscape($i18n.getString( 'indicator' ) , "'")',
-period_type: '$encoder.jsEscape($i18n.getString( 'period_type' ) , "'")',
-period: '$encoder.jsEscape($i18n.getString( 'period' ) , "'")',
-map: '$encoder.jsEscape($i18n.getString( 'map' ) , "'")',
-in_the_map: '$encoder.jsEscape($i18n.getString( 'in_the_map' ) , "'")',
-legend_type: '$encoder.jsEscape($i18n.getString( 'legend_type' ) , "'")',
-method: '$encoder.jsEscape($i18n.getString( 'method' ) , "'")',
-classes: '$encoder.jsEscape($i18n.getString( 'classes' ) , "'")',
-low_color: '$encoder.jsEscape($i18n.getString( 'low_color' ) , "'")',
-high_color: '$encoder.jsEscape($i18n.getString( 'high_color' ) , "'")',
-optional: '$encoder.jsEscape($i18n.getString( 'optional' ) , "'")',
-loading: '$encoder.jsEscape($i18n.getString( 'loading' ) , "'")',
-automatic: '$encoder.jsEscape($i18n.getString( 'automatic' ) , "'")',
-predefined: '$encoder.jsEscape($i18n.getString( 'predefined' ) , "'")',
-equal_intervals: '$encoder.jsEscape($i18n.getString( 'equal_intervals' ) , "'")',
-equal_group_count: '$encoder.jsEscape($i18n.getString( 'equal_group_count' ) , "'")',
-fixed_intervals: '$encoder.jsEscape($i18n.getString( 'fixed_intervals' ) , "'")',
-administrator: '$encoder.jsEscape($i18n.getString( 'administrator' ) , "'")',
-map_source: '$encoder.jsEscape($i18n.getString( 'map_source' ) , "'")',
-base_coordinate: '$encoder.jsEscape($i18n.getString( 'base_coordinate' ) , "'")',
-admin_panels: '$encoder.jsEscape($i18n.getString( 'admin_panels' ) , "'")',
-longitude_x: '$encoder.jsEscape($i18n.getString( 'longitude_x' ) , "'")',
-latitude_y: '$encoder.jsEscape($i18n.getString( 'latitude_y' ) , "'")',
-save_coordinate: '$encoder.jsEscape($i18n.getString( 'save_coordinate' ) , "'")',
-export_map_as_image: '$encoder.jsEscape($i18n.getString( 'export_map_as_image' ) , "'")',
-status: '$encoder.jsEscape($i18n.getString( 'status' ) , "'")',
-error_while_retrieving_data: '$encoder.jsEscape($i18n.getString( 'error_while_retrieving_data' ) , "'")',
-bounds: '$encoder.jsEscape($i18n.getString( 'bounds' ) , "'")',
-comma_separated_values: '$encoder.jsEscape($i18n.getString( 'comma_separated_values' ) , "'")',
-ajax_request_failed: '$encoder.jsEscape($i18n.getString( 'ajax_request_failed' ) , "'")',
-component_init_not_complete: '$encoder.jsEscape($i18n.getString( 'component_init_not_complete' ) , "'")',
-error: '$encoder.jsEscape($i18n.getString( 'error' ) , "'")',
-form_is_not_complete: '$encoder.jsEscape($i18n.getString( 'form_is_not_complete' ) , "'")',
-filter: '$encoder.jsEscape($i18n.getString( 'filter' ) , "'")',
-assign_all: '$encoder.jsEscape($i18n.getString( 'assign_all' ) , "'")',
-auto_assign: '$encoder.jsEscape($i18n.getString( 'auto_assign' ) , "'")',
-please_select_map: '$encoder.jsEscape($i18n.getString( 'please_select_map' ) , "'")',
-auto_assignment: '$encoder.jsEscape($i18n.getString( 'auto_assignment' ) , "'")',
-remove_all: '$encoder.jsEscape($i18n.getString( 'remove_all' ) , "'")',
-remove_all_relations: '$encoder.jsEscape($i18n.getString( 'remove_all_relations' ) , "'")',
-all_relations_for_the_map: '$encoder.jsEscape($i18n.getString( 'all_relations_for_the_map' ) , "'")',
-removed: '$encoder.jsEscape($i18n.getString( 'removed' ) , "'")',
-error_while_deleting_relation_map_and_oranisation_unit: '$encoder.jsEscape($i18n.getString( 'error_while_deleting_relation_map_and_oranisation_unit' ) , "'")',
-remove_selected: '$encoder.jsEscape($i18n.getString( 'remove_selected' ) , "'")',
-remove_relation: '$encoder.jsEscape($i18n.getString( 'remove_relation' ) , "'")',
-please_select_least_one_organisation_unit_in_the_list: '$encoder.jsEscape($i18n.getString( 'please_select_least_one_organisation_unit_in_the_list' ) , "'")',
-assign: '$encoder.jsEscape($i18n.getString( 'assign' ) , "'")',
-organisation_units: '$encoder.jsEscape($i18n.getString( 'organisation_units' ) , "'")',
-assigned_to: '$encoder.jsEscape($i18n.getString( 'assigned_to' ) , "'")',
-database: '$encoder.jsEscape($i18n.getString( 'database' ) , "'")',
-is_already_assigned: '$encoder.jsEscape($i18n.getString( 'is_already_assigned' ) , "'")',
-min_size: '$encoder.jsEscape($i18n.getString( 'min_size' ) , "'")',
-max_size: '$encoder.jsEscape($i18n.getString( 'max_size' ) , "'")',
-select_a_value: '$encoder.jsEscape($i18n.getString( 'select_a_value' ) , "'")',
-applying_organisation_units_relations: '$encoder.jsEscape($i18n.getString( 'applying_organisation_units_relations' ) , "'")',
-assigning: '$encoder.jsEscape($i18n.getString( 'assigning' ) , "'")',
-no: '$encoder.jsEscape($i18n.getString( 'no' ) , "'")',
-assigned: '$encoder.jsEscape($i18n.getString( 'assigned' ) , "'")',
-creating_map: '$encoder.jsEscape($i18n.getString( 'creating_map' ) , "'")',
-current_selection_no_data: '$encoder.jsEscape($i18n.getString( 'current_selection_no_data' ) , "'")',
-creating_choropleth: '$encoder.jsEscape($i18n.getString( 'creating_choropleth' ) , "'")',
-assign_organisation_unit: '$encoder.jsEscape($i18n.getString( 'assign_organisation_unit' ) , "'")',
-no_feature_selected: '$encoder.jsEscape($i18n.getString( 'no_feature_selected' ) , "'")',
-cursor_position: '$encoder.jsEscape($i18n.getString( 'cursor_position' ) , "'")',
-overview_map: '$encoder.jsEscape($i18n.getString( 'overview_map' ) , "'")',
-feature_data: '$encoder.jsEscape($i18n.getString( 'feature_data' ) , "'")',
-map_legend_polygon: '$encoder.jsEscape($i18n.getString( 'map_legend_polygon' ) , "'")',
-map_legend_point: '$encoder.jsEscape($i18n.getString( 'map_legend_point' ) , "'")',
-return_to_DHIS_2_dashboard: '$encoder.jsEscape($i18n.getString( 'return_to_DHIS_2_dashboard' ) , "'")',
-exit_gis: '$encoder.jsEscape($i18n.getString( 'exit_gis' ) , "'")',
-help: '$encoder.jsEscape($i18n.getString( 'help' ) , "'")',
-create_predefined_legend_sets: '$encoder.jsEscape($i18n.getString( 'create_predefined_legend_sets' ) , "'")',
-export_map_as_excel: '$encoder.jsEscape($i18n.getString( 'export_map_as_excel' ) , "'")',
-favorite_map_views: '$encoder.jsEscape($i18n.getString( 'favorite_map_views' ) , "'")',
-show_hide_labels: '$encoder.jsEscape($i18n.getString( 'show_hide_labels' ) , "'")',
-zoom_to_visible_extent: '$encoder.jsEscape($i18n.getString( 'zoom_to_visible_extent' ) , "'")',
-zoom_out: '$encoder.jsEscape($i18n.getString( 'zoom_out' ) , "'")',
-zoom_in: '$encoder.jsEscape($i18n.getString( 'zoom_in' ) , "'")',
-assign_organisation_units_to_map: '$encoder.jsEscape($i18n.getString( 'assign_organisation_units_to_map' ) , "'")',
-map_layers: '$encoder.jsEscape($i18n.getString( 'map_layers' ) , "'")',
-and: '$encoder.jsEscape($i18n.getString( 'and' ) , "'")',
-was_saved_as_base_coordinate: '$encoder.jsEscape($i18n.getString( 'was_saved_as_base_coordinate' ) , "'")',
-error_while_saving_data: '$encoder.jsEscape($i18n.getString( 'error_while_saving_data' ) , "'")',
-is_saved_as_map_source: '$encoder.jsEscape($i18n.getString( 'is_saved_as_map_source' ) , "'")',
-is_already_selected: '$encoder.jsEscape($i18n.getString( 'is_already_selected' ) , "'")',
-overlays_: '$encoder.jsEscape($i18n.getString( 'overlays_' ) , "'")',
-overlays: '$encoder.jsEscape($i18n.getString( 'overlays' ) , "'")',
-was_registered: '$encoder.jsEscape($i18n.getString( 'was_registered' ) , "'")',
-is_already_in_use: '$encoder.jsEscape($i18n.getString( 'is_already_in_use' ) , "'")',
-new_overlay: '$encoder.jsEscape($i18n.getString( 'new_overlay' ) , "'")',
-name: '$encoder.jsEscape($i18n.getString( 'name' ) , "'")',
-overlay_form_is_not_complete: '$encoder.jsEscape($i18n.getString( 'overlay_form_is_not_complete' ) , "'")',
-display_name: '$encoder.jsEscape($i18n.getString( 'display_name' ) , "'")',
-fill_color: '$encoder.jsEscape($i18n.getString( 'fill_color' ) , "'")',
-fill_opacity: '$encoder.jsEscape($i18n.getString( 'fill_opacity' ) , "'")',
-stroke_color: '$encoder.jsEscape($i18n.getString( 'stroke_color' ) , "'")',
-map_source_file: '$encoder.jsEscape($i18n.getString( 'map_source_file' ) , "'")',
-please_enter_map_title: '$encoder.jsEscape($i18n.getString( 'please_enter_map_title' ) , "'")',
-stroke_width: '$encoder.jsEscape($i18n.getString( 'stroke_width' ) , "'")',
-delete_overlay: '$encoder.jsEscape($i18n.getString( 'delete_overlay' ) , "'")',
-overlay: '$encoder.jsEscape($i18n.getString( 'overlay' ) , "'")',
-was_deleted: '$encoder.jsEscape($i18n.getString( 'was_deleted' ) , "'")',
-please_select_an_overlay: '$encoder.jsEscape($i18n.getString( 'please_select_an_overlay' ) , "'")',
-select: '$encoder.jsEscape($i18n.getString( 'select' ) , "'")',
-title: '$encoder.jsEscape($i18n.getString( 'title' ) , "'")',
-preview: '$encoder.jsEscape($i18n.getString( 'preview' ) , "'")',
-queryable: '$encoder.jsEscape($i18n.getString( 'queryable' ) , "'")',
-description: '$encoder.jsEscape($i18n.getString( 'description' ) , "'")',
-register_map: '$encoder.jsEscape($i18n.getString( 'register_map' ) , "'")',
-register_maps: '$encoder.jsEscape($i18n.getString( 'register_maps' ) , "'")',
-zoom: '$encoder.jsEscape($i18n.getString( 'zoom' ) , "'")',
-name_column: '$encoder.jsEscape($i18n.getString( 'name_column' ) , "'")',
-organisation_unit_level: '$encoder.jsEscape($i18n.getString( 'organisation_unit_level' ) , "'")',
-please_render_map_first: '$encoder.jsEscape($i18n.getString( 'please_render_map_first' ) , "'")',
-please_select_an_overlay: '$encoder.jsEscape($i18n.getString( 'please_select_an_overlay' ) , "'")',
-select: '$encoder.jsEscape($i18n.getString( 'select' ) , "'")',
-title: '$encoder.jsEscape($i18n.getString( 'title' ) , "'")',
-include_legend: '$encoder.jsEscape($i18n.getString( 'include_legend' ) , "'")',
-include_values: '$encoder.jsEscape($i18n.getString( 'include_values' ) , "'")',
-export_excel: '$encoder.jsEscape($i18n.getString( 'export_excel' ) , "'")',
-image_format: '$encoder.jsEscape($i18n.getString( 'image_format' ) , "'")',
-image_quality: '$encoder.jsEscape($i18n.getString( 'image_quality' ) , "'")',
-export_image: '$encoder.jsEscape($i18n.getString( 'export_image' ) , "'")',
-image_export: '$encoder.jsEscape($i18n.getString( 'image_export' ) , "'")',
-setup: '$encoder.jsEscape($i18n.getString( 'setup' ) , "'")',
-medium: '$encoder.jsEscape($i18n.getString( 'medium' ) , "'")',
-large: '$encoder.jsEscape($i18n.getString( 'large' ) , "'")',
-add_to_dashboard: '$encoder.jsEscape($i18n.getString( 'add_to_dashboard' ) , "'")',
-dhis_dashboard: '$encoder.jsEscape($i18n.getString( 'dhis_dashboard' ) , "'")',
-dashboard_map_view: '$encoder.jsEscape($i18n.getString( 'dashboard_map_view' ) , "'")',
-added_to_dashboard: '$encoder.jsEscape($i18n.getString( 'added_to_dashboard' ) , "'")',
-please_select_a_map_view: '$encoder.jsEscape($i18n.getString( 'please_select_a_map_view' ) , "'")',
-view: '$encoder.jsEscape($i18n.getString( 'view' ) , "'")',
-delete_map_view: '$encoder.jsEscape($i18n.getString( 'delete_map_view' ) , "'")',
-new_map_view: '$encoder.jsEscape($i18n.getString( 'new_map_view' ) , "'")',
-there_is_already_a_map_view_called : '$encoder.jsEscape($i18n.getString( 'there_is_already_a_map_view_called' ) , "'")',
-thematic_map_form_is_not_complete: '$encoder.jsEscape($i18n.getString( 'thematic_map_form_is_not_complete' ) , "'")',
-map_view_form_is_not_complete: '$encoder.jsEscape($i18n.getString( 'map_view_form_is_not_complete' ) , "'")',
-save: '$encoder.jsEscape($i18n.getString( 'save' ) , "'")',
-saving_current_thematic_map_selection : '$encoder.jsEscape($i18n.getString( 'saving_current_thematic_map_selection' ) , "'")',
-new_legend_set: '$encoder.jsEscape($i18n.getString( 'new_legend_set' ) , "'")',
-already_exists: '$encoder.jsEscape($i18n.getString( 'already_exists' ) , "'")',
-a_legend_set_called: '$encoder.jsEscape($i18n.getString( 'a_legend_set_called' ) , "'")',
-assign_to_indicator: '$encoder.jsEscape($i18n.getString( 'assign_to_indicator' ) , "'")',
-assign_to_dataelement: '$encoder.jsEscape($i18n.getString( 'assign_to_dataelement' ) , "'")',
-please_select_a_legend_set: '$encoder.jsEscape($i18n.getString( 'please_select_a_legend_set' ) , "'")',
-link_legend_set_to_indicator: '$encoder.jsEscape($i18n.getString( 'link_legend_set_to_indicator' ) , "'")',
-please_select_at_least_one_indicator: '$encoder.jsEscape($i18n.getString( 'please_select_at_least_one_indicator' ) , "'")',
-was_updated: '$encoder.jsEscape($i18n.getString( 'was_updated' ) , "'")',
-automatic_legend_sets: '$encoder.jsEscape($i18n.getString( 'automatic_legend_sets' ) , "'")',
-start_value: '$encoder.jsEscape($i18n.getString( 'start_value' ) , "'")',
-end_value: '$encoder.jsEscape($i18n.getString( 'end_value' ) , "'")',
-color: '$encoder.jsEscape($i18n.getString( 'color' ) , "'")',
-new_legend: '$encoder.jsEscape($i18n.getString( 'new_legend' ) , "'")',
-please_select_a_legend: '$encoder.jsEscape($i18n.getString( 'please_select_a_legend' ) , "'")',
-legends: '$encoder.jsEscape($i18n.getString( 'legends' ) , "'")',
-overlapping_legends_are_not_allowed: '$encoder.jsEscape($i18n.getString( 'overlapping_legends_are_not_allowed' ) , "'")',
-please_select_at_least_one_legend: '$encoder.jsEscape($i18n.getString( 'please_select_at_least_one_legend' ) , "'")',
-predefined_legend_sets: '$encoder.jsEscape($i18n.getString( 'predefined_legend_sets' ) , "'")',
-assignment: '$encoder.jsEscape($i18n.getString( 'assignment' ) , "'")',
-geoserver_shapefiles: '$encoder.jsEscape($i18n.getString( 'geoserver_shapefiles' ) , "'")',
-must_be_a_number: '$encoder.jsEscape($i18n.getString( 'must_be_a_number' ) , "'")',
-must_be_between_180_and_180: '$encoder.jsEscape($i18n.getString( 'must_be_between_-180_and_180' ) , "'")',
-must_be_between_90_and_90: '$encoder.jsEscape($i18n.getString( 'must_be_between_-90_and_90' ) , "'")',
-there_is_already_a_map_called: '$encoder.jsEscape($i18n.getString( 'there_is_already_a_map_called' ) , "'")',
-selected_relations_removed: '$encoder.jsEscape($i18n.getString( 'selected_relations_removed' ) , "'")',
-the_source_file: '$encoder.jsEscape($i18n.getString( 'the_source_file' ) , "'")',
-delete_baselayer: '$encoder.jsEscape($i18n.getString( 'delete_baselayer' ) , "'")',
-please_select_a_baselayer: '$encoder.jsEscape($i18n.getString( 'please_select_a_baselayer' ) , "'")',
-baselayer: '$encoder.jsEscape($i18n.getString( 'baselayer' ) , "'")',
-baselayers: '$encoder.jsEscape($i18n.getString( 'baselayers' ) , "'")',
-url: '$encoder.jsEscape($i18n.getString( 'url' ) , "'")',
-layer: '$encoder.jsEscape($i18n.getString( 'layer' ) , "'")',
-new_baselayer: '$encoder.jsEscape($i18n.getString( 'new_baselayer' ) , "'")',
-baselayer_form_is_not_complete: '$encoder.jsEscape($i18n.getString( 'baselayer_form_is_not_complete' ) , "'")',
-mapvaluetype: '$encoder.jsEscape($i18n.getString( 'mapvaluetype' ) , "'")',
-dataelement_group: '$encoder.jsEscape($i18n.getString( 'dataelement_group' ) , "'")',
-dataelement: '$encoder.jsEscape($i18n.getString( 'dataelement' ) , "'")',
-organisation_units_assigned: '$encoder.jsEscape($i18n.getString( 'organisation_units_assigned' ) , "'")',
-the_view: '$encoder.jsEscape($i18n.getString( 'the_view' ) , "'")',
-parent_orgunit: '$encoder.jsEscape($i18n.getString( 'parent_orgunit' ) , "'")',
-delete_map: '$encoder.jsEscape($i18n.getString( 'delete_map' ) , "'")',
-aggregating_map_values: '$encoder.jsEscape($i18n.getString( 'aggregating_map_values' ) , "'")',
-loading_geojson: '$encoder.jsEscape($i18n.getString( 'loading_geojson' ) , "'")',
-date_type: '$encoder.jsEscape($i18n.getString( 'date_type' ) , "'")',
-saved_as_date_type: '$encoder.jsEscape($i18n.getString( 'saved_as_date_type' ) , "'")',
-start_date: '$encoder.jsEscape($i18n.getString( 'start_date' ) , "'")',
-end_date: '$encoder.jsEscape($i18n.getString( 'end_date' ) , "'")',
-fixed_periods: '$encoder.jsEscape($i18n.getString( 'fixed_periods' ) , "'")',
-start_end_dates: '$encoder.jsEscape($i18n.getString( 'start_end_dates' ) , "'")',
-please_expand_layer_panel: '$encoder.jsEscape($i18n.getString( 'please_expand_layer_panel' ) , "'")',
-has_no_orgunits: '$encoder.jsEscape($i18n.getString( 'has_no_orgunits' ) , "'")',
-highlight_color: '$encoder.jsEscape($i18n.getString( 'highlight_color' ) , "'")',
-feature_filter: '$encoder.jsEscape($i18n.getString( 'feature_filter' ) , "'")',
-locate_features: '$encoder.jsEscape($i18n.getString( 'locate_features' ) , "'")',
-no_coordinates_found: '$encoder.jsEscape($i18n.getString( 'no_coordinates_found' ) , "'")',
-image_resolution: '$encoder.jsEscape($i18n.getString( 'image_resolution' ) , "'")',
-max: '$encoder.jsEscape($i18n.getString( 'max' ) , "'")',
-characters: '$encoder.jsEscape($i18n.getString( 'characters' ) , "'")',
-geojson_file: '$encoder.jsEscape($i18n.getString( 'geojson_file' ) , "'")',
-history: '$encoder.jsEscape($i18n.getString( 'history' ) , "'")',
-api_key: '$encoder.jsEscape($i18n.getString( 'api_key' ) , "'")',
-measure_distance: '$encoder.jsEscape($i18n.getString( 'measure_distance' ) , "'")',
-low_point_size: '$encoder.jsEscape($i18n.getString( 'low_point_size' ) , "'")',
-high_point_size: '$encoder.jsEscape($i18n.getString( 'high_point_size' ) , "'")',
-system: '$encoder.jsEscape($i18n.getString( 'system' ) , "'")',
-width: '$encoder.jsEscape($i18n.getString( 'width' ) , "'")',
-height: '$encoder.jsEscape($i18n.getString( 'height' ) , "'")',
-text_filter: '$encoder.jsEscape($i18n.getString( 'text_filter' ) , "'")',
-font_size: '$encoder.jsEscape($i18n.getString( 'font_size' ) , "'")',
-bold_: '$encoder.jsEscape($i18n.getString( 'bold_' ) , "'")',
-italic: '$encoder.jsEscape($i18n.getString( 'italic' ) , "'")',
-level: '$encoder.jsEscape($i18n.getString( 'level' ) , "'")',
-low_point_size: '$encoder.jsEscape($i18n.getString( 'low_point_size' ) , "'")',
-high_point_size: '$encoder.jsEscape($i18n.getString( 'high_point_size' ) , "'")',
-system: '$encoder.jsEscape($i18n.getString( 'system' ) , "'")',
-width: '$encoder.jsEscape($i18n.getString( 'width' ) , "'")',
-height: '$encoder.jsEscape($i18n.getString( 'height' ) , "'")',
-text_filter: '$encoder.jsEscape($i18n.getString( 'text_filter' ) , "'")',
-font_size: '$encoder.jsEscape($i18n.getString( 'font_size' ) , "'")',
-bold_: '$encoder.jsEscape($i18n.getString( 'bold_' ) , "'")',
-italic: '$encoder.jsEscape($i18n.getString( 'italic' ) , "'")',
-select_outer_boundary: '$encoder.jsEscape($i18n.getString( 'select_outer_boundary' ) , "'")',
-select_organisation_unit_level: '$encoder.jsEscape($i18n.getString( 'select_organisation_unit_level' ) , "'")',
-type: '$encoder.jsEscape($i18n.getString( 'type' ) , "'")',
-code: '$encoder.jsEscape($i18n.getString( 'code' ) , "'")',
-address: '$encoder.jsEscape($i18n.getString( 'address' ) , "'")',
-contact_person: '$encoder.jsEscape($i18n.getString( 'contact_person' ) , "'")',
-email: '$encoder.jsEscape($i18n.getString( 'email' ) , "'")',
-phone_number: '$encoder.jsEscape($i18n.getString( 'phone_number' ) , "'")',
-infrastructural_data: '$encoder.jsEscape($i18n.getString( 'infrastructural_data' ) , "'")',
-select_point_level: '$encoder.jsEscape($i18n.getString( 'select_point_level' ) , "'")',
-level_is_higher_that_boundary_level: '$encoder.jsEscape($i18n.getString( 'level_is_higher_that_boundary_level' ) , "'")',
-select_new_location_on_map: '$encoder.jsEscape($i18n.getString( 'select_new_location_on_map' ) , "'")',
-show_information_sheet: '$encoder.jsEscape($i18n.getString( 'show_information_sheet' ) , "'")',
-relocate: '$encoder.jsEscape($i18n.getString( 'relocate' ) , "'")',
-administrator_settings: '$encoder.jsEscape($i18n.getString( 'administrator_settings' ) , "'")',
-thematic_layer: '$encoder.jsEscape($i18n.getString( 'thematic_layer' ) , "'")',
-register_map_favorite: '$encoder.jsEscape($i18n.getString( 'register_map_favorite' ) , "'")',
-delete_favorite: '$encoder.jsEscape($i18n.getString( 'delete_favorite' ) , "'")',
-register_new_legend: '$encoder.jsEscape($i18n.getString( 'register_new_legend' ) , "'")',
-delete_legend: '$encoder.jsEscape($i18n.getString( 'delete_legend' ) , "'")',
-overlay_: '$encoder.jsEscape($i18n.getString( 'overlay_' ) , "'")',
-register_new_legend_set: '$encoder.jsEscape($i18n.getString( 'register_new_legend_set' ) , "'")',
-delete_legend_set: '$encoder.jsEscape($i18n.getString( 'delete_legend_set' ) , "'")',
-assign_indicators_to_legend_set: '$encoder.jsEscape($i18n.getString( 'assign_indicators_to_legend_set' ) , "'")',
-assign_dataelements_to_legend_set: '$encoder.jsEscape($i18n.getString( 'assign_dataelements_to_legend_set' ) , "'")',
-export_image: '$encoder.jsEscape($i18n.getString( 'export_image' ) , "'")',
-export_thematic_map_to_png: '$encoder.jsEscape($i18n.getString( 'export_thematic_map_to_png' ) , "'")',
-total_distance: '$encoder.jsEscape($i18n.getString( 'total_distance' ) , "'")',
-set_thematic_map_date_type: '$encoder.jsEscape($i18n.getString( 'set_thematic_map_date_type' ) , "'")',
-date: '$encoder.jsEscape($i18n.getString( 'date' ) , "'")',
-legend_symbolizer: '$encoder.jsEscape($i18n.getString( 'legend_symbolizer' ) , "'")',
-image: '$encoder.jsEscape($i18n.getString( 'image' ) , "'")',
-register_new_wms_overlay: '$encoder.jsEscape($i18n.getString( 'register_new_wms_overlay' ) , "'")',
-register_new_vector_overlay: '$encoder.jsEscape($i18n.getString( 'register_new_vector_overlay' ) , "'")',
-manage_favorites: '$encoder.jsEscape($i18n.getString( 'manage_favorites' ) , "'")',
-layers: '$encoder.jsEscape($i18n.getString( 'layers' ) , "'")' ,
-tools: '$encoder.jsEscape($i18n.getString( 'tools' ) , "'")',
-edit_layer: '$encoder.jsEscape($i18n.getString( 'edit_layer' ) , "'")',
-clear: '$encoder.jsEscape($i18n.getString( 'clear' ) , "'")',
-search: '$encoder.jsEscape($i18n.getString( 'search' ) , "'")',
-labels: '$encoder.jsEscape($i18n.getString( 'labels' ) , "'")',
-show_hide_feature_labels: '$encoder.jsEscape($i18n.getString( 'show_hide_feature_labels' ) , "'")' ,
-opacity: '$encoder.jsEscape($i18n.getString( 'opacity' ) , "'")',
-history: '$encoder.jsEscape($i18n.getString( 'history' ) , "'")',
-data_options: '$encoder.jsEscape($i18n.getString( 'data_options' ) , "'")' ,
-legend_options: '$encoder.jsEscape($i18n.getString( 'legend_options' ) , "'")',
-parent_organisation_unit: '$encoder.jsEscape($i18n.getString( 'parent_organisation_unit' ) , "'")',
-resize: '$encoder.jsEscape($i18n.getString( 'resize' ) , "'")',
-facility_layer: '$encoder.jsEscape($i18n.getString( 'facility_layer' ) , "'")',
-open_which_layer: '$encoder.jsEscape($i18n.getString( 'open_which_layer' ) , "'")',
-organisationunit_search: '$encoder.jsEscape($i18n.getString( 'organisationunit_search' ) , "'")',
-no_features_rendered: '$encoder.jsEscape($i18n.getString( 'no_features_rendered' ) , "'")',
-wms_overlays: '$encoder.jsEscape($i18n.getString( 'wms_overlays' ) , "'")',
-file_overlays: '$encoder.jsEscape($i18n.getString( 'file_overlays' ) , "'")' ,
-symbol_layer: '$encoder.jsEscape($i18n.getString( 'symbol_layer' ) , "'")',
-centroid_layer: '$encoder.jsEscape($i18n.getString( 'centroid_layer' ) , "'")',
-no_values_found: '$encoder.jsEscape($i18n.getString( 'no_values_found' ) , "'")',
-close: '$encoder.jsEscape($i18n.getString( 'close' ) , "'")',
-boundary_layer: '$encoder.jsEscape($i18n.getString( 'boundary_layer' ) , "'")',
-register_new_wms_overlay: '$encoder.jsEscape($i18n.getString( 'register_new_wms_overlay' ) , "'")',
-can_view: '$encoder.jsEscape($i18n.getString( 'can_view' ) , "'")',
-can_edit_and_view: '$encoder.jsEscape($i18n.getString( 'can_edit_and_view' ) , "'")',
-none: '$encoder.jsEscape($i18n.getString( 'none' ) , "'")',
-public_access: '$encoder.jsEscape($i18n.getString( 'public_access' ) , "'")',
-search_for_user_groups: '$encoder.jsEscape($i18n.getString( 'search_for_user_groups' ) , "'")',
-create: '$encoder.jsEscape($i18n.getString( 'create' ) , "'")',
-add_new: '$encoder.jsEscape($i18n.getString( 'add_new' ) , "'")',
-search_for_favorites: '$encoder.jsEscape($i18n.getString( 'search_for_favorites' ) , "'")',
-prev: '$encoder.jsEscape($i18n.getString( 'prev' ) , "'")',
-next: '$encoder.jsEscape($i18n.getString( 'next' ) , "'")',
-no_map_to_save: '$encoder.jsEscape($i18n.getString( 'no_map_to_save' ) , "'")',
-rename: '$encoder.jsEscape($i18n.getString( 'rename' ) , "'")',
-overwrite: '$encoder.jsEscape($i18n.getString( 'overwrite' ) , "'")',
-share_with_other_people: '$encoder.jsEscape($i18n.getString( 'share_with_other_people' ) , "'")',
-legend_set_name: '$encoder.jsEscape($i18n.getString( 'legend_set_name' ) , "'")',
-legend_name: '$encoder.jsEscape($i18n.getString( 'legend_name' ) , "'")',
-add_legend: '$encoder.jsEscape($i18n.getString( 'add_legend' ) , "'")',
-favorite_outdated_create_new: '$encoder.jsEscape($i18n.getString( 'favorite_outdated_create_new' ) , "'")',
-no_valid_coordinates_found: '$encoder.jsEscape($i18n.getString( 'no_valid_coordinates_found' ) , "'")',
-invalid_coordinates: '$encoder.jsEscape($i18n.getString( 'invalid_coordinates' ) , "'")',
-coordinates_could_not_be_loaded: '$encoder.jsEscape($i18n.getString( 'coordinates_could_not_be_loaded' ) , "'")',
-no_aggregated_data_found: '$encoder.jsEscape($i18n.getString( 'no_aggregated_data_found' ) , "'")',
-start_end_value: '$encoder.jsEscape($i18n.getString( 'start_end_value' ) , "'")',
-current_legends: '$encoder.jsEscape($i18n.getString( 'current_legends' ) , "'")',
-legendsets: '$encoder.jsEscape($i18n.getString( 'legendsets' ) , "'")',
-download: '$encoder.jsEscape($i18n.getString( 'download' ) , "'")',
-please_create_map_first: '$encoder.jsEscape($i18n.getString( 'please_create_map_first' ) , "'")',
-download_map_as_png: '$encoder.jsEscape($i18n.getString( 'download_map_as_png' ) , "'")',
-write_your_interpretation: '$encoder.jsEscape($i18n.getString( 'write_your_interpretation' ) , "'")',
-share: '$encoder.jsEscape($i18n.getString( 'share' ) , "'")',
-share_interpretation: '$encoder.jsEscape($i18n.getString( 'share_interpretation' ) , "'")',
-organisation_unit_level_parent: '$encoder.jsEscape($i18n.getString( 'organisation_unit_level_parent' ) , "'")',
-value_type: '$encoder.jsEscape($i18n.getString( 'value_type' ) , "'")',
-equal_counts: '$encoder.jsEscape($i18n.getString( 'equal_counts' ) , "'")',
-classes_method: '$encoder.jsEscape($i18n.getString( 'classes_method' ) , "'")',
-low_color_size: '$encoder.jsEscape($i18n.getString( 'low_color_size' ) , "'")',
-high_color_size: '$encoder.jsEscape($i18n.getString( 'high_color_size' ) , "'")',
-no_indicator_selected: '$encoder.jsEscape($i18n.getString( 'no_indicator_selected' ) , "'")',
-no_dataelement_selected: '$encoder.jsEscape($i18n.getString( 'no_dataelement_selected' ) , "'")',
-no_period_selected: '$encoder.jsEscape($i18n.getString( 'no_period_selected' ) , "'")',
-no_legendset_selected: '$encoder.jsEscape($i18n.getString( 'no_legendset_selected' ) , "'")',
-no_level_selected: '$encoder.jsEscape($i18n.getString( 'no_level_selected' ) , "'")',
-no_parent_organisationunit_selected: '$encoder.jsEscape($i18n.getString( 'no_parent_organisationunit_selected' ) , "'")',
-no_groupset_selected: '$encoder.jsEscape($i18n.getString( 'no_groupset_selected' ) , "'")',
-show_circular_area: '$encoder.jsEscape($i18n.getString( 'show_circular_area' ) , "'")',
-organisationunit_groupset: '$encoder.jsEscape($i18n.getString( 'organisationunit_groupset' ) , "'")',
-surrounding_areas: '$encoder.jsEscape($i18n.getString( 'surrounding_areas' ) , "'")',
-table: '$encoder.jsEscape($i18n.getString( 'table' ) , "'")',
-chart: '$encoder.jsEscape($i18n.getString( 'chart' ) , "'")',
-layer_stack_transparency: '$encoder.jsEscape($i18n.getString( 'layer_stack_transparency' ) , "'")',
-thematic_layer_1_legend: '$encoder.jsEscape($i18n.getString( 'thematic_layer_1_legend' ) , "'")',
-thematic_layer_2_legend: '$encoder.jsEscape($i18n.getString( 'thematic_layer_2_legend' ) , "'")',
-thematic_layer_3_legend: '$encoder.jsEscape($i18n.getString( 'thematic_layer_3_legend' ) , "'")',
-thematic_layer_4_legend: '$encoder.jsEscape($i18n.getString( 'thematic_layer_4_legend' ) , "'")',
-facility_layer_legend: '$encoder.jsEscape($i18n.getString( 'facility_layer_legend' ) , "'")',
-facility_layer_export_currently_not_supported: '$encoder.jsEscape($i18n.getString( 'facility_layer_export_currently_not_supported' ) , "'")',
-link_: '$encoder.jsEscape($i18n.getString( 'link_' ) , "'")',
-level_not_higher_than_parent_level: '$encoder.jsEscape($i18n.getString( 'level_not_higher_than_parent_level' ) , "'")',
-information: '$encoder.jsEscape($i18n.getString( 'information' ) , "'")',
-parent_unit: '$encoder.jsEscape($i18n.getString( 'parent_unit' ) , "'")',
-home: '$encoder.jsEscape($i18n.getString( 'home' ) , "'")',
-google_streets: '$encoder.jsEscape($i18n.getString( 'google_streets' ) , "'")',
-google_hybrid: '$encoder.jsEscape($i18n.getString( 'google_hybrid' ) , "'")',
-openstreetmap: '$encoder.jsEscape($i18n.getString( 'openstreetmap' ) , "'")',
-totals: '$encoder.jsEscape($i18n.getString( 'totals' ) , "'")',
-details: '$encoder.jsEscape($i18n.getString( 'details' ) , "'")',
-last_week: '$encoder.jsEscape($i18n.getString( 'last_week' ) , "'")',
-last_month: '$encoder.jsEscape($i18n.getString( 'last_month' ) , "'")',
-last_bimonth: '$encoder.jsEscape($i18n.getString( 'last_bimonth' ) , "'")',
-last_quarter: '$encoder.jsEscape($i18n.getString( 'last_quarter' ) , "'")',
-last_sixmonth: '$encoder.jsEscape($i18n.getString( 'last_sixmonth' ) , "'")',
-this_year: '$encoder.jsEscape($i18n.getString( 'this_year' ) , "'")',
-last_year: '$encoder.jsEscape($i18n.getString( 'last_year' ) , "'")',
-last_financial_year: '$encoder.jsEscape($i18n.getString( 'last_financial_year' ) , "'")',
-select_organisation_units: '$encoder.jsEscape($i18n.getString( 'select_organisation_units' ) , "'")',
-select_boundaries_and_levels: '$encoder.jsEscape($i18n.getString( 'select_boundaries_and_levels' ) , "'")',
-select_organisation_unit_levels: '$encoder.jsEscape($i18n.getString( 'select_organisation_unit_levels' ) , "'")',
-select_boundaries_and_groups: '$encoder.jsEscape($i18n.getString( 'select_boundaries_and_groups' ) , "'")',
-select_organisation_unit_groups: '$encoder.jsEscape($i18n.getString( 'select_organisation_unit_groups' ) , "'")',
-user_organisation_unit: '$encoder.jsEscape($i18n.getString( 'user_organisation_unit' ) , "'")',
-user_organisation_unit_children: '$encoder.jsEscape($i18n.getString( 'user_organisation_unit_children' ) , "'")',
-user_organisation_unit_grandchildren: '$encoder.jsEscape($i18n.getString( 'user_organisation_unit_grandchildren' ) , "'")',
-user_organisation_units: '$encoder.jsEscape($i18n.getString( 'user_organisation_units' ) , "'")',
-dataset: '$encoder.jsEscape($i18n.getString( 'dataset' ) , "'")',
-select_all_children: '$encoder.jsEscape($i18n.getString( 'select_all_children' ) , "'")',
-select_groupset: '$encoder.jsEscape($i18n.getString( 'select_groupset' ) , "'")',
-allow_external_access: '$encoder.jsEscape($i18n.getString( 'allow_external_access' ) , "'")',
-"daily": "$encoder.jsEscape($i18n.getString( 'daily' ) , "'")",
-"weekly": "$encoder.jsEscape($i18n.getString( 'weekly' ) , "'")",
-"monthly": "$encoder.jsEscape($i18n.getString( 'monthly' ) , "'")",
-"bimonthly": "$encoder.jsEscape($i18n.getString( 'bimonthly' ) , "'")",
-"quarterly": "$encoder.jsEscape($i18n.getString( 'quarterly' ) , "'")",
-"sixmonthly": "$encoder.jsEscape($i18n.getString( 'sixmonthly' ) , "'")",
-"sixmonthly_april": "$encoder.jsEscape($i18n.getString( 'sixmonthly_april' ) , "'")",
-"yearly": "$encoder.jsEscape($i18n.getString( 'yearly' ) , "'")",
-"financial_oct": "$encoder.jsEscape($i18n.getString( 'financial_oct' ) , "'")",
-"financial_july": "$encoder.jsEscape($i18n.getString( 'financial_july' ) , "'")",
-"financial_april": "$encoder.jsEscape($i18n.getString( 'financial_april' ) , "'")",
-"relative": "$encoder.jsEscape($i18n.getString( 'relative' ) , "'")",
-"reporting_rates": "$encoder.jsEscape($i18n.getString( 'reporting_rates' ) , "'")"
-};
\ No newline at end of file
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/images' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/images'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/index.html' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html'
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm 2011-06-08 15:22:35 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#set( $size = $object.size() )
-{ "mapValues": [
-#foreach( $value in $object )
- {
- "orgUnitId": "$!{value.organisationUnitId}",
- "orgUnitName": "$!{value.organisationUnitName}",
- "featureId": "$!{value.featureId}",
- "periodId": "$!{value.periodId}",
- "value": "$!{value.value}",
- "factor": "$!{value.factor}",
- "numeratorValue": "$!{value.numeratorValue}",
- "denominatorValue": "$!{value.denominatorValue}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonBaseCoordinate.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonBaseCoordinate.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonBaseCoordinate.vm 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-{
- "baseCoordinate": [
- {
- "longitude": "$!encoder.jsonEncode( ${longitude} )",
- "latitude": "$!encoder.jsonEncode( ${latitude} )"
- }
-]}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroupSets.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroupSets.vm 2011-06-06 14:30:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroupSets.vm 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#set( $size = $object.size() )
-{"dataElementGroupSets":[#foreach( $dataElementGroupSet in $object ) {"id":"$!{dataElementGroupSet.id}","name":"$!encoder.jsonEncode( ${dataElementGroupSet.name} )" }#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroups.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroups.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonDataElementGroups.vm 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#set( $size = $object.size() )
-{"dataElementGroups":[#foreach( $dataElementGroup in $object ) {"id":"$!{dataElementGroup.id}","name":"$!encoder.jsonEncode( ${dataElementGroup.name} )" }#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonGeoJsonFiles.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonGeoJsonFiles.vm 2009-09-10 07:02:04 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonGeoJsonFiles.vm 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#set( $size = $object.size() )
-{ "files": [
-#foreach ( $file in $object )
- {
- "name": "$!{file}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#set( $size = $object.size() )
-{ "indicatorGroups": [
-#foreach( $indicatorGroup in $object )
- {
- "id": "$!{indicatorGroup.id}",
- "name": "$!encoder.jsonEncode( ${indicatorGroup.name} )"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInfrastructuralAggregatedMapValues.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInfrastructuralAggregatedMapValues.vm 2013-06-09 19:12:02 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInfrastructuralAggregatedMapValues.vm 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#set( $size = $object.size() )
-{"mapValues":[
-#foreach( $de in $object.keySet() ){"dataElementName":"$!encoder.jsonEncode(${de.name})","value":$!{object.get( $de )}}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInitialize.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInitialize.vm 2014-01-30 16:36:21 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonInitialize.vm 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#set($oucSize = $currentUser.getOrganisationUnit().getSortedChildren().size())
-#if($callback)$!{callback}
-(
-#end
-{
-"systemSettings":{"infrastructuralDataElementGroup":"$!{infrastructuralDataElementGroup.uid}","infrastructuralPeriodType": "$!{infrastructuralPeriodType.name}"}
-}
-#if($callback)
-)
-#end
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMap.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMap.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMap.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-{ "map":
- [{
- "id": "$!{object.id}",
- "name": "$!encoder.jsonEncode( ${object.name} )",
- "mapLayerPath": "$!encoder.jsonEncode( ${object.mapLayerPath} )",
- "organisationUnitLevel": "$!{object.organisationUnitLevel.level}",
- "nameColumn": "$!encoder.jsonEncode( ${object.nameColumn} )"
- }]
-}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLayers.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLayers.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLayers.vm 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#set( $size = $object.size() )
-{ "mapLayers": [
-#foreach( $mapLayer in $object )
- {
- "id": "$!{mapLayer.id}",
- "name": "$!encoder.jsonEncode( ${mapLayer.name} )",
- "type": "$!encoder.jsonEncode( ${mapLayer.type} )",
- "mapSource": "$!encoder.jsonEncode( ${mapLayer.mapSource} )",
- "layer": "$!encoder.jsonEncode( ${mapLayer.layer} )",
- "fillColor": "$!encoder.jsonEncode( ${mapLayer.fillColor} )",
- "fillOpacity": "$!{mapLayer.fillOpacity}",
- "strokeColor": "$!encoder.jsonEncode( ${mapLayer.strokeColor} )",
- "strokeWidth": "$!{mapLayer.strokeWidth}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSet.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSet.vm 2011-07-13 21:01:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSet.vm 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#set( $indicators_size = $object.indicators.size() )
-#set( $dataelements_size = $object.dataElements.size() )
-{ "mapLegendSet":
- [{
- "id": "$!{object.id}",
- "name": "$!encoder.jsonEncode( ${object.name} )",
- "symbolizer": "$!encoder.jsonEncode( ${object.symbolizer} )",
- "indicators": [#foreach( $indicator in $object.indicators )$!{indicator.id}#if( $velocityCount < $indicators_size ),#end#end],
- "dataElements": [#foreach( $dataElement in $object.dataElements )$!{dataElement.id}#if( $velocityCount < $dataelements_size ),#end#end]
- }]
-}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSets.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSets.vm 2011-07-13 21:01:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegendSets.vm 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#set( $size = $object.size() )
-{ "mapLegendSets": [
-#foreach( $legendSet in $object )
- {
- "id": "$!{legendSet.id}",
- "name": "$!encoder.jsonEncode( ${legendSet.name} )",
- "symbolizer": "$!encoder.jsonEncode( ${legendSet.symbolizer} )",
- "indicators": [#foreach( $indicator in $legendSet.indicators )$!{indicator.id}#if( $velocityCount < $legendSet.indicators.size() ),#end#end],
- "dataElements": [#foreach( $dataElement in $legendSet.dataElements )$!{dataElement.id}#if( $velocityCount < $legendSet.dataElements.size() ),#end#end]
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm 2011-07-13 11:32:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#set( $size = $object.size() )
-{ "mapLegends": [
-#foreach( $mapLegend in $object )
- {
- "id": $!{mapLegend.id},
- "name": "$!encoder.jsonEncode( ${mapLegend.name} )",
- "startValue": $!{mapLegend.startValue},
- "endValue": $!{mapLegend.endValue},
- "color": "$!encoder.jsonEncode( ${mapLegend.color} )",
- "image": "$!encoder.jsonEncode( ${mapLegend.image} )",
- "displayString": "$!encoder.jsonEncode( ${mapLegend.name} ), $!{mapLegend.startValue} - $!{mapLegend.endValue}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelation.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelation.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelation.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-{ "mapOrganisationUnitRelation":
- [{
- "id": "$!{object.id}",
- "map": "$!encoder.jsonEncode( ${object.map.mapLayerPath} )",
- "organisationUnit": "$!encoder.jsonEncode( ${object.organisationUnit.name} )",
- "organisationUnitId": "$!{object.organisationUnit.id}",
- "featureId": "$!encoder.jsonEncode( ${object.featureId} )"
- }]
-}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#set( $size = $object.size() )
-{ "mapOrganisationUnitRelations": [
-#foreach( $mapOrganisationUnitRelation in $object )
- {
- "id": "$!{mapOrganisationUnitRelation.id}",
- "map": "$!encoder.jsonEncode( ${mapOrganisationUnitRelation.map.mapLayerPath} )",
- "organisationUnit": "$!encoder.jsonEncode( ${mapOrganisationUnitRelation.organisationUnit.name} )",
- "organisationUnitId": $!{mapOrganisationUnitRelation.organisationUnit.id},
- "featureId": "$!{mapOrganisationUnitRelation.featureId}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapView.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapView.vm 2013-01-28 06:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapView.vm 1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-{ "mapView":
- [{
- "id": "$!{object.id}",
- "name": "$!encoder.jsonEncode( ${object.name} )",
- "userId": "$!{object.user.id}",
- "featureType": "$!encoder.jsonEncode( ${object.featureType} )",
- "mapValueType": "$!encoder.jsonEncode( ${object.mapValueType} )",
- "indicatorGroupId": "$!{object.indicatorGroup.id}",
- "indicatorId": "$!{object.indicator.id}",
- "dataElementGroupId": "$!{object.dataElementGroup.id}",
- "dataElementId": "$!{object.dataElement.id}",
- "mapDateType": "$!encoder.jsonEncode( ${object.mapDateTypeNullSafe} )",
- "periodTypeId": "$!encoder.jsonEncode( ${object.periodType.name} )",
- "periodId": "$!{object.period.id}",
- "parentOrganisationUnitId": "$!{object.parentOrganisationUnit.id}",
- "parentOrganisationUnitName": "$!encoder.jsonEncode( ${object.parentOrganisationUnit.name} )",
- "parentOrganisationUnitLevel": "$!{object.parentOrganisationUnit.level}",
- "organisationUnitLevel": "$!{object.organisationUnitLevel.level}",
- "organisationUnitLevelName": "$!{object.organisationUnitLevel.displayName}",
- "mapLegendType": "$!encoder.jsonEncode( ${object.mapLegendType} )",
- "method": "$!{object.method}",
- "classes": "$!{object.classes}",
- "bounds": "$!{object.bounds}",
- "colorLow": "$!encoder.jsonEncode( ${object.colorLow} )",
- "colorHigh": "$!encoder.jsonEncode( ${object.colorHigh} )",
- "mapLegendSetId": "$!{object.mapLegendSet.id}",
- "radiusLow": "$!{object.radiusLow}",
- "radiusHigh": "$!{object.radiusHigh}",
- "longitude": "$!encoder.jsonEncode( ${object.longitude} )",
- "latitude": "$!encoder.jsonEncode( ${object.latitude} )",
- "zoom": "$!{object.zoom}"
- }]
-}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapViews.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapViews.vm 2013-01-28 06:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonMapViews.vm 1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#set( $size = $object.size() )
-{ "mapViews": [
-#foreach( $mapView in $object )
- {
- "id": "$!{mapView.id}",
- "name": "$!encoder.jsonEncode( ${mapView.name} )",
- "userId": "$!{mapView.user.id}",
- "featureType": "$!encoder.jsonEncode( ${mapView.featureType} )",
- "mapValueType": "$!encoder.jsonEncode( ${mapView.mapValueType} )",
- "indicatorGroupId": "$!{mapView.indicatorGroup.id}",
- "indicatorId": "$!{mapView.indicator.id}",
- "dataElementGroupId": "$!{mapView.dataElementGroup.id}",
- "dataElementId": "$!{mapView.dataElement.id}",
- "mapDateType": "$!encoder.jsonEncode( ${mapView.mapDateTypeNullSafe} )",
- "periodTypeId": "$!encoder.jsonEncode( ${mapView.periodType.name} )",
- "periodId": "$!{mapView.period.id}",
- "parentOrganisationUnitId": "$!{mapView.parentOrganisationUnit.id}",
- "parentOrganisationUnitName": "$!encoder.jsonEncode( ${mapView.parentOrganisationUnit.name} )",
- "parentOrganisationUnitLevel": "$!{mapView.parentOrganisationUnit.level}",
- "organisationUnitLevel": "$!{mapView.organisationUnitLevel.level}",
- "organisationUnitLevelName": "$!{mapView.organisationUnitLevel.displayName}",
- "mapLegendType": "$!encoder.jsonEncode( ${mapView.mapLegendType} )",
- "method": "$!{mapView.method}",
- "classes": "$!{mapView.classes}",
- "bounds": "$!{mapView.bounds}",
- "colorLow": "$!encoder.jsonEncode( ${mapView.colorLow} )",
- "colorHigh": "$!encoder.jsonEncode( ${mapView.colorHigh} )",
- "mapLegendSetId": "$!{mapView.mapLegendSet.id}",
- "radiusLow": "$!{mapView.radiusLow}",
- "radiusHigh": "$!{mapView.radiusHigh}",
- "longitude": "$!encoder.jsonEncode( ${mapView.longitude} )",
- "latitude": "$!encoder.jsonEncode( ${mapView.latitude} )",
- "zoom": "$!{mapView.zoom}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm 2013-01-28 06:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#set( $size = $object.size() )
-{ "organisationUnitLevels": [
-#foreach ( $level in $object )
- {
- "id": "$!{level.id}",
- "level": "$!{level.level}",
- "name": "$!encoder.jsonEncode( ${level.displayName} )"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#set( $size = $object.size() )
-{ "organisationUnits": [
-#foreach ( $unit in $object )
- {
- "id": "$!{unit.id}",
- "name": "$!encoder.jsonEncode( ${unit.name} )",
- "shortName": "$!encoder.jsonEncode( ${unit.shortName} )",
- "code": "$!encoder.jsonEncode( ${unit.code} )",
- "openingDate": "$!{unit.openingDate}",
- "closedDate": "$!{unit.closedDate}",
- "active": "$!{unit.active}",
- "comment": "$!encoder.jsonEncode( ${unit.comment} )",
- "geoCode": "$!{unit.geoCode}",
- "latitude": "$!{unit.latitude}",
- "longitude": "$!{unit.longitude}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
-
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOutputFile.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOutputFile.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonOutputFile.vm 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-{ "file": "$!encoder.jsonEncode( ${outputFile} )"}
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonPeriods.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonPeriods.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonPeriods.vm 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#set( $size = $object.size() )
-{ "periods": [
-#foreach( $period in $object )
- {
- "id": "$!{period.id}",
- "startDate": "$!format.formatDate( ${period.startDate} )",
- "endDate": "$!format.formatDate( ${period.endDate} )",
- "name": "$!encoder.jsonEncode( $format.formatPeriod($period) )"
- }#if( $velocityCount < $size ),#end
-#end
-] }
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonUserSettings.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonUserSettings.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonUserSettings.vm 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-{
- "mapDateType": "$!encoder.jsonEncode( ${mapDateType} )"
-}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminAggregatedMapValues.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminAggregatedMapValues.vm 2011-12-05 17:37:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminAggregatedMapValues.vm 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#set( $size = $object.size() )[#foreach( $value in $object )["$!{value.organisationUnitId}","$!{value.value}"]#if( $velocityCount < $size ),#end#end]
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminDataElements.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminDataElements.vm 2010-12-10 19:05:03 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminDataElements.vm 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#set( $size = $object.size() )
-{"dataElements":[#foreach( $dataElement in $object ){"id":"$!{dataElement.id}","shortName":"$!encoder.jsonEncode( ${dataElement.shortName} )"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm 2010-12-10 19:43:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#set( $size = $object.size() )
-{ "indicators": [
-#foreach( $indicator in $object )
- {
- "id": "$!{indicator.id}",
- "shortName": "$!encoder.jsonEncode( ${indicator.shortName} )"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapLegendSets.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapLegendSets.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapLegendSets.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#set( $size = $object.size() )
-{ "mapLegendSets": [
-#foreach( $legendSet in $object )
- {
- "id": "$!{legendSet.id}",
- "name": "$!encoder.jsonEncode( ${legendSet.name} )"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapOrganisationUnitRelations.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapOrganisationUnitRelations.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapOrganisationUnitRelations.vm 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#set( $size = $object.size() ){"mapOrganisationUnitRelations":[#foreach( $mapOrganisationUnitRelation in $object ){"id":"$!{mapOrganisationUnitRelation.id}","map":"$!encoder.jsonEncode( ${mapOrganisationUnitRelation.map.mapLayerPath} )","organisationUnit":"$!encoder.jsonEncode( ${mapOrganisationUnitRelation.organisationUnit.name} )","organisationUnitId":$!{mapOrganisationUnitRelation.organisationUnit.id},"featureId":"$!{mapOrganisationUnitRelation.featureId}"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#set( $size = $object.size() )
-{ "mapViews": [
-#foreach( $mapView in $object )
- {
- "id": $!{mapView.id},
- "name": "$!encoder.jsonEncode( ${mapView.name} )",
- "mapSourceType": "$!encoder.jsonEncode( ${object.mapSourceType} )",
- "mapSource": "$!encoder.jsonEncode( ${object.mapSource} )",
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMaps.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMaps.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminMaps.vm 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#set( $size = $object.size() )
-{ "maps": [
-#foreach( $map in $object )
- {
- "id": "$!{map.id}",
- "name": "$!encoder.jsonEncode( ${map.name} )",
- "mapLayerPath": "$!encoder.jsonEncode( ${map.mapLayerPath} )",
- "organisationUnitLevel": "$!{map.organisationUnitLevel.level}",
- "nameColumn": "$!{map.nameColumn}"
- }#if( $velocityCount < $size ),#end
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnitGroups.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnitGroups.vm 2012-11-04 18:50:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnitGroups.vm 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#set( $size = $object.size() ){"organisationUnitGroups":[#foreach ( $group in $object ){"id":"$!{group.uid}","name":"$!encoder.jsonEncode( ${group.name} )","symbol":"$!encoder.jsonEncode( ${group.symbol} )"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnits.vm'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnits.vm 2010-11-25 15:08:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnits.vm 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#set( $size = $object.size() ){"organisationUnits":[#foreach ( $unit in $object ){"id":"$!{unit.id}","name":"$!encoder.jsonEncode( ${unit.name} )"}#if( $velocityCount < $size ),#end#end]}
\ No newline at end of file
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/manifest.webapp' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/plugin.html' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts'
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-08-27 11:00:30 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-08-27 13:10:38 +0000
@@ -9112,22 +9112,7 @@
systemSettings: {},
extensions: {}
},
- parseProperties,
- fn;
-
- parseProperties = function(properties) {
- var rows = Ext.Array.clean(properties.split(/\n/)),
- i18n = {};
-
- for (var i = 0, a; i < rows.length; i++) {
- if (!!(typeof rows[i] === 'string' && rows[i].length)) {
- a = rows[i].split('=');
- i18n[a[0].trim()] = eval('"' + a[1].trim().replace(/"/g, '\'') + '"');
- }
- }
-
- return i18n;
- };
+ fn;
fn = function() {
if (++callbacks === requests.length) {
@@ -9193,47 +9178,54 @@
var defaultKeyUiLocale = 'en';
init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
- // i18n
Ext.Ajax.request({
- url: 'i18n/' + init.keyUiLocale + '.properties',
+ url: init.contextPath + '/dhis-web-commons/javascripts/javaProperties.js',
success: function(r) {
- GIS.i18n = parseProperties(r.responseText);
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
- success: function(r) {
- Ext.applyIf(NS.i18n, parseProperties(r.responseText));
- },
- callback: fn
- })
- }
- else {
- fn();
- }
- },
- failure: function() {
- var failure = function() {
- alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + init.keyUiLocale + ').');
- GIS.i18n = parseProperties(r.responseText);
- },
- failure: function() {
+ var parseProperties = Ext.decode(r.responseText).parseProperties;
+
+ // i18n
+ Ext.Ajax.request({
+ url: 'i18n/' + init.keyUiLocale + '.properties',
+ success: function(r) {
+ GIS.i18n = parseProperties(r.responseText);
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ success: function(r) {
+ Ext.applyIf(GIS.i18n, parseProperties(r.responseText));
+ },
+ callback: fn
+ })
+ }
+ else {
+ fn();
+ }
+ },
+ failure: function() {
+ var failure = function() {
+ alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ };
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.json',
+ success: function(r) {
+ console.log('No translations found for system locale (' + init.keyUiLocale + ').');
+ GIS.i18n = parseProperties(r.responseText);
+ },
+ failure: function() {
+ failure();
+ },
+ callback: fn
+ });
+ }
+ else {
+ fn();
failure();
- },
- callback: fn
- });
- }
- else {
- fn();
- failure();
- }
+ }
+ }
+ });
}
});
}
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/styles' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles'
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/void.vm'
=== removed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/i18n' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/images' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/images'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/index.html' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/manifest.webapp' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/manifest.webapp'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/plugin.html' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts'
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-08-27 10:36:05 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-08-27 13:10:38 +0000
@@ -6132,22 +6132,7 @@
var requests = [],
callbacks = 0,
init = {},
- parseProperties,
- fn;
-
- parseProperties = function(properties) {
- var rows = Ext.Array.clean(properties.split(/\n/)),
- i18n = {};
-
- for (var i = 0, a; i < rows.length; i++) {
- if (!!(typeof rows[i] === 'string' && rows[i].length)) {
- a = rows[i].split('=');
- i18n[a[0].trim()] = eval('"' + a[1].trim().replace(/"/g, '\'') + '"');
- }
- }
-
- return i18n;
- };
+ fn;
fn = function() {
if (++callbacks === requests.length) {
@@ -6214,47 +6199,54 @@
var defaultKeyUiLocale = 'en';
init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
- // i18n
Ext.Ajax.request({
- url: 'i18n/' + init.keyUiLocale + '.properties',
+ url: init.contextPath + '/dhis-web-commons/javascripts/javaProperties.js',
success: function(r) {
- NS.i18n = parseProperties(r.responseText);
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
- success: function(r) {
- Ext.applyIf(NS.i18n, parseProperties(r.responseText));
- },
- callback: fn
- })
- }
- else {
- fn();
- }
- },
- failure: function() {
- var failure = function() {
- alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + init.keyUiLocale + ').');
- NS.i18n = parseProperties(r.responseText);
- },
- failure: function() {
+ var parseProperties = Ext.decode(r.responseText).parseProperties;
+
+ // i18n
+ Ext.Ajax.request({
+ url: 'i18n/' + init.keyUiLocale + '.properties',
+ success: function(r) {
+ NS.i18n = parseProperties(r.responseText);
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ success: function(r) {
+ Ext.applyIf(NS.i18n, parseProperties(r.responseText));
+ },
+ callback: fn
+ })
+ }
+ else {
+ fn();
+ }
+ },
+ failure: function() {
+ var failure = function() {
+ alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ };
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.json',
+ success: function(r) {
+ console.log('No translations found for system locale (' + init.keyUiLocale + ').');
+ NS.i18n = parseProperties(r.responseText);
+ },
+ failure: function() {
+ failure();
+ },
+ callback: fn
+ });
+ }
+ else {
+ fn();
failure();
- },
- callback: fn
- });
- }
- else {
- fn();
- failure();
- }
+ }
+ }
+ });
}
});
}
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/styles' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles'
=== removed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/i18n' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/images' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/images'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/index.html' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/manifest.webapp' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/manifest.webapp'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/plugin.html' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html'
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts'
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-27 10:49:05 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-08-27 13:10:38 +0000
@@ -6025,23 +6025,8 @@
var requests = [],
callbacks = 0,
init = {},
- parseProperties,
fn;
- parseProperties = function(properties) {
- var rows = Ext.Array.clean(properties.split(/\n/)),
- i18n = {};
-
- for (var i = 0, a; i < rows.length; i++) {
- if (!!(typeof rows[i] === 'string' && rows[i].length)) {
- a = rows[i].split('=');
- i18n[a[0].trim()] = eval('"' + a[1].trim().replace(/"/g, '\'') + '"');
- }
- }
-
- return i18n;
- };
-
fn = function() {
if (++callbacks === requests.length) {
@@ -6107,47 +6092,54 @@
var defaultKeyUiLocale = 'en';
init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
- // i18n
Ext.Ajax.request({
- url: 'i18n/' + init.keyUiLocale + '.properties',
+ url: init.contextPath + '/dhis-web-commons/javascripts/javaProperties.js',
success: function(r) {
- NS.i18n = parseProperties(r.responseText);
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
- success: function(r) {
- Ext.applyIf(NS.i18n, parseProperties(r.responseText));
- },
- callback: fn
- })
- }
- else {
- fn();
- }
- },
- failure: function() {
- var failure = function() {
- alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + init.keyUiLocale + ').');
- NS.i18n = parseProperties(r.responseText);
- },
- failure: function() {
+ var parseProperties = Ext.decode(r.responseText).parseProperties;
+
+ // i18n
+ Ext.Ajax.request({
+ url: 'i18n/' + init.keyUiLocale + '.properties',
+ success: function(r) {
+ NS.i18n = parseProperties(r.responseText);
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ success: function(r) {
+ Ext.applyIf(NS.i18n, parseProperties(r.responseText));
+ },
+ callback: fn
+ })
+ }
+ else {
+ fn();
+ }
+ },
+ failure: function() {
+ var failure = function() {
+ alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ };
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.json',
+ success: function(r) {
+ console.log('No translations found for system locale (' + init.keyUiLocale + ').');
+ NS.i18n = parseProperties(r.responseText);
+ },
+ failure: function() {
+ failure();
+ },
+ callback: fn
+ });
+ }
+ else {
+ fn();
failure();
- },
- callback: fn
- });
- }
- else {
- fn();
- failure();
- }
+ }
+ }
+ });
}
});
}
=== renamed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/styles' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles'
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/javaProperties.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/javaProperties.js 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/javaProperties.js 2014-08-27 12:44:38 +0000
@@ -0,0 +1,20 @@
+{
+ parseProperties: function(responseText) {
+ var i18n = {}, rows;
+
+ if (typeof responseText !== 'string') {
+ return i18n;
+ }
+
+ rows = responseText.split(/\n/);
+
+ for (var i = 0, a; i < rows.length; i++) {
+ if (!!(typeof rows[i] === 'string' && rows[i].length && rows[i].indexOf('=') !== -1)) {
+ a = rows[i].split('=');
+ i18n[a[0].trim()] = eval('"' + a[1].trim().replace(/"/g, '\'') + '"');
+ }
+ }
+
+ return i18n;
+ }
+}
