dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3200 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-03-29 11:16:13 +0200
message:
  Minor CSS fix.
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/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/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-03-25 13:59:06 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-03-29 09:15:25 +0000
@@ -69,7 +69,8 @@
     border-color:#999999;
 }
 
-/* OpenLayers (include in lib)
+/* OpenLayers (include in lib) */
+/*
 .olControlOverviewMapElement {
     -moz-border-radius:1em 0 0 0;
     background-color:#aaaaaa;
@@ -90,7 +91,6 @@
     filter: alpha(opacity=50);
 }
 */
-
 .olControlPanPanel div {
     opacity:0.8
 }
@@ -254,8 +254,8 @@
 
 /* Ext ComboBox */
 .combo-disabled {
-    opacity:0.60;
-    filter:alpha(opacity=60);
+    opacity:0.70;
+    filter:alpha(opacity=70);
     color:#000000;
     border-color:#9ca1b8;
     cursor: default;

=== 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-29 08:55:05 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js	2011-03-29 09:15:25 +0000
@@ -28,7 +28,7 @@
 	combo_number_width_small: 40,
     window_width: 251,
     window_position_x: 55,
-    window_position_y: 41
+    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-29 08:55:05 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-03-29 09:15:25 +0000
@@ -1850,6 +1850,7 @@
                                 fieldLabel: G.i18n.date_type,
                                 labelSeparator: G.conf.labelseparator,
                                 disabled: G.system.aggregationStrategy === G.conf.aggregation_strategy_batch,
+                                disabledClass: 'combo-disabled',
                                 editable: false,
                                 valueField: 'value',
                                 displayField: 'text',