dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #29165
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14688: ER PT DV GIS. interpretation window fix.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 14688 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-04-05 13:26:25 +0200
message:
ER PT DV GIS. interpretation window fix.
modified:
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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/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-04 12:29:44 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-04-05 11:01:34 +0000
@@ -2357,7 +2357,7 @@
textArea = Ext.create('Ext.form.field.TextArea', {
cls: 'ns-textarea',
height: 130,
- fieldStyle: 'padding-left: 4px; padding-top: 3px',
+ fieldStyle: 'padding-left: 3px; padding-top: 3px',
emptyText: NS.i18n.write_your_interpretation,
enableKeyEvents: true,
listeners: {
@@ -2369,15 +2369,15 @@
linkPanel = Ext.create('Ext.panel.Panel', {
html: function() {
- var eventReportUrl = ns.core.init.contextPath + '/dhis-web-event-report/app/index.html?id=' + ns.app.layout.id,
+ var url = ns.core.init.contextPath + '/dhis-web-event-reports/app/index.html?id=' + ns.app.layout.id,
apiUrl = ns.core.init.contextPath + '/api/eventReports/' + ns.app.layout.id + '/data.html',
html = '';
- html += '<div><b>Report link: </b><span class="user-select"><a href="' + eventReportUrl + '" target="_blank">' + eventReportUrl + '</a></span></div>';
+ 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>';
return html;
}(),
- style: 'padding-top: 8px; padding-bottom: 5px',
+ style: 'padding:3px',
bodyStyle: 'border: 0 none'
});
@@ -2390,7 +2390,7 @@
handler: function() {
if (textArea.getValue()) {
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/interpretations/eventReport/' + ns.app.layout.id,
+ url: ns.core.init.contextPath + '/api/interpretations/eventReports/' + ns.app.layout.id,
method: 'POST',
params: textArea.getValue(),
headers: {'Content-Type': 'text/html'},
@@ -2406,9 +2406,8 @@
window = Ext.create('Ext.window.Window', {
title: ns.app.layout.name,
layout: 'fit',
- //iconCls: 'ns-window-title-interpretation',
width: 500,
- bodyStyle: 'padding:5px 5px 3px; background-color:#fff',
+ bodyStyle: 'padding:1px; background-color:#fff',
resizable: false,
destroyOnBlur: true,
modal: true,
@@ -5397,7 +5396,7 @@
isLoaded: false,
pageSize: 10,
page: 1,
- defaultUrl: ns.core.init.contextPath + '/api/eventReports.json?include=id,name,lastUpdated,access',
+ defaultUrl: ns.core.init.contextPath + '/api/eventReports.json?include=id,name,access',
loadStore: function(url) {
this.proxy.url = url || this.defaultUrl;
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-03-31 08:15:37 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-04-05 11:25:46 +0000
@@ -3793,7 +3793,7 @@
return html;
}(),
- style: 'padding-top: 3px; padding-bottom: 2px; padding-left: 2px',
+ style: 'padding:3px',
});
button = Ext.create('Ext.button.Button', {
@@ -3818,7 +3818,7 @@
layout: 'fit',
iconCls: 'gis-window-title-icon-interpretation',
cls: 'gis-container-default',
- bodyStyle: 'padding: 2px',
+ bodyStyle: 'padding: 1px',
width: 500,
resizable: true,
modal: true,
=== 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 2014-03-31 08:15:37 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-04-05 10:58:23 +0000
@@ -1659,7 +1659,7 @@
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: 3px; padding-bottom: 2px; padding-left: 2px',
+ style: 'padding:3px',
bodyStyle: 'border: 0 none'
});
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-03-31 08:15:37 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-04-05 11:25:46 +0000
@@ -1249,7 +1249,7 @@
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: 3px; padding-bottom: 2px; padding-left: 2px',
+ style: 'padding: 3px',
bodyStyle: 'border: 0 none'
});
@@ -1278,9 +1278,8 @@
window = Ext.create('Ext.window.Window', {
title: ns.app.layout.name,
layout: 'fit',
- //iconCls: 'ns-window-title-interpretation',
width: 500,
- bodyStyle: 'padding:2px; background-color:#fff',
+ bodyStyle: 'padding:1px; background-color:#fff',
resizable: false,
destroyOnBlur: true,
modal: true,
