Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 11277 [merge]
committer: Jan Henrik Overland <[email protected]>
branch nick: dhis2
timestamp: Fri 2013-06-28 14:10:53 +0200
message:
(PT) Pivot table and api links added to interpretation window.
modified:
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/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-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 2013-06-28 10:42:07 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2013-06-28 12:06:57 +0000
@@ -2012,8 +2012,16 @@
});
linkPanel = Ext.create('Ext.panel.Panel', {
- html: '<b>Link: </b><span class="user-select">' + pt.baseUrl + '/dhis-web-pivot/app/index.html?id=' + pt.favorite.id + '</span>',
- style: 'padding-top: 9px; padding-bottom: 6px',
+ html: function() {
+ var reportTableUrl = pt.baseUrl + '/dhis-web-pivot/app/index.html?id=' + pt.favorite.id,
+ apiUrl = pt.baseUrl + '/api/reportTables/' + pt.favorite.id + '/data.html',
+ html = '';
+
+ html += '<div><b>Chart link: </b><span class="user-select"><a href="' + reportTableUrl + '" target="_blank">' + reportTableUrl + '</a></span></div>';
+ html += '<div style="padding-top:3px"><b>API link: </b><span class="user-select"><a href="' + apiUrl + '" target="_blank">' + apiUrl + '</a></span></div>';
+ return html;
+ }(),
+ style: 'padding-top: 8px; padding-bottom: 5px',
bodyStyle: 'border: 0 none'
});
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
