dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11993
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-09-09 18:57:35 +0300
message:
  (GIS, DV, PT) Interpretation window fixes.
modified:
  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-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	2013-09-09 14:16:40 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-09-09 15:57:35 +0000
@@ -3145,11 +3145,21 @@
 			fieldStyle: 'padding-left: 4px; padding-top: 3px',
 			emptyText: GIS.i18n.write_your_interpretation
 		});
+		console.log(gis);
 
 		panel = Ext.create('Ext.panel.Panel', {
 			cls: 'gis-container-inner',
-			html: '<b>' + GIS.i18n.link_ + ': </b>' + gis.init.contextPath + '/dhis-web-mapping/app/index.html?id=' + gis.map.id,
-			style: 'padding:6px 0 6px 1px'
+			html: function() {
+				var moduleUrl = gis.init.contextPath + '/dhis-web-mapping/app/index.html?id=' + gis.map.id,
+					apiUrl = gis.init.contextPath + '/api/maps/' + gis.map.id + '/data.html',
+					html = '';
+					
+				html += '<div><b>GIS link: </b><span class="user-select"><a href="' + moduleUrl + '" target="_blank">' + moduleUrl + '</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'
 		});
 
 		button = Ext.create('Ext.button.Button', {
@@ -3170,11 +3180,11 @@
 		});
 
 		window = Ext.create('Ext.window.Window', {
-			title: GIS.i18n.share_interpretation,
+			title: gis.map.name,
 			layout: 'fit',
 			iconCls: 'gis-window-title-icon-interpretation',
 			cls: 'gis-container-default',
-            bodyStyle: 'padding:5px 5px 0',
+            bodyStyle: 'padding:5px 5px 2px',
 			width: 500,
 			resizable: true,
 			modal: true,
@@ -3188,7 +3198,7 @@
 			],
 			listeners: {
 				show: function() {
-					this.setPosition(325, 37);
+					this.setPosition(325, 33);
 				},
 				destroy: function() {
 					document.body.oncontextmenu = function(){

=== 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	2013-09-09 14:16:40 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-09-09 15:57:35 +0000
@@ -2121,7 +2121,7 @@
 			});
 
 			window = Ext.create('Ext.window.Window', {
-				title: PT.i18n.share + ' ' + PT.i18n.interpretation + '<span style="font-weight:normal; font-size:11px"> (' + pt.favorite.name + ') </span>',
+				title: pt.favorite.name,
 				layout: 'fit',
 				//iconCls: 'pt-window-title-interpretation',
 				width: 500,

=== 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	2013-09-09 14:16:40 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-09-09 15:57:35 +0000
@@ -1924,7 +1924,7 @@
 			});
 
 			window = Ext.create('Ext.window.Window', {
-				title: DV.i18n.share + ' ' + DV.i18n.interpretation + '<span style="font-weight:normal; font-size:11px"> (' + dv.favorite.name + ') </span>',
+				title: dv.favorite.name,
 				layout: 'fit',
 				//iconCls: 'dv-window-title-interpretation',
 				width: 500,