=== 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-25 16:56:37 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-03-31 08:15:37 +0000 @@ -3777,7 +3777,7 @@ textarea = Ext.create('Ext.form.field.TextArea', { cls: 'gis-textarea', height: 130, - fieldStyle: 'padding-left: 4px; padding-top: 3px', + fieldStyle: 'padding-left: 3px; padding-top: 3px', emptyText: GIS.i18n.write_your_interpretation + '..' }); @@ -3788,12 +3788,12 @@ apiUrl = gis.init.contextPath + '/api/maps/' + gis.map.id + '/data', html = ''; - html += '
GIS link: ' + moduleUrl + '
'; + html += '
Map link: ' + moduleUrl + '
'; html += '
API link: ' + apiUrl + '
'; return html; }(), - style: 'padding-top: 8px; padding-bottom: 5px' + style: 'padding-top: 3px; padding-bottom: 2px; padding-left: 2px', }); button = Ext.create('Ext.button.Button', { @@ -3818,7 +3818,7 @@ layout: 'fit', iconCls: 'gis-window-title-icon-interpretation', cls: 'gis-container-default', - bodyStyle: 'padding:5px 5px 2px', + bodyStyle: 'padding: 2px', 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-27 16:38:52 +0000 +++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-03-31 08:15:37 +0000 @@ -1639,7 +1639,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: { @@ -1651,15 +1651,15 @@ linkPanel = Ext.create('Ext.panel.Panel', { html: function() { - var reportTableUrl = ns.core.init.contextPath + '/dhis-web-pivot/app/index.html?id=' + ns.app.layout.id, + var url = ns.core.init.contextPath + '/dhis-web-pivot/app/index.html?id=' + ns.app.layout.id, apiUrl = ns.core.init.contextPath + '/api/reportTables/' + ns.app.layout.id + '/data.html', html = ''; - html += '
Pivot link: ' + reportTableUrl + '
'; + html += '
Table link: ' + url + '
'; html += '
API link: ' + apiUrl + '
'; return html; }(), - style: 'padding-top: 8px; padding-bottom: 5px', + style: 'padding-top: 3px; padding-bottom: 2px; padding-left: 2px', bodyStyle: 'border: 0 none' }); @@ -1672,7 +1672,7 @@ handler: function() { if (textArea.getValue()) { Ext.Ajax.request({ - url: ns.core.init.contextPath + '/api/interpretations/reportTable/' + ns.app.layout.id, + url: ns.core.init.contextPath + '/api/interpretations/reportTables/' + ns.app.layout.id, method: 'POST', params: textArea.getValue(), headers: {'Content-Type': 'text/html'}, @@ -1690,7 +1690,7 @@ layout: 'fit', //iconCls: 'ns-window-title-interpretation', width: 500, - bodyStyle: 'padding:5px 5px 3px; background-color:#fff', + bodyStyle: 'padding:2px; background-color:#fff', resizable: false, destroyOnBlur: true, modal: true, === 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-25 15:27:01 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-03-31 08:15:37 +0000 @@ -1229,7 +1229,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: { @@ -1242,14 +1242,14 @@ linkPanel = Ext.create('Ext.panel.Panel', { html: function() { var url = ns.core.init.contextPath + '/dhis-web-visualizer/app/index.html?id=' + ns.app.layout.id, - apiUrl = ns.core.init.contextPath + '/api/charts/' + ns.app.layout.id + '/data.html', + apiUrl = ns.core.init.contextPath + '/api/charts/' + ns.app.layout.id + '/data', html = ''; - html += '
Pivot link: ' + url + '
'; + html += '
Chart link: ' + url + '
'; html += '
API link: ' + apiUrl + '
'; return html; }(), - style: 'padding-top: 8px; padding-bottom: 5px', + style: 'padding-top: 3px; padding-bottom: 2px; padding-left: 2px', bodyStyle: 'border: 0 none' }); @@ -1280,7 +1280,7 @@ layout: 'fit', //iconCls: 'ns-window-title-interpretation', width: 500, - bodyStyle: 'padding:5px 5px 3px; background-color:#fff', + bodyStyle: 'padding:2px; background-color:#fff', resizable: false, destroyOnBlur: true, modal: true,