dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2930 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-02-28 16:29:30 +0100
message:
  Improved code.
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/index.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.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-02-28 15:04:59 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-02-28 15:28:41 +0000
@@ -105,7 +105,7 @@
 
 /* Ext Menu */
 a.x-menu-item-custom {
-    padding: 2px 16px 3px 11px;
+    padding: 2px 10px 3px 11px;
 }
 #viewhistory_m .x-menu-list {
     background-color:#f1f1f1;
@@ -429,9 +429,11 @@
 .thematic-br {
     padding:8px 0 0 0;
 }
-.inline-span-color-black {
+.menu-item-inline-c1 {
     color:#111;
+    margin-right:6px;
 }
-.inline-span-color-gray {
+.menu-item-inline-c2 {
     color:#444;
+    margin-right:6px;
 }

=== 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-02-28 15:06:14 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2011-02-28 15:28:41 +0000
@@ -2355,13 +2355,14 @@
             var mapView = scope.formValues.getAllValues.call(scope);
             mapView.widget = scope;
             mapView.timestamp = new Date();
-            var c1 = '<span class="inline-span-color-gray">';
-            var c2 = '<span class="inline-span-color-black">';
-            mapView.label = c1 + G.date.getNowHMS(mapView.timestamp) + '</span>&nbsp;&nbsp;&nbsp;' +
-                            c2 + mapView.parentOrganisationUnitName + '</span>&nbsp;&nbsp;&nbsp;' +
-                            c1 + mapView.organisationUnitLevelName + '</span>&nbsp;&nbsp;&nbsp;' + 
-                            c2 + (mapView.mapValueType == G.conf.map_value_type_indicator ? mapView.indicatorName : mapView.dataElementName) + '</span>&nbsp;&nbsp;&nbsp;' +
-                            c1 + (mapView.mapDateType == G.conf.map_date_type_fixed ? mapView.periodName : (mapView.startDate + ' - ' + mapView.endDate)) + '</span>';
+            var c1 = '<span class="menu-item-inline-c1">';
+            var c2 = '<span class="menu-item-inline-c2">';
+            var spanEnd = '</span>';
+            mapView.label = c1 + G.date.getNowHMS(mapView.timestamp) + spanEnd +
+                            c2 + mapView.parentOrganisationUnitName + spanEnd +
+                            c1 + mapView.organisationUnitLevelName + spanEnd +
+                            c2 + (mapView.mapValueType == G.conf.map_value_type_indicator ? mapView.indicatorName : mapView.dataElementName) + spanEnd +
+                            c1 + (mapView.mapDateType == G.conf.map_date_type_fixed ? mapView.periodName : (mapView.startDate + ' - ' + mapView.endDate)) + spanEnd;
             
             for (var i = 0; i < this.menu.items.items.length; i++) {
                 if (G.util.compareObjToObj(mapView, this.menu.items.items[i].mapView, ['longitude','latitude','zoom','widget','timestamp','label'])) {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-02-28 15:04:59 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-02-28 15:28:41 +0000
@@ -426,7 +426,7 @@
             listeners: {
                 'select': {
                     scope: this,
-                    fn: function(cb) {2010
+                    fn: function(cb) {
                         if (G.util.setCurrentValue.call(this, cb, 'mapview')) {
                             return;
                         }