dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #32547
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16606: Analysis, updated paths now that /apps dirs are removed
Merge authors:
Lars Helge Øverland (larshelge)
------------------------------------------------------------
revno: 16606 [merge]
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-09-02 00:21:35 +0200
message:
Analysis, updated paths now that /apps dirs are removed
modified:
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/scripts/app.js
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/scripts/app.js
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/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/plugin.js
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/plugin.html
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/manifest.webapp
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.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/webapp/dhis-web-event-reports/manifest.webapp'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/manifest.webapp 2014-08-31 15:55:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/manifest.webapp 2014-09-01 19:20:31 +0000
@@ -2,7 +2,7 @@
"version": "0.1",
"name": "DHIS2 Event",
"description": "The event report app",
- "launch_path": "/app/index.html",
+ "launch_path": "/index.html",
"icons": {
"16": "/img/icons/mortar-16.png",
"48": "/img/icons/mortar-48.png",
=== 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/scripts/app.js 2014-09-01 12:58:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-01 22:20:49 +0000
@@ -2939,7 +2939,7 @@
linkPanel = Ext.create('Ext.panel.Panel', {
html: function() {
- var url = ns.core.init.contextPath + '/dhis-web-event-reports/app/index.html?id=' + ns.app.layout.id,
+ var url = ns.core.init.contextPath + '/dhis-web-event-reports/index.html?id=' + ns.app.layout.id,
apiUrl = ns.core.init.contextPath + '/api/eventReports/' + ns.app.layout.id + '/data.html',
html = '';
@@ -5943,7 +5943,7 @@
iconCls: 'ns-button-icon-chart',
param: 'chart',
handler: function() {
- web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-visualizer/app/index.html?s=analytical');
+ web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-visualizer/index.html?s=analytical');
},
listeners: {
render: function() {
@@ -5963,7 +5963,7 @@
param: 'map',
disabled: true,
handler: function() {
- web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-mapping/app/index.html?s=analytical');
+ web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-mapping/index.html?s=analytical');
},
listeners: {
render: function() {
@@ -6851,7 +6851,7 @@
text: NS.i18n.go_to_event_charts + ' ', //i18n
cls: 'ns-menu-item-noicon',
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-event-visualizer/app/index.html';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-event-visualizer/index.html';
}
},
'-',
@@ -6862,7 +6862,7 @@
handler: function() {
if (NS.isSessionStorage) {
ns.app.layout.parentGraphMap = ns.app.accordion.treePanel.getParentGraphMap();
- ns.core.web.storage.session.set(ns.app.layout, 'eventanalytical', ns.core.init.contextPath + '/dhis-web-event-visualizer/app/index.html?s=eventanalytical');
+ ns.core.web.storage.session.set(ns.app.layout, 'eventanalytical', ns.core.init.contextPath + '/dhis-web-event-visualizer/index.html?s=eventanalytical');
}
}
},
@@ -6871,7 +6871,7 @@
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['eventchart']),
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-event-visualizer/app/index.html?s=eventchart';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-event-visualizer/index.html?s=eventchart';
}
}
],
=== modified file '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/manifest.webapp 2014-08-31 15:55:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/manifest.webapp 2014-09-01 19:20:31 +0000
@@ -2,7 +2,7 @@
"version": "0.1",
"name": "DHIS2 Event",
"description": "The event report app",
- "launch_path": "/app/index.html",
+ "launch_path": "/index.html",
"icons": {
"16": "/img/icons/mortar-16.png",
"48": "/img/icons/mortar-48.png",
=== 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/scripts/app.js 2014-09-01 13:00:53 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-01 22:20:49 +0000
@@ -2578,7 +2578,7 @@
linkPanel = Ext.create('Ext.panel.Panel', {
html: function() {
- var url = ns.core.init.contextPath + '/dhis-web-event-visualizer/app/index.html?id=' + ns.app.layout.id,
+ var url = ns.core.init.contextPath + '/dhis-web-event-visualizer/index.html?id=' + ns.app.layout.id,
apiUrl = ns.core.init.contextPath + '/api/eventCharts/' + ns.app.layout.id + '/data.html',
html = '';
@@ -5599,7 +5599,7 @@
iconCls: 'ns-button-icon-chart',
param: 'chart',
handler: function() {
- web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-visualizer/app/index.html?s=analytical');
+ web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-visualizer/index.html?s=analytical');
},
listeners: {
render: function() {
@@ -5619,7 +5619,7 @@
param: 'map',
disabled: true,
handler: function() {
- web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-mapping/app/index.html?s=analytical');
+ web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-mapping/index.html?s=analytical');
},
listeners: {
render: function() {
@@ -6520,7 +6520,7 @@
text: NS.i18n.go_to_event_reports + ' ', //i18n
cls: 'ns-menu-item-noicon',
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-event-reports/app/index.html';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-event-reports/index.html';
}
},
'-',
@@ -6531,7 +6531,7 @@
handler: function() {
if (NS.isSessionStorage) {
ns.app.layout.parentGraphMap = ns.app.accordion.treePanel.getParentGraphMap();
- ns.core.web.storage.session.set(ns.app.layout, 'eventanalytical', ns.core.init.contextPath + '/dhis-web-event-reports/app/index.html?s=eventanalytical');
+ ns.core.web.storage.session.set(ns.app.layout, 'eventanalytical', ns.core.init.contextPath + '/dhis-web-event-reports/index.html?s=eventanalytical');
}
}
},
@@ -6540,7 +6540,7 @@
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['eventtable']),
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-event-reports/app/index.html?s=eventtable';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-event-reports/index.html?s=eventtable';
}
}
],
=== modified file '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/manifest.webapp 2014-08-31 15:55:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp 2014-09-01 19:20:31 +0000
@@ -2,7 +2,7 @@
"version": "0.1",
"name": "DHIS2 GIS",
"description": "The GIS app",
- "launch_path": "/app/index.html",
+ "launch_path": "/index.html",
"icons": {
"16": "/img/icons/mortar-16.png",
"48": "/img/icons/mortar-48.png",
=== 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/scripts/app.js 2014-09-01 13:01:30 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-09-01 22:20:49 +0000
@@ -8525,7 +8525,7 @@
}
},
handler: function() {
- var url = gis.init.contextPath + '/dhis-web-mapping/app/index.html?id=' + gis.map.id,
+ var url = gis.init.contextPath + '/dhis-web-mapping/index.html?id=' + gis.map.id,
textField,
window;
@@ -8763,7 +8763,7 @@
text: GIS.i18n.go_to_pivot_tables + ' ', //i18n
cls: 'gis-menu-item-noicon',
handler: function() {
- window.location.href = gis.init.contextPath + '/dhis-web-pivot/app/index.html';
+ window.location.href = gis.init.contextPath + '/dhis-web-pivot/index.html';
}
},
'-',
@@ -8773,7 +8773,7 @@
disabled: !(GIS.isSessionStorage && gis.util.layout.getAnalytical()),
handler: function() {
if (GIS.isSessionStorage) {
- gis.util.layout.setSessionStorage('analytical', gis.util.layout.getAnalytical(), gis.init.contextPath + '/dhis-web-pivot/app/index.html?s=analytical');
+ gis.util.layout.setSessionStorage('analytical', gis.util.layout.getAnalytical(), gis.init.contextPath + '/dhis-web-pivot/index.html?s=analytical');
}
}
},
@@ -8782,7 +8782,7 @@
cls: 'gis-menu-item-noicon',
disabled: !(GIS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['table']),
handler: function() {
- window.location.href = gis.init.contextPath + '/dhis-web-pivot/app/index.html?s=table';
+ window.location.href = gis.init.contextPath + '/dhis-web-pivot/index.html?s=table';
}
}
],
@@ -8819,7 +8819,7 @@
text: GIS.i18n.go_to_charts + ' ', //i18n
cls: 'gis-menu-item-noicon',
handler: function() {
- window.location.href = gis.init.contextPath + '/dhis-web-visualizer/app/index.html';
+ window.location.href = gis.init.contextPath + '/dhis-web-visualizer/index.html';
}
},
'-',
@@ -8829,7 +8829,7 @@
disabled: !GIS.isSessionStorage || !gis.util.layout.getAnalytical(),
handler: function() {
if (GIS.isSessionStorage) {
- gis.util.layout.setSessionStorage('analytical', gis.util.layout.getAnalytical(), gis.init.contextPath + '/dhis-web-visualizer/app/index.html?s=analytical');
+ gis.util.layout.setSessionStorage('analytical', gis.util.layout.getAnalytical(), gis.init.contextPath + '/dhis-web-visualizer/index.html?s=analytical');
}
}
},
@@ -8838,7 +8838,7 @@
cls: 'gis-menu-item-noicon',
disabled: !(GIS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['chart']),
handler: function() {
- window.location.href = gis.init.contextPath + '/dhis-web-visualizer/app/index.html?s=chart';
+ window.location.href = gis.init.contextPath + '/dhis-web-visualizer/index.html?s=chart';
}
}
],
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/plugin.js 2014-08-31 20:31:28 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/plugin.js 2014-09-01 19:20:31 +0000
@@ -5194,7 +5194,7 @@
css += '.olControlMousePosition * { font-size: 10px !important; } \n';
css += '.text-mouseposition-lonlat { color: #555; } \n';
css += '.olLayerGoogleCopyright, .olLayerGoogleV3.olLayerGooglePoweredBy { display: none; } \n';
- css += '#google-logo { background: url("' + init.contextPath + '/dhis-web-mapping/app/images/google-logo.png") no-repeat; width: 40px; height: 13px; margin-left: 6px; display: inline-block; vertical-align: bottom; cursor: pointer; cursor: hand; } \n';
+ css += '#google-logo { background: url("' + init.contextPath + '/dhis-web-mapping/images/google-logo.png") no-repeat; width: 40px; height: 13px; margin-left: 6px; display: inline-block; vertical-align: bottom; cursor: pointer; cursor: hand; } \n';
css += '.olControlScaleLine { left: 5px !important; bottom: 5px !important; } \n';
css += '.olControlScaleLineBottom { display: none; } \n';
css += '.olControlScaleLineTop { font-weight: bold; } \n';
@@ -5219,8 +5219,8 @@
css += '.gis-menu-item-icon-drill, .gis-menu-item-icon-float { left: 6px; } \n';
css += '.gis-menu-item-first.x-menu-item-active .x-menu-item-link { border-radius: 0; border-top-left-radius: 2px; border-top-right-radius: 2px; } \n';
css += '.gis-menu-item-last.x-menu-item-active .x-menu-item-link { border-radius: 0; border-bottom-left-radius: 2px; border-bottom-right-radius: 2px; } \n';
- css += '.gis-menu-item-icon-drill { \n background: url("' + init.contextPath + '/dhis-web-mapping/app/images/drill_16.png") no-repeat; } \n';
- css += '.gis-menu-item-icon-float { background: url("' + init.contextPath + '/dhis-web-mapping/app/images/float_16.png") no-repeat; } \n';
+ css += '.gis-menu-item-icon-drill { \n background: url("' + init.contextPath + '/dhis-web-mapping/images/drill_16.png") no-repeat; } \n';
+ css += '.gis-menu-item-icon-float { background: url("' + init.contextPath + '/dhis-web-mapping/images/float_16.png") no-repeat; } \n';
css += '.x-color-picker a { padding: 0; } \n';
css += '.x-color-picker em span { width: 14px; height: 14px; } \n';
@@ -5370,10 +5370,10 @@
var len = Ext.query('.zoomInButton').length;
for (var i = 0; i < len; i++) {
- Ext.query('.zoomInButton')[i].innerHTML = '<img src="' + gis.init.contextPath + '/dhis-web-mapping/app/images/zoomin_24.png" />';
- Ext.query('.zoomOutButton')[i].innerHTML = '<img src="' + gis.init.contextPath + '/dhis-web-mapping/app/images/zoomout_24.png" />';
- Ext.query('.zoomVisibleButton')[i].innerHTML = '<img src="' + gis.init.contextPath + '/dhis-web-mapping/app/images/zoomvisible_24.png" />';
- Ext.query('.measureButton')[i].innerHTML = '<img src="' + gis.init.contextPath + '/dhis-web-mapping/app/images/measure_24.png" />';
+ Ext.query('.zoomInButton')[i].innerHTML = '<img src="' + gis.init.contextPath + '/dhis-web-mapping/images/zoomin_24.png" />';
+ Ext.query('.zoomOutButton')[i].innerHTML = '<img src="' + gis.init.contextPath + '/dhis-web-mapping/images/zoomout_24.png" />';
+ Ext.query('.zoomVisibleButton')[i].innerHTML = '<img src="' + gis.init.contextPath + '/dhis-web-mapping/images/zoomvisible_24.png" />';
+ Ext.query('.measureButton')[i].innerHTML = '<img src="' + gis.init.contextPath + '/dhis-web-mapping/images/measure_24.png" />';
}
// base layer
=== modified file '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/manifest.webapp 2014-08-31 15:55:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/manifest.webapp 2014-09-01 19:20:31 +0000
@@ -2,7 +2,7 @@
"version": "0.1",
"name": "DHIS2 Pivot Table",
"description": "The pivot table app",
- "launch_path": "/app/index.html",
+ "launch_path": "/index.html",
"icons": {
"16": "/img/icons/mortar-16.png",
"48": "/img/icons/mortar-48.png",
=== modified file '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/plugin.html 2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html 2014-09-01 19:20:31 +0000
@@ -7,7 +7,7 @@
<!--
<script src="http://dhis2-cdn.org/v214/plugin/table.js";></script>
-->
- <script src="http://localhost:8080/dhis-web-pivot/app/scripts/plugin.js";></script>
+ <script src="http://localhost:8080/dhis-web-pivot/scripts/plugin.js";></script>
<style type="text/css">
body {font-family:sans-serif; margin:0 0 0 60px;}
=== 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/scripts/app.js 2014-09-01 16:24:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-09-01 22:20:49 +0000
@@ -2150,7 +2150,7 @@
iconCls: 'ns-button-icon-chart',
param: 'chart',
handler: function() {
- web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-visualizer/app/index.html?s=analytical');
+ web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-visualizer/index.html?s=analytical');
},
listeners: {
render: function() {
@@ -2170,7 +2170,7 @@
param: 'map',
disabled: true,
handler: function() {
- web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-mapping/app/index.html?s=analytical');
+ web.storage.session.set(layoutConfig, 'analytical', init.contextPath + '/dhis-web-mapping/index.html?s=analytical');
},
listeners: {
render: function() {
@@ -5505,7 +5505,7 @@
}
},
handler: function() {
- var url = ns.core.init.contextPath + '/dhis-web-pivot/app/index.html?id=' + ns.app.layout.id,
+ var url = ns.core.init.contextPath + '/dhis-web-pivot/index.html?id=' + ns.app.layout.id,
textField,
window;
@@ -5689,7 +5689,7 @@
text: NS.i18n.go_to_charts + ' ', //i18n
cls: 'ns-menu-item-noicon',
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-visualizer/app/index.html';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-visualizer/index.html';
}
},
'-',
@@ -5700,7 +5700,7 @@
handler: function() {
if (NS.isSessionStorage) {
ns.app.layout.parentGraphMap = treePanel.getParentGraphMap();
- ns.core.web.storage.session.set(ns.app.layout, 'analytical', ns.core.init.contextPath + '/dhis-web-visualizer/app/index.html?s=analytical');
+ ns.core.web.storage.session.set(ns.app.layout, 'analytical', ns.core.init.contextPath + '/dhis-web-visualizer/index.html?s=analytical');
}
}
},
@@ -5709,7 +5709,7 @@
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['chart']),
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-visualizer/app/index.html?s=chart';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-visualizer/index.html?s=chart';
}
}
],
@@ -5745,7 +5745,7 @@
text: NS.i18n.go_to_maps + ' ', //i18n
cls: 'ns-menu-item-noicon',
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-mapping/app/index.html';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-mapping/index.html';
}
},
'-',
@@ -5756,7 +5756,7 @@
handler: function() {
if (NS.isSessionStorage) {
ns.app.layout.parentGraphMap = treePanel.getParentGraphMap();
- ns.core.web.storage.session.set(ns.app.layout, 'analytical', ns.core.init.contextPath + '/dhis-web-mapping/app/index.html?s=analytical');
+ ns.core.web.storage.session.set(ns.app.layout, 'analytical', ns.core.init.contextPath + '/dhis-web-mapping/index.html?s=analytical');
}
}
},
@@ -5765,7 +5765,7 @@
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['map']),
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-mapping/app/index.html?s=map';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-mapping/index.html?s=map';
}
}
],
=== modified file '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/manifest.webapp 2014-08-31 15:55:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/manifest.webapp 2014-09-01 19:20:31 +0000
@@ -2,7 +2,7 @@
"version": "0.1",
"name": "DHIS2 Data Visualizer",
"description": "The pivot table app",
- "launch_path": "/app/index.html",
+ "launch_path": "/index.html",
"icons": {
"16": "/img/icons/mortar-16.png",
"48": "/img/icons/mortar-48.png",
=== 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/scripts/app.js 2014-08-31 15:55:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-09-01 19:20:31 +0000
@@ -5398,7 +5398,7 @@
}
},
handler: function() {
- var url = ns.core.init.contextPath + '/dhis-web-visualizer/app/index.html?id=' + ns.app.layout.id,
+ var url = ns.core.init.contextPath + '/dhis-web-visualizer/index.html?id=' + ns.app.layout.id,
textField,
window;
@@ -5581,7 +5581,7 @@
text: NS.i18n.go_to_pivot_tables + ' ', //i18n
cls: 'ns-menu-item-noicon',
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-pivot/app/index.html';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-pivot/index.html';
}
},
'-',
@@ -5592,7 +5592,7 @@
handler: function() {
if (NS.isSessionStorage) {
ns.app.layout.parentGraphMap = treePanel.getParentGraphMap();
- ns.core.web.storage.session.set(ns.app.layout, 'analytical', ns.core.init.contextPath + '/dhis-web-pivot/app/index.html?s=analytical');
+ ns.core.web.storage.session.set(ns.app.layout, 'analytical', ns.core.init.contextPath + '/dhis-web-pivot/index.html?s=analytical');
}
}
},
@@ -5601,7 +5601,7 @@
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['table']),
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-pivot/app/index.html?s=table';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-pivot/index.html?s=table';
}
}
],
@@ -5638,7 +5638,7 @@
text: NS.i18n.go_to_maps + ' ', //i18n
cls: 'ns-menu-item-noicon',
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-mapping/app/index.html';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-mapping/index.html';
}
},
'-',
@@ -5649,7 +5649,7 @@
handler: function() {
if (NS.isSessionStorage) {
ns.app.layout.parentGraphMap = treePanel.getParentGraphMap();
- ns.core.web.storage.session.set(ns.app.layout, 'analytical', ns.core.init.contextPath + '/dhis-web-mapping/app/index.html?s=analytical');
+ ns.core.web.storage.session.set(ns.app.layout, 'analytical', ns.core.init.contextPath + '/dhis-web-mapping/index.html?s=analytical');
}
}
},
@@ -5658,7 +5658,7 @@
cls: 'ns-menu-item-noicon',
disabled: !(NS.isSessionStorage && JSON.parse(sessionStorage.getItem('dhis2')) && JSON.parse(sessionStorage.getItem('dhis2'))['map']),
handler: function() {
- window.location.href = ns.core.init.contextPath + '/dhis-web-mapping/app/index.html?s=map';
+ window.location.href = ns.core.init.contextPath + '/dhis-web-mapping/index.html?s=map';
}
}
],
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm 2014-08-05 12:57:45 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm 2014-09-01 19:00:23 +0000
@@ -76,9 +76,9 @@
<div id="shareHelpForm">
<ul>
- <li>$i18n.getString( "from" ) <a href="../dhis-web-pivot/app/index.html">$i18n.getString( "pivot_table" )</a>, $i18n.getString( "generate_pivot_table_click_share" )</li>
- <li>$i18n.getString( "from" ) <a href="../dhis-web-visualizer/app/">$i18n.getString( "data_visualizer" )</a>, $i18n.getString( "load_favorite_click_share" )</li>
- <li>$i18n.getString( "from" ) <a href="../dhis-web-mapping/app/">$i18n.getString( "gis" )</a>, $i18n.getString( "load_favorite_click_share" )</li>
+ <li>$i18n.getString( "from" ) <a href="../dhis-web-pivot/index.html">$i18n.getString( "pivot_table" )</a>, $i18n.getString( "generate_pivot_table_click_share" )</li>
+ <li>$i18n.getString( "from" ) <a href="../dhis-web-visualizer/index.html">$i18n.getString( "data_visualizer" )</a>, $i18n.getString( "load_favorite_click_share" )</li>
+ <li>$i18n.getString( "from" ) <a href="../dhis-web-mapping/index.html">$i18n.getString( "gis" )</a>, $i18n.getString( "load_favorite_click_share" )</li>
<li>$i18n.getString( "from" ) <a href="../dhis-web-reporting/showDataSetReportForm.action">$i18n.getString( "data_set_report" )</a>, $i18n.getString( "generate_data_set_report_click_share" )</li>
</ul>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm 2013-11-04 15:43:05 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm 2014-09-01 19:00:23 +0000
@@ -1,8 +1,8 @@
<div id="shareLink">$i18n.getString( "share_your_own_interpretations_from" )
- <a href="../dhis-web-pivot/app/index.html">$i18n.getString( "pivot_table" )</a>,
- <a href="../dhis-web-visualizer/app/index.html">$i18n.getString( "data_visualizer" )</a>,
- <a href="../dhis-web-mapping/app/index.html">$i18n.getString( "gis" )</a> or
+ <a href="../dhis-web-pivot/index.html">$i18n.getString( "pivot_table" )</a>,
+ <a href="../dhis-web-visualizer/index.html">$i18n.getString( "data_visualizer" )</a>,
+ <a href="../dhis-web-mapping/index.html">$i18n.getString( "gis" )</a> or
<a href="../dhis-web-reporting/showDataSetReportForm.action">$i18n.getString( "data_set_report" )</a>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm 2014-01-03 16:27:30 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm 2014-09-01 19:00:23 +0000
@@ -60,19 +60,19 @@
</div>
<div class="interpretationItem">
#if( $ip.chartInterpretation )
- <a href="../dhis-web-visualizer/app/index.html?id=${ip.chart.uid}&date=${format.formatDate( $ip.created )}">
+ <a href="../dhis-web-visualizer/index.html?id=${ip.chart.uid}&date=${format.formatDate( $ip.created )}">
<img style="cursor:pointer"
src="../api/charts/${ip.chart.uid}/data?date=${format.formatDate( $ip.created )}&width=558&height=300${ou}"
title="$i18n.getString( 'click_to_view_in_data_visualizer' )"></a>
#elseif( $ip.mapInterpretation )
- <a href="../dhis-web-mapping/app/index.html?id=${ip.map.uid}">
+ <a href="../dhis-web-mapping/index.html?id=${ip.map.uid}">
<img style="cursor:pointer"
src="../api/maps/${ip.map.uid}/data?date=${format.formatDate( $ip.created )}&width=558"
title="$i18n.getString( 'click_to_view_in_gis' )"></a>
#elseif( $ip.reportTableInterpretation )
<a class="bold"
title="$i18n.getString( 'click_to_view_report_table' )"
- href="../dhis-web-pivot/app/index.html?id=${ip.reportTable.uid}${pe}${ou}">
+ href="../dhis-web-pivot/index.html?id=${ip.reportTable.uid}${pe}${ou}">
$encoder.htmlEncode( $ip.reportTable.name )</a>
#elseif( $ip.dataSetReportInterpretation )
<a class="bold"
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2014-08-09 14:36:38 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js 2014-09-01 19:00:23 +0000
@@ -414,7 +414,7 @@
}
else if ( "reportTables" == dashboardItem.type )
{
- dhis2.db.renderLinkItem( $d, dashboardItem.id, dashboardItem.reportTables, "Pivot tables", "../dhis-web-pivot/app/index.html?id=", "" );
+ dhis2.db.renderLinkItem( $d, dashboardItem.id, dashboardItem.reportTables, "Pivot tables", "../dhis-web-pivot/index.html?id=", "" );
}
else if ( "reports" == dashboardItem.type )
{
@@ -579,22 +579,22 @@
dhis2.db.exploreChart = function( uid )
{
- window.location.href = "../dhis-web-visualizer/app/index.html?id=" + uid;
+ window.location.href = "../dhis-web-visualizer/index.html?id=" + uid;
}
dhis2.db.exploreEventChart = function( uid )
{
- window.location.href = "../dhis-web-event-visualizer/app/index.html?id=" + uid;
+ window.location.href = "../dhis-web-event-visualizer/index.html?id=" + uid;
}
dhis2.db.exploreMap = function( uid )
{
- window.location.href = "../dhis-web-mapping/app/index.html?id=" + uid;
+ window.location.href = "../dhis-web-mapping/index.html?id=" + uid;
}
dhis2.db.exploreReportTable = function( uid )
{
- window.location.href = "../dhis-web-pivot/app/index.html?id=" + uid;
+ window.location.href = "../dhis-web-pivot/index.html?id=" + uid;
}
dhis2.db.renderReportTable = function( tableId, itemId )
@@ -697,7 +697,7 @@
for ( var i in data.charts )
{
var o = data.charts[i];
- $h.append( $.tmpl( dhis2.db.tmpl.hitItem, { "canManage": canManage, "link": "../dhis-web-visualizer/app/index.html?id=" + o.id, "img": "chart_small", "name": o.name, "type": "chart", "id": o.id, "i18n_add": i18n_add } ) );
+ $h.append( $.tmpl( dhis2.db.tmpl.hitItem, { "canManage": canManage, "link": "../dhis-web-visualizer/index.html?id=" + o.id, "img": "chart_small", "name": o.name, "type": "chart", "id": o.id, "i18n_add": i18n_add } ) );
}
}
@@ -708,7 +708,7 @@
for ( var i in data.eventCharts )
{
var o = data.eventCharts[i];
- $h.append( $.tmpl( dhis2.db.tmpl.hitItem, { "canManage": canManage, "link": "../dhis-web-event-visualizer/app/index.html?id=" + o.id, "img": "chart_small", "name": o.name, "type": "eventChart", "id": o.id, "i18n_add": i18n_add } ) );
+ $h.append( $.tmpl( dhis2.db.tmpl.hitItem, { "canManage": canManage, "link": "../dhis-web-event-visualizer/index.html?id=" + o.id, "img": "chart_small", "name": o.name, "type": "eventChart", "id": o.id, "i18n_add": i18n_add } ) );
}
}
@@ -719,7 +719,7 @@
for ( var i in data.maps )
{
var o = data.maps[i];
- $h.append( $.tmpl( dhis2.db.tmpl.hitItem, { "canManage": canManage, "link": "../dhis-web-mapping/app/index.html?id=" + o.id, "img": "map_small", "name": o.name, "type": "map", "id": o.id, "i18n_add": i18n_add } ) );
+ $h.append( $.tmpl( dhis2.db.tmpl.hitItem, { "canManage": canManage, "link": "../dhis-web-mapping/index.html?id=" + o.id, "img": "map_small", "name": o.name, "type": "map", "id": o.id, "i18n_add": i18n_add } ) );
}
}
@@ -730,7 +730,7 @@
for ( var i in data.reportTables )
{
var o = data.reportTables[i];
- $h.append( $.tmpl( dhis2.db.tmpl.hitItem, { "canManage": canManage, "link": "../dhis-web-pivot/app/index.html?id=" + o.id, "img": "table_small", "name": o.name, "type": "reportTable", "id": o.id, "i18n_add": i18n_add } ) );
+ $h.append( $.tmpl( dhis2.db.tmpl.hitItem, { "canManage": canManage, "link": "../dhis-web-pivot/index.html?id=" + o.id, "img": "table_small", "name": o.name, "type": "reportTable", "id": o.id, "i18n_add": i18n_add } ) );
}
}
