dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 14532 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-03-29 10:46:23 +0100
message:
  ER, html download.
modified:
  dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/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-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js	2014-03-29 09:36:06 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js	2014-03-29 09:44:41 +0000
@@ -5251,6 +5251,15 @@
 						style: 'padding:7px 5px 5px 7px; font-weight:bold'
 					},
 					{
+						text: 'HTML',
+						iconCls: 'ns-menu-item-datasource',
+						handler: function() {
+							if (ns.core.init.contextPath && ns.app.paramString) {
+								window.open(getParamString('html'), '_blank');
+							}
+						}
+					},
+					{
 						text: 'JSON',
 						iconCls: 'ns-menu-item-datasource',
 						handler: function() {
@@ -5285,15 +5294,6 @@
 								window.open(getParamString('csv'), '_blank');
 							}
 						}
-					},
-					{
-						text: 'JRXML',
-						iconCls: 'ns-menu-item-datasource',
-						handler: function() {
-							if (ns.core.init.contextPath && ns.app.paramString) {
-								window.open(getParamString('jrxml'), '_blank');
-							}
-						}
 					}
 				],
 				listeners: {