dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30422
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15443: PT DV GIS, embed code updated.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 15443 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-05-28 10:59:43 +0200
message:
PT DV GIS, embed code updated.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-05-27 22:23:21 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-05-28 08:59:08 +0000
@@ -7993,13 +7993,15 @@
}
text += '<html>\n<head>\n';
- text += '<link rel="stylesheet" href="http://dhis2-cdn.org/v214/ext/resources/css/ext-plugin-gray.css"; />\n';
- text += '<script src="http://dhis2-cdn.org/v214/ext/ext-all.js";></script>\n';
- text += '<script src="http://dhis2-cdn.org/v214/plugin/table.js";></script>\n';
+ text += '<link rel="stylesheet" href="http://dhis2-cdn.org/v215/ext/resources/css/ext-plugin-gray.css"; />\n';
+ text += '<script src="http://dhis2-cdn.org/v215/ext/ext-all.js";></script>\n';
+ text += '<script src="http://dhis2-cdn.org/v215/plugin/table.js";></script>\n';
text += '</head>\n\n<body>\n';
text += '<div id="' + el + '"></div>\n\n';
text += '<script>\n\n';
+ text += 'Ext.onReady(function() {\n\n';
text += 'DHIS.getMap(' + JSON.stringify(layout, null, 2) + ');\n\n';
+ text += '});\n\n';
text += '</script>\n\n';
text += '</body>\n</html>';
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-05-27 11:08:21 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-05-28 08:59:08 +0000
@@ -5201,13 +5201,15 @@
text = '';
text += '<html>\n<head>\n';
- text += '<link rel="stylesheet" href="http://dhis2-cdn.org/v214/ext/resources/css/ext-plugin-gray.css"; />\n';
- text += '<script src="http://dhis2-cdn.org/v214/ext/ext-all.js";></script>\n';
- text += '<script src="http://dhis2-cdn.org/v214/plugin/table.js";></script>\n';
+ text += '<link rel="stylesheet" href="http://dhis2-cdn.org/v215/ext/resources/css/ext-plugin-gray.css"; />\n';
+ text += '<script src="http://dhis2-cdn.org/v215/ext/ext-all.js";></script>\n';
+ text += '<script src="http://dhis2-cdn.org/v215/plugin/table.js";></script>\n';
text += '</head>\n\n<body>\n';
text += '<div id="table1"></div>\n\n';
text += '<script>\n\n';
+ text += 'Ext.onReady(function() {\n\n';
text += 'DHIS.getTable(' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout, 'table1'), null, 2) + ');\n\n';
+ text += '});\n\n';
text += '</script>\n\n';
text += '</body>\n</html>';
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-05-28 08:49:57 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-05-28 08:59:08 +0000
@@ -4918,13 +4918,15 @@
text = '';
text += '<html>\n<head>\n';
- text += '<link rel="stylesheet" href="http://dhis2-cdn.org/v214/ext/resources/css/ext-plugin-gray.css"; />\n';
- text += '<script src="http://dhis2-cdn.org/v214/ext/ext-all.js";></script>\n';
- text += '<script src="http://dhis2-cdn.org/v214/plugin/chart.js";></script>\n';
+ text += '<link rel="stylesheet" href="http://dhis2-cdn.org/v215/ext/resources/css/ext-plugin-gray.css"; />\n';
+ text += '<script src="http://dhis2-cdn.org/v215/ext/ext-all.js";></script>\n';
+ text += '<script src="http://dhis2-cdn.org/v215/plugin/chart.js";></script>\n';
text += '</head>\n\n<body>\n';
text += '<div id="chart1" style="width:700px; height:400px"></div>\n\n';
text += '<script>\n\n';
+ text += 'Ext.onReady(function() {\n\n';
text += 'DHIS.getChart(' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout, 'chart1'), null, 2) + ');\n\n';
+ text += '});\n\n';
text += '</script>\n\n';
text += '</body>\n</html>';
