=== 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 += '
Report link: ' + url + '
'; - html += '
API link: ' + apiUrl + '
'; + //html += '
API link: ' + apiUrl + '
'; 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() {