dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3168 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-03-25 11:26:17 +0100
message:
  (GIS) Minor CSS changes. Orgunit tree leaf icon fixed.
added:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/leaf.gif
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


--
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-24 12:38:53 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-03-25 10:22:40 +0000
@@ -33,15 +33,20 @@
 	background-color:#F8F8F8;
 }
 .x-tree-node-leaf .x-tree-node-icon {
-    background-image:url("../../../images/settings_small.png");
+    background-image:url('../../resources/ext-ux/theme/gray-extend-ux/leaf.gif');
+    background-position:center center;
+    padding-right:1px;
+}
+#layertree_tp .x-tree-node-leaf .x-tree-node-icon {
+    background-image:url('../../../images/settings_small.png');
     background-position:center center;
     padding-right:1px;
 }
 .x-btn-tl, .x-btn-tr, .x-btn-tc, .x-btn-ml, .x-btn-mr, .x-btn-mc, .x-btn-bl, .x-btn-br, .x-btn-bc {
-	background-image:url(../../resources/ext-ux/theme/gray-extend-ux/btn.gif);
+	background-image:url('../../resources/ext-ux/theme/gray-extend-ux/btn.gif');
 }
 .x-toolbar .xtb-sep {
-    background-image:url(../../resources/ext-ux/theme/gray-extend-ux/grid-split.png);
+    background-image:url('../../resources/ext-ux/theme/gray-extend-ux/grid-split.png');
     height:23px;
 }
 .x-panel-tbar .x-toolbar {
@@ -110,67 +115,67 @@
     font:10px lucida sans unicode,ubuntu,arial;
 }
 .menu-layeroptions-locate {
-    background-image:url(../../../images/magnifier.png);
+    background-image:url('../../../images/magnifier.png');
 }
 .menu-layeroptions-opacity {
-    background-image:url(../../../images/transparency.png);
+    background-image:url('../../../images/transparency.png');
 }
 .menu-layeroptions-labels {
-    background-image:url(../../../images/labels.png);
+    background-image:url('../../../images/labels.png');
 }
 .menu-layeroptions-wmslegend {
-    background-image:url(../../../images/wmslegend.png);
+    background-image:url('../../../images/wmslegend.png');
 }
 .no-icon-menu .x-menu-item-icon {
     display: none;
 }
 .menu-layeroptions-opacity-10 {
-    background-image:url(../../../images/transparency.png);
+    background-image:url('../../../images/transparency.png');
     opacity:0.1;
     filter:alpha(opacity=10);
 }
 .menu-layeroptions-opacity-20 {
-    background-image:url(../../../images/transparency.png);
+    background-image:url('../../../images/transparency.png');
     opacity:0.2;
     filter:alpha(opacity=20);
 }
 .menu-layeroptions-opacity-30 {
-    background-image:url(../../../images/transparency.png);
+    background-image:url('../../../images/transparency.png');
     opacity:0.3;
     filter:alpha(opacity=30);
 }
 .menu-layeroptions-opacity-40 {
-    background-image:url(../../../images/transparency.png);
+    background-image:url('../../../images/transparency.png');
     opacity:0.4;
     filter:alpha(opacity=40);
 }
 .menu-layeroptions-opacity-50 {
-    background-image:url(../../../images/transparency.png);
+    background-image:url('../../../images/transparency.png');
     opacity:0.5;
     filter:alpha(opacity=50);
 }
 .menu-layeroptions-opacity-60 {
-    background-image:url(../../../images/transparency.png);
+    background-image:url('../../../images/transparency.png');
     opacity:0.6;
     filter:alpha(opacity=60);
 }
 .menu-layeroptions-opacity-70 {
-    background-image:url(../../../images/transparency.png);
+    background-image:url('../../../images/transparency.png');
     opacity:0.7;
     filter:alpha(opacity=70);
 }
 .menu-layeroptions-opacity-80 {
-    background-image:url(../../../images/transparency.png);
+    background-image:url('../../../images/transparency.png');
     opacity:0.8;
     filter:alpha(opacity=80);
 }
 .menu-layeroptions-opacity-90 {
-    background-image:url(../../../images/transparency.png);
+    background-image:url('../../../images/transparency.png');
     opacity:0.9;
     filter:alpha(opacity=90);
 }
 .menu-layeroptions-opacity-100 {
-    background-image:url(../../../images/transparency.png);
+    background-image:url('../../../images/transparency.png');
     opacity:1.0;
     filter:alpha(opacity=100);
 }
@@ -184,52 +189,52 @@
 	font:normal 10px lucida sans unicode,ubuntu,arial;
 }
 .x-btn .icon-zoomin  {
-	background-image:url(../../../images/zoom_in2.png);
+	background-image:url('../../../images/zoom_in2.png');
 }
 .x-btn .icon-zoomout  {
-	background-image:url(../../../images/zoom_out2.png);
+	background-image:url('../../../images/zoom_out2.png');
 }
 .x-btn .icon-zoommin  {
-	background-image:url(../../../images/zoom_world2.png);
+	background-image:url('../../../images/zoom_world2.png');
 }
 .x-btn .icon-history {
-	background-image:url(../../../images/history2.png);
+	background-image:url('../../../images/history2.png');
 }
 .x-btn .icon-favorite {
-	background-image:url(../../../images/favorite.png);
+	background-image:url('../../../images/favorite.png');
 }
 .x-btn .icon-predefinedlegendset {
-	background-image:url(../../../images/legendset.png);
+	background-image:url('../../../images/legendset.png');
 }
 .x-btn .icon-image {
-	background-image:url(../../../images/image2.png);
+	background-image:url('../../../images/image2.png');
 }
 .x-btn .icon-admin {
-	background-image:url(../../../images/gear.png);
+	background-image:url('../../../images/gear.png');
 }
 .x-btn .icon-help {
-	background-image:url(../../../images/question.png);
+	background-image:url('../../../images/question.png');
 }
 .x-btn .icon-exit {
-	background-image:url(../../../images/exit2.png);
+	background-image:url('../../../images/exit2.png');
 }
 .x-btn .icon-overlay {
-	background-image:url(../../../images/overlay.png);
+	background-image:url('../../../images/overlay.png');
 }
 .x-btn .icon-labels {
-	background-image:url(../../../images/labels.png);
+	background-image:url('../../../images/labels.png');
 }
 .x-btn .icon-add {
-	background-image:url(../../../images/add.png);
+	background-image:url('../../../images/add.png');
 }
 .x-btn .icon-remove {
-	background-image:url(../../../images/remove.png);
+	background-image:url('../../../images/remove.png');
 }
 .x-btn .icon-assign {
-	background-image:url(../../../images/accept.png);
+	background-image:url('../../../images/accept.png');
 }
 .x-btn .icon-export {
-	background-image:url(../../../images/export2.png);
+	background-image:url('../../../images/export2.png');
 }
 .aa_med button {
 	color:#333;
@@ -417,7 +422,7 @@
     margin-right:6px;
 }
 .menu-item-inline-c2 {
-    color:#111;
+    color:#222;
     margin-right:6px;
 }
 #east {

=== 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-24 12:38:53 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2011-03-25 10:22:40 +0000
@@ -1981,6 +1981,7 @@
     });
 
     var layerTree = new Ext.tree.TreePanel({
+        id: 'layertree_tp',
         title: '<span class="panel-title">' + G.i18n.map_layers + '</span>',
         bodyStyle: 'padding-bottom:5px',
         enableDD: false,

=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/leaf.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/leaf.gif	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/leaf.gif	2011-03-25 10:22:40 +0000 differ