dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3199 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-03-29 10:56:36 +0200
message:
  (GIS) Default window popup position changed.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.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/mapping/javascript/global.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js	2011-03-16 13:20:24 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js	2011-03-29 08:55:05 +0000
@@ -27,6 +27,8 @@
 	combo_number_width: 65,
 	combo_number_width_small: 40,
     window_width: 251,
+    window_position_x: 55,
+    window_position_y: 41
     
 	emptytext: '',
 	labelseparator: '',

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-03-28 12:02:08 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-03-29 08:55:05 +0000
@@ -2454,8 +2454,8 @@
 		tooltip: G.i18n.favorite_map_views,
         style: 'margin-top:1px',
 		handler: function() {
-			var x = Ext.getCmp('center').x + 15;
-			var y = Ext.getCmp('center').y + 41;    
+			var x = Ext.getCmp('center').x + G.conf.window_position_x;
+			var y = Ext.getCmp('center').y + G.conf.window_position_y;    
 			favoriteWindow.setPosition(x,y);
 
 			if (favoriteWindow.visible) {
@@ -2477,8 +2477,8 @@
 				return;
 			}
 			
-			var x = Ext.getCmp('center').x + 15;
-			var y = Ext.getCmp('center').y + 41;   
+			var x = Ext.getCmp('center').x + G.conf.window_position_x;
+			var y = Ext.getCmp('center').y + G.conf.window_position_y;   
 			
 			exportImageWindow.setPosition(x,y);
 
@@ -2497,8 +2497,8 @@
 		disabled: !G.user.isAdmin,
         style: 'margin-top:1px',
 		handler: function() {
-			var x = Ext.getCmp('center').x + 15;
-			var y = Ext.getCmp('center').y + 41;
+			var x = Ext.getCmp('center').x + G.conf.window_position_x;
+			var y = Ext.getCmp('center').y + G.conf.window_position_y;
 			predefinedMapLegendSetWindow.setPosition(x,y);
 		
 			if (predefinedMapLegendSetWindow.visible) {
@@ -2519,8 +2519,8 @@
 		disabled: !G.user.isAdmin,
         style: 'margin-top:1px',
 		handler: function() {
-			var x = Ext.getCmp('center').x + 15;
-			var y = Ext.getCmp('center').y + 41;
+			var x = Ext.getCmp('center').x + G.conf.window_position_x;
+			var y = Ext.getCmp('center').y + G.conf.window_position_y;
 			adminWindow.setPosition(x,y);
 			adminWindow.show();
 		}