dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2990 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-03-09 15:34:39 +0100
message:
  Minor fixes.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/global.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/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/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-03-01 11:37:38 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-03-09 14:25:39 +0000
@@ -437,3 +437,6 @@
     color:#111;
     margin-right:6px;
 }
+#mouseposition {
+    line-height:12px;
+}

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/global.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/global.js	2011-03-03 14:42:07 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/global.js	2011-03-09 13:58:41 +0000
@@ -31,11 +31,6 @@
 	emptytext: '',
 	labelseparator: '',
 	
-//	Styles
-
-	assigned_row_color: '#90ee90',
-	unassigned_row_color: '#ffffff',
-	
 //	DHIS variables
 
 	map_source_type_database: 'database',

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2011-03-08 15:38:37 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2011-03-09 14:25:39 +0000
@@ -436,7 +436,7 @@
 	/* Section: mapview */
 	var favoriteWindow = new Ext.Window({
         id: 'favorite_w',
-        title: '<span id="window-favorites-title">' + G.i18n.favorites + '</span>',
+        title: '<span id="window-favorites-title">' + G.i18n.favorite_map_views + '</span>',
 		layout: 'fit',
         closeAction: 'hide',
 		width: G.conf.window_width,
@@ -467,7 +467,7 @@
                     },
                         
                     {html: '<div class="window-p"></div>'},
-                    {html: '<div class="window-info">Delete / Add favorite to dashboard</div>'},
+                    {html: '<div class="window-info">Delete favorite / Add to dashboard</div>'},
                     {
                         xtype: 'combo',
                         id: 'favorite_cb',
@@ -2659,8 +2659,8 @@
 	G.vars.map.addControl(new OpenLayers.Control.MousePosition({
         displayClass: 'void', 
         div: $('mouseposition'), 
-        prefix: '<span style="color:#666;">x: &nbsp;</span>',
-        separator: '<br/><span style="color:#666;">y: &nbsp;</span>'
+        prefix: '<span style="color:#666">x: &nbsp;</span>',
+        separator: '<br/><span style="color:#666">y: &nbsp;</span>'
     }));
     
     G.vars.map.addControl(new OpenLayers.Control.OverviewMap({