dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4446 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-08-25 15:46:48 +0200
message:
  Layertree icons added.
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/centroid_small.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol_small.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic1_small.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic2_small.png
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/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

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/centroid_small.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/centroid_small.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/centroid_small.png	2011-08-25 13:46:14 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol_small.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol_small.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol_small.png	2011-08-25 13:46:14 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic1_small.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic1_small.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic1_small.png	2011-08-25 13:46:14 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic2_small.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic2_small.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic2_small.png	2011-08-25 13:46:14 +0000 differ
=== 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-08-25 12:58:16 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-08-25 13:46:14 +0000
@@ -39,6 +39,18 @@
     background:url('../../resources/ext-ux/theme/gray-extend-ux/leaf.gif') center center;
     padding-right:1px;
 }
+.treepanel-node-icon-thematic1 {
+    background:url('../../../images/thematic1_small.png') center center no-repeat !important;
+}
+.treepanel-node-icon-thematic2 {
+    background:url('../../../images/thematic2_small.png') center center no-repeat !important;
+}
+.treepanel-node-icon-symbol {
+    background:url('../../../images/symbol_small.png') center center no-repeat !important;
+}
+.treepanel-node-icon-centroid {
+    background:url('../../../images/centroid_small.png') center center no-repeat !important;
+}
 .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');
 }

=== 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-08-25 13:16:55 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-08-25 13:46:14 +0000
@@ -2082,19 +2082,23 @@
                 },
                 {
                     nodeType: 'gx_layer',
-                    layer: G.conf.thematic_layer_1
-                },
-                {
-                    nodeType: 'gx_layer',
-                    layer: G.conf.thematic_layer_2
-                },
-                {
-                    nodeType: 'gx_layer',
-                    layer: G.conf.symbol_layer
-                },
-                {
-                    nodeType: 'gx_layer',
-                    layer: G.conf.centroid_layer
+                    layer: G.conf.thematic_layer_1,
+                    iconCls: 'treepanel-node-icon-thematic1'
+                },
+                {
+                    nodeType: 'gx_layer',
+                    layer: G.conf.thematic_layer_2,
+                    iconCls: 'treepanel-node-icon-thematic2'
+                },
+                {
+                    nodeType: 'gx_layer',
+                    layer: G.conf.symbol_layer,
+                    iconCls: 'treepanel-node-icon-symbol'
+                },
+                {
+                    nodeType: 'gx_layer',
+                    layer: G.conf.centroid_layer,
+                    iconCls: 'treepanel-node-icon-centroid'
                 }
             ]
         },