dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33053
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16827: ER EV share favorite/api links.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16827 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-09-26 10:21:57 +0200
message:
ER EV share favorite/api links.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/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-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-24 14:28:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-26 08:17:21 +0000
@@ -6680,134 +6680,131 @@
}
});
- interpretationItem = Ext.create('Ext.menu.Item', {
- text: 'Write interpretation' + ' ',
- iconCls: 'ns-menu-item-tablelayout',
- disabled: true,
- xable: function() {
- if (ns.app.layout.id) {
- this.enable();
- }
- else {
- this.disable();
- }
- },
- handler: function() {
- if (ns.app.interpretationWindow) {
- ns.app.interpretationWindow.destroy();
- ns.app.interpretationWindow = null;
- }
-
- ns.app.interpretationWindow = InterpretationWindow();
- ns.app.interpretationWindow.show();
- }
- });
-
- pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed in web page' + ' ',
- iconCls: 'ns-menu-item-datasource',
- disabled: true,
- xable: function() {
- if (ns.app.layout) {
- this.enable();
- }
- else {
- this.disable();
- }
- },
- handler: function() {
- var textArea,
- window,
- 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 += '</head>\n\n<body>\n';
- text += '<div id="table1"></div>\n\n';
- text += '<script>\n\n';
- text += 'DHIS.getTable(' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout, 'table1'), null, 2) + ');\n\n';
- text += '</script>\n\n';
- text += '</body>\n</html>';
-
- textArea = Ext.create('Ext.form.field.TextArea', {
- width: 700,
- height: 400,
- readOnly: true,
- cls: 'ns-textarea monospaced',
- value: text
- });
-
- window = Ext.create('Ext.window.Window', {
- title: 'Plugin configuration',
- layout: 'fit',
- modal: true,
- resizable: false,
- items: textArea,
- destroyOnBlur: true,
- bbar: [
- '->',
- {
- text: 'Select',
- handler: function() {
- textArea.selectText();
- }
- }
- ],
- listeners: {
- show: function(w) {
- ns.core.web.window.setAnchorPosition(w, ns.app.shareButton);
-
- document.body.oncontextmenu = true;
-
- if (!w.hasDestroyOnBlurHandler) {
- ns.core.web.window.addDestroyOnBlurHandler(w);
- }
- },
- hide: function() {
- document.body.oncontextmenu = function(){return false;};
- }
- }
- });
-
- window.show();
- }
- });
+ favoriteUrlItem = Ext.create('Ext.menu.Item', {
+ text: 'Favorite link' + ' ',
+ iconCls: 'ns-menu-item-datasource',
+ disabled: true,
+ xable: function() {
+ if (ns.app.layout.id) {
+ this.enable();
+ }
+ else {
+ this.disable();
+ }
+ },
+ handler: function() {
+ var url = ns.core.init.contextPath + '/dhis-web-event-reports/index.html?id=' + ns.app.layout.id,
+ textField,
+ window;
+
+ textField = Ext.create('Ext.form.field.Text', {
+ html: '<a class="user-select td-nobreak" target="_blank" href="' + url + '">' + url + '</a>'
+ });
+
+ window = Ext.create('Ext.window.Window', {
+ title: 'Favorite link',
+ layout: 'fit',
+ modal: true,
+ resizable: false,
+ destroyOnBlur: true,
+ bodyStyle: 'padding: 12px 18px; background-color: #fff; font-size: 11px',
+ html: '<a class="user-select td-nobreak" target="_blank" href="' + url + '">' + url + '</a>',
+ listeners: {
+ show: function(w) {
+ ns.core.web.window.setAnchorPosition(w, ns.app.shareButton);
+
+ document.body.oncontextmenu = true;
+
+ if (!w.hasDestroyOnBlurHandler) {
+ ns.core.web.window.addDestroyOnBlurHandler(w);
+ }
+ },
+ hide: function() {
+ document.body.oncontextmenu = function(){return false;};
+ }
+ }
+ });
+
+ window.show();
+ }
+ });
+
+ apiUrlItem = Ext.create('Ext.menu.Item', {
+ text: 'API link' + ' ',
+ iconCls: 'ns-menu-item-datasource',
+ disabled: true,
+ xable: function() {
+ if (ns.app.layout.id) {
+ this.enable();
+ }
+ else {
+ this.disable();
+ }
+ },
+ handler: function() {
+ var url = ns.core.init.contextPath + '/api/eventReports/' + ns.app.layout.id + '/data',
+ textField,
+ window;
+
+ textField = Ext.create('Ext.form.field.Text', {
+ html: '<a class="user-select td-nobreak" target="_blank" href="' + url + '">' + url + '</a>'
+ });
+
+ window = Ext.create('Ext.window.Window', {
+ title: 'API link',
+ layout: 'fit',
+ modal: true,
+ resizable: false,
+ destroyOnBlur: true,
+ bodyStyle: 'padding: 12px 18px; background-color: #fff; font-size: 11px',
+ html: '<a class="user-select td-nobreak" target="_blank" href="' + url + '">' + url + '</a>',
+ listeners: {
+ show: function(w) {
+ ns.core.web.window.setAnchorPosition(w, ns.app.shareButton);
+
+ document.body.oncontextmenu = true;
+
+ if (!w.hasDestroyOnBlurHandler) {
+ ns.core.web.window.addDestroyOnBlurHandler(w);
+ }
+ },
+ hide: function() {
+ document.body.oncontextmenu = function(){return false;};
+ }
+ }
+ });
+
+ window.show();
+ }
+ });
shareButton = Ext.create('Ext.button.Button', {
text: NS.i18n.share,
- disabled: true,
+ disabled: true,
xableItems: function() {
- interpretationItem.xable();
+ //interpretationItem.xable();
//pluginItem.xable();
+ favoriteUrlItem.xable();
+ //apiUrlItem.xable();
},
- //menu: {
- //cls: 'ns-menu',
- //shadow: false,
- //showSeparator: false,
- //items: [
+ 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;
+ //pluginItem,
+ favoriteUrlItem
+ //apiUrlItem
+ ],
+ listeners: {
+ afterrender: function() {
+ this.getEl().addCls('ns-toolbar-btn-menu');
+ },
+ show: function() {
+ shareButton.xableItems();
+ }
}
-
- ns.app.interpretationWindow = InterpretationWindow();
- ns.app.interpretationWindow.show();
},
listeners: {
added: function() {
@@ -6815,7 +6812,7 @@
}
}
});
-
+
statusBar = Ext.create('Ext.ux.toolbar.StatusBar', {
height: 27,
listeners: {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-24 14:28:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-26 08:17:21 +0000
@@ -6335,134 +6335,131 @@
}
});
- interpretationItem = Ext.create('Ext.menu.Item', {
- text: 'Write interpretation' + ' ',
- iconCls: 'ns-menu-item-tablelayout',
- disabled: true,
- xable: function() {
- if (ns.app.layout.id) {
- this.enable();
- }
- else {
- this.disable();
- }
- },
- handler: function() {
- if (ns.app.interpretationWindow) {
- ns.app.interpretationWindow.destroy();
- ns.app.interpretationWindow = null;
- }
-
- ns.app.interpretationWindow = InterpretationWindow();
- ns.app.interpretationWindow.show();
- }
- });
-
- pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed in web page' + ' ',
- iconCls: 'ns-menu-item-datasource',
- disabled: true,
- xable: function() {
- if (ns.app.layout) {
- this.enable();
- }
- else {
- this.disable();
- }
- },
- handler: function() {
- var textArea,
- window,
- 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 += '</head>\n\n<body>\n';
- text += '<div id="table1"></div>\n\n';
- text += '<script>\n\n';
- text += 'DHIS.getTable(' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout, 'table1'), null, 2) + ');\n\n';
- text += '</script>\n\n';
- text += '</body>\n</html>';
-
- textArea = Ext.create('Ext.form.field.TextArea', {
- width: 700,
- height: 400,
- readOnly: true,
- cls: 'ns-textarea monospaced',
- value: text
- });
-
- window = Ext.create('Ext.window.Window', {
- title: 'Plugin configuration',
- layout: 'fit',
- modal: true,
- resizable: false,
- items: textArea,
- destroyOnBlur: true,
- bbar: [
- '->',
- {
- text: 'Select',
- handler: function() {
- textArea.selectText();
- }
- }
- ],
- listeners: {
- show: function(w) {
- ns.core.web.window.setAnchorPosition(w, ns.app.shareButton);
-
- document.body.oncontextmenu = true;
-
- if (!w.hasDestroyOnBlurHandler) {
- ns.core.web.window.addDestroyOnBlurHandler(w);
- }
- },
- hide: function() {
- document.body.oncontextmenu = function(){return false;};
- }
- }
- });
-
- window.show();
- }
- });
+ favoriteUrlItem = Ext.create('Ext.menu.Item', {
+ text: 'Favorite link' + ' ',
+ iconCls: 'ns-menu-item-datasource',
+ disabled: true,
+ xable: function() {
+ if (ns.app.layout.id) {
+ this.enable();
+ }
+ else {
+ this.disable();
+ }
+ },
+ handler: function() {
+ var url = ns.core.init.contextPath + '/dhis-web-event-visualizer/index.html?id=' + ns.app.layout.id,
+ textField,
+ window;
+
+ textField = Ext.create('Ext.form.field.Text', {
+ html: '<a class="user-select td-nobreak" target="_blank" href="' + url + '">' + url + '</a>'
+ });
+
+ window = Ext.create('Ext.window.Window', {
+ title: 'Favorite link',
+ layout: 'fit',
+ modal: true,
+ resizable: false,
+ destroyOnBlur: true,
+ bodyStyle: 'padding: 12px 18px; background-color: #fff; font-size: 11px',
+ html: '<a class="user-select td-nobreak" target="_blank" href="' + url + '">' + url + '</a>',
+ listeners: {
+ show: function(w) {
+ ns.core.web.window.setAnchorPosition(w, ns.app.shareButton);
+
+ document.body.oncontextmenu = true;
+
+ if (!w.hasDestroyOnBlurHandler) {
+ ns.core.web.window.addDestroyOnBlurHandler(w);
+ }
+ },
+ hide: function() {
+ document.body.oncontextmenu = function(){return false;};
+ }
+ }
+ });
+
+ window.show();
+ }
+ });
+
+ apiUrlItem = Ext.create('Ext.menu.Item', {
+ text: 'API link' + ' ',
+ iconCls: 'ns-menu-item-datasource',
+ disabled: true,
+ xable: function() {
+ if (ns.app.layout.id) {
+ this.enable();
+ }
+ else {
+ this.disable();
+ }
+ },
+ handler: function() {
+ var url = ns.core.init.contextPath + '/api/eventCharts/' + ns.app.layout.id + '/data',
+ textField,
+ window;
+
+ textField = Ext.create('Ext.form.field.Text', {
+ html: '<a class="user-select td-nobreak" target="_blank" href="' + url + '">' + url + '</a>'
+ });
+
+ window = Ext.create('Ext.window.Window', {
+ title: 'API link',
+ layout: 'fit',
+ modal: true,
+ resizable: false,
+ destroyOnBlur: true,
+ bodyStyle: 'padding: 12px 18px; background-color: #fff; font-size: 11px',
+ html: '<a class="user-select td-nobreak" target="_blank" href="' + url + '">' + url + '</a>',
+ listeners: {
+ show: function(w) {
+ ns.core.web.window.setAnchorPosition(w, ns.app.shareButton);
+
+ document.body.oncontextmenu = true;
+
+ if (!w.hasDestroyOnBlurHandler) {
+ ns.core.web.window.addDestroyOnBlurHandler(w);
+ }
+ },
+ hide: function() {
+ document.body.oncontextmenu = function(){return false;};
+ }
+ }
+ });
+
+ window.show();
+ }
+ });
shareButton = Ext.create('Ext.button.Button', {
text: NS.i18n.share,
- disabled: true,
+ disabled: true,
xableItems: function() {
- interpretationItem.xable();
+ //interpretationItem.xable();
//pluginItem.xable();
+ favoriteUrlItem.xable();
+ apiUrlItem.xable();
},
- //menu: {
- //cls: 'ns-menu',
- //shadow: false,
- //showSeparator: false,
- //items: [
+ 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;
+ //pluginItem,
+ favoriteUrlItem,
+ apiUrlItem
+ ],
+ listeners: {
+ afterrender: function() {
+ this.getEl().addCls('ns-toolbar-btn-menu');
+ },
+ show: function() {
+ shareButton.xableItems();
+ }
}
-
- ns.app.interpretationWindow = InterpretationWindow();
- ns.app.interpretationWindow.show();
},
listeners: {
added: function() {
@@ -6470,7 +6467,7 @@
}
}
});
-
+
defaultButton = Ext.create('Ext.button.Button', {
text: NS.i18n.chart,
iconCls: 'ns-button-icon-chart',
