dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 14861 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-04-15 00:04:22 +0200
message:
  ER, interpretation/embed removed tmp.
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-04-14 20:13:04 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js	2014-04-14 22:02:30 +0000
@@ -2883,7 +2883,7 @@
 						html = '';
 
 					html += '<div><b>Report link: </b><span class="user-select"><a href="' + url + '" target="_blank">' + url + '</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>';
+					//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:3px',
@@ -2915,25 +2915,25 @@
 			window = Ext.create('Ext.window.Window', {
 				title: ns.app.layout.name,
 				layout: 'fit',
-				width: 500,
-				bodyStyle: 'padding:1px; background-color:#fff',
+				//width: 500,
+				bodyStyle: 'padding:5px; background-color:#fff',
 				resizable: false,
 				destroyOnBlur: true,
 				modal: true,
 				items: [
-					textArea,
+					//textArea,
 					linkPanel
 				],
-				bbar: {
-					cls: 'ns-toolbar-bbar',
-					defaults: {
-						height: 24
-					},
-					items: [
-						'->',
-						shareButton
-					]
-				},
+				//bbar: {
+					//cls: 'ns-toolbar-bbar',
+					//defaults: {
+						//height: 24
+					//},
+					//items: [
+						//'->',
+						//shareButton
+					//]
+				//},
 				listeners: {
 					show: function(w) {
 						ns.core.web.window.setAnchorPosition(w, ns.app.shareButton);
@@ -6210,22 +6210,32 @@
 				interpretationItem.xable();
 				pluginItem.xable();
 			},
-			menu: {
-				cls: 'ns-menu',
-				shadow: false,
-				showSeparator: false,
-				items: [
-					interpretationItem,
-					pluginItem
-				],
-				listeners: {
-					afterrender: function() {
-						this.getEl().addCls('ns-toolbar-btn-menu');
-					},
-					show: function() {
-						shareButton.xableItems();
-					}
+			//menu: {
+				//cls: 'ns-menu',
+				//shadow: false,
+				//showSeparator: false,
+				//items: [
+					//interpretationItem,
+					//pluginItem
+				//],
+				//listeners: {
+					//afterrender: function() {
+						//this.getEl().addCls('ns-toolbar-btn-menu');
+					//},
+					//show: function() {
+						//shareButton.xableItems();
+					//}
+				//}
+			//},
+			menu: {},
+			handler: function() {
+				if (ns.app.interpretationWindow) {
+					ns.app.interpretationWindow.destroy();
+					ns.app.interpretationWindow = null;
 				}
+
+				ns.app.interpretationWindow = InterpretationWindow();
+				ns.app.interpretationWindow.show();
 			},
 			listeners: {
 				added: function() {