dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 10585 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-04-16 16:29:57 +0200
message:
  (GIS) Scale bar added.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css


--
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/core.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js	2013-04-16 11:11:50 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js	2013-04-16 14:28:29 +0000
@@ -90,12 +90,6 @@
 	var conf = gis.conf,
 		util = {};
 
-	util.google = {};
-
-	util.google.openTerms = function() {
-		window.open('http://www.google.com/intl/en-US_US/help/terms_maps.html', '_blank');
-	};
-
 	util.map = {};
 
 	util.map.getVisibleVectorLayers = function() {
@@ -231,12 +225,16 @@
 				documentDrag: true
 			}),
 			new OpenLayers.Control.MousePosition({
-				id: 'mouseposition',
 				prefix: '<span class="el-fontsize-10"><span class="text-mouseposition-lonlat">LON </span>',
 				separator: '<span class="text-mouseposition-lonlat">&nbsp;&nbsp;LAT </span>',
-				suffix: '<div id="google-logo" onclick="javascript:gis.util.google.openTerms();"></div></span>'
+				suffix: '<div id="google-logo" name="http://www.google.com/intl/en-US_US/help/terms_maps.html"; onclick="window.open(Ext.get(this).dom.attributes.name.nodeValue);"></div></span>'
 			}),
-			new OpenLayers.Control.Permalink()
+			new OpenLayers.Control.Permalink(),
+			new OpenLayers.Control.ScaleLine({
+				geodesic: true,
+				maxWidth: 200,
+				minWidth: 100
+			})
 		],
 		displayProjection: new OpenLayers.Projection('EPSG:4326'),
 		maxExtent: new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508),

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css	2013-04-16 10:02:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css	2013-04-16 14:28:29 +0000
@@ -179,7 +179,17 @@
 	cursor: hand;
 }
 
-/* GIS */
+/* ScaleLine */
+.olControlScaleLine {
+	left: 5px !important;
+	bottom: 5px !important;
+}
+.olControlScaleLineBottom {
+	display: none;
+}
+.olControlScaleLineTop {
+	font-weight: bold;
+}
 
 /*----------------------------------------------------------------------------
  * Combobox