dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18269
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7640: (GIS) Boundary layer image export support + Increased toolbar icons size + i18n fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 7640 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-07-19 16:22:19 +0200
message:
(GIS) Boundary layer image export support + Increased toolbar icons size + i18n fixes.
removed:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/baselayer.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/boundary.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/boundary_small.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/calendar2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/centroid.png
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/clear2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/drilldown.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/edit2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/exit2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/export3.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/filter.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/gear.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2_small.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/image2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/information2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/labels.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/legendset.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/measure.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/overlay.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/question.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/refresh.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/relocate.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/search2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol2.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.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.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic2_small.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/transparency2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out2.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world2.png
added:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/accept.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/baselayer.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/boundary.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/boundary_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/calendar2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/cancel2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/centroid.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/centroid_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/clear2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/drilldown.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/edit2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/exit2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/export3.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/favorite.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/favorite_medium.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/filter.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/gear.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/history2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/history2_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/image2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/information2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/labels.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/legendset.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/loader.gif
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/measure.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/overlay.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/question.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/refresh.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/register.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/relocate.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/remove.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/resize.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/search2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/settings.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/settings_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic1.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic1_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic2_small.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/transparency2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_in2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_out2.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_world2.png
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
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/index.html
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
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/baselayer.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/baselayer.png 2011-08-04 13:36:50 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/baselayer.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/boundary.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/boundary.png 2012-02-08 15:15:18 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/boundary.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/boundary_small.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/boundary_small.png 2012-02-08 15:15:18 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/boundary_small.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/calendar2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/calendar2.png 2011-10-24 15:22:51 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/calendar2.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/centroid.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/centroid.png 2011-08-20 01:22:52 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/centroid.png 1970-01-01 00:00:00 +0000 differ
=== removed 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 2011-08-25 13:46:14 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/centroid_small.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/clear2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/clear2.png 2011-08-20 01:22:52 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/clear2.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/drilldown.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/drilldown.png 2012-03-29 15:24:07 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/drilldown.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/edit2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/edit2.png 2011-08-20 01:22:52 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/edit2.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/exit2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/exit2.png 2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/exit2.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/export3.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/export3.png 2011-05-25 10:07:22 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/export3.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite.png 2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/filter.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/filter.png 2011-08-20 01:22:52 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/filter.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/gear.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/gear.png 2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/gear.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2.png 2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2_small.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2_small.png 2011-03-24 12:38:53 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2_small.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/image2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/image2.png 2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/image2.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/information2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/information2.png 2011-06-09 13:20:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/information2.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/labels.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/labels.png 2011-04-06 11:44:07 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/labels.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/legendset.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/legendset.png 2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/legendset.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/measure.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/measure.png 2011-05-19 12:31:31 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/measure.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/overlay.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/overlay.png 2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/overlay.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/question.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/question.png 2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/question.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/refresh.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/refresh.png 2011-08-20 01:22:52 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/refresh.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/relocate.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/relocate.png 2011-06-22 05:50:46 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/relocate.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/search2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/search2.png 2011-04-06 11:44:07 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/search2.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol.png 2011-08-21 15:48:07 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol2.png 2011-08-21 15:48:07 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol2.png 1970-01-01 00:00:00 +0000 differ
=== removed 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 2011-08-25 13:46:14 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/symbol_small.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic1.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic1.png 2011-08-16 19:59:02 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic1.png 1970-01-01 00:00:00 +0000 differ
=== removed 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 2011-08-25 13:46:14 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic1_small.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic2.png 2011-08-16 19:59:02 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic2.png 1970-01-01 00:00:00 +0000 differ
=== removed 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 2011-08-25 13:46:14 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/thematic2_small.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/transparency2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/transparency2.png 2011-04-06 11:44:07 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/transparency2.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in2.png 2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in2.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out2.png 2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out2.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world2.png 2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world2.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2012-03-27 14:58:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2012-07-19 13:58:28 +0000
@@ -300,3 +300,5 @@
boundary_layer=Boundary layer
legend_symbolizer=Symbolizer
image=Image
+register_new_wms_overlay=Register new WMS overlay
+register_new_vector_overlay=Register new vector overlay
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2012-02-08 15:15:18 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2012-07-19 13:58:28 +0000
@@ -326,5 +326,6 @@
centroid_layer: '$encoder.jsEscape($i18n.getString( 'centroid_layer' ) , "'")',
no_values_found: '$encoder.jsEscape($i18n.getString( 'no_values_found' ) , "'")',
close: '$encoder.jsEscape($i18n.getString( 'close' ) , "'")',
- boundary_layer: '$encoder.jsEscape($i18n.getString( 'boundary_layer' ) , "'")'
+ boundary_layer: '$encoder.jsEscape($i18n.getString( 'boundary_layer' ) , "'")',
+ register_new_wms_overlay: '$encoder.jsEscape($i18n.getString( 'register_new_wms_overlay' ) , "'")'
};
\ No newline at end of file
=== 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 2012-05-13 12:33:37 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2012-07-19 13:58:28 +0000
@@ -33,26 +33,26 @@
background-color:#FAFAFA;
}
#layertree_tp .x-tree-node-leaf .x-tree-node-icon {
- background:url('../../../images/settings_small.png') center center no-repeat;
+ background:url('../images/settings_small.png') center center no-repeat;
}
#orgunittree .x-tree-node-leaf .x-tree-node-icon {
background:url('../../resources/ext-ux/theme/gray-extend-ux/leaf.gif') center center;
padding-right:1px;
}
.treepanel-node-icon-boundary {
- background:url('../../../images/boundary_small.png') center center no-repeat !important;
+ background:url('../images/boundary_small.png') center center no-repeat !important;
}
.treepanel-node-icon-thematic1 {
- background:url('../../../images/thematic1_small.png') center center no-repeat !important;
+ 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;
+ 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;
+ 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;
+ 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');
@@ -137,46 +137,46 @@
font:10px lucida sans unicode,arial,ubuntu;
}
.menu-layeroptions-edit {
- background:url('../../../images/edit2.png') center bottom;
+ background:url('../images/edit2.png') center bottom;
}
.menu-layeroptions-refresh {
- background:url('../../../images/refresh.png') center bottom;
+ background:url('../images/refresh.png') center bottom;
}
.menu-layeroptions-clear {
- background:url('../../../images/clear2.png') center bottom;
+ background:url('../images/clear2.png') center bottom;
}
.menu-layeroptions-filter {
- background:url('../../../images/filter.png') center bottom;
+ background:url('../images/filter.png') center bottom;
}
.menu-layeroptions-locate {
- background:url('../../../images/search2.png') center bottom;
+ background:url('../images/search2.png') center bottom;
}
.menu-layeroptions-opacity {
- background-image:url('../../../images/transparency2.png');
+ background-image:url('../images/transparency2.png');
}
.menu-layeroptions-labels {
- background-image:url('../../../images/labels.png');
+ background-image:url('../images/labels.png');
}
.menu-layeroptions-legend {
- background-image:url('../../../images/legendset.png');
+ background-image:url('../images/legendset.png');
}
.menu-layeroptions-period {
- background-image:url('../../../images/calendar2.png');
+ background-image:url('../images/calendar2.png');
}
.menu-featureoptions-info {
- background-image:url('../../../images/information2.png');
+ background-image:url('../images/information2.png');
}
.menu-featureoptions-relocate {
- background-image:url('../../../images/relocate.png');
+ background-image:url('../images/relocate.png');
}
.menu-featureoptions-drilldown {
- background-image:url('../../../images/drilldown.png');
+ background-image:url('../images/drilldown.png');
}
.menu-mapview {
- background-image:url('../../../images/favorite.png');
+ background-image:url('../images/favorite_medium.png');
}
.menu-history {
- background-image:url('../../../images/history2.png');
+ background-image:url('../images/history2.png');
}
.no-icon-menu .x-menu-item-icon {
display: none;
@@ -187,138 +187,139 @@
top:4px;
}
.menu-layeroptions-opacity-10 {
- background-image:url('../../../images/transparency2.png');
+ background-image:url('../images/transparency2.png');
opacity:0.1;
filter:alpha(opacity=10);
}
.menu-layeroptions-opacity-20 {
- background-image:url('../../../images/transparency2.png');
+ background-image:url('../images/transparency2.png');
opacity:0.2;
filter:alpha(opacity=20);
}
.menu-layeroptions-opacity-30 {
- background-image:url('../../../images/transparency2.png');
+ background-image:url('../images/transparency2.png');
opacity:0.3;
filter:alpha(opacity=30);
}
.menu-layeroptions-opacity-40 {
- background-image:url('../../../images/transparency2.png');
+ background-image:url('../images/transparency2.png');
opacity:0.4;
filter:alpha(opacity=40);
}
.menu-layeroptions-opacity-50 {
- background-image:url('../../../images/transparency2.png');
+ background-image:url('../images/transparency2.png');
opacity:0.5;
filter:alpha(opacity=50);
}
.menu-layeroptions-opacity-60 {
- background-image:url('../../../images/transparency2.png');
+ background-image:url('../images/transparency2.png');
opacity:0.6;
filter:alpha(opacity=60);
}
.menu-layeroptions-opacity-70 {
- background-image:url('../../../images/transparency2.png');
+ background-image:url('../images/transparency2.png');
opacity:0.7;
filter:alpha(opacity=70);
}
.menu-layeroptions-opacity-80 {
- background-image:url('../../../images/transparency2.png');
+ background-image:url('../images/transparency2.png');
opacity:0.8;
filter:alpha(opacity=80);
}
.menu-layeroptions-opacity-90 {
- background-image:url('../../../images/transparency2.png');
+ background-image:url('../images/transparency2.png');
opacity:0.9;
filter:alpha(opacity=90);
}
.menu-layeroptions-opacity-100 {
- background-image:url('../../../images/transparency2.png');
+ background-image:url('../images/transparency2.png');
opacity:1.0;
filter:alpha(opacity=100);
}
/* Ext Button */
.x-btn-icon .x-btn-small .x-btn-text {
- height:14px;
- width:14px;
+ height:15px;
+ width:15px;
}
.x-btn button {
font:normal 10px lucida sans unicode,arial,ubuntu;
}
.x-btn .icon-boundary {
- background-image:url('../../../images/boundary.png');
+ background-image:url('../images/boundary.png');
}
.x-btn .icon-thematic1 {
- background-image:url('../../../images/thematic1.png');
+ background-image:url('../images/thematic1.png');
}
.x-btn .icon-thematic2 {
- background-image:url('../../../images/thematic2.png');
+ background-image:url('../images/thematic2.png');
}
.x-btn .icon-symbol {
- background-image:url('../../../images/symbol.png');
+ background-image:url('../images/symbol.png');
}
.x-btn .icon-centroid {
- background-image:url('../../../images/centroid.png');
+ background-image:url('../images/centroid.png');
}
.x-btn .icon-zoomin {
- background-image:url('../../../images/zoom_in2.png');
+ background-image:url('../images/zoom_in2.png');
+ height:
}
.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/export3.png');
+ background-image:url('../images/export3.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-baselayer {
- background-image:url('../../../images/baselayer.png');
+ background-image:url('../images/baselayer.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/register.png');
+ background-image:url('../images/register.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-cancel {
- background-image:url('../../../images/cancel2.png');
+ background-image:url('../images/cancel2.png');
}
.x-btn .icon-resize {
- background-image:url('../../../images/resize.png');
+ background-image:url('../images/resize.png');
}
.x-btn .icon-labels {
- background-image:url('../../../images/labels.png');
+ background-image:url('../images/labels.png');
}
.x-btn .icon-measure {
- background-image:url('../../../images/measure.png');
+ background-image:url('../images/measure.png');
}
.x-btn-noicon .x-btn-small .x-btn-text {
height:16px;
@@ -346,7 +347,7 @@
/* Ext Loading Mask */
.x-mask-loading2 div {
padding:5px 11px 6px 32px;
- background:#fbfbfb url('../../../images/loader.gif') no-repeat 5px 2px;
+ background:#fbfbfb url('../images/loader.gif') no-repeat 5px 2px;
line-height:20px;
font:normal 10px lucida sans unicode,arial,ubuntu;
}
@@ -367,115 +368,115 @@
}
#window-boundary-title {
padding:0 0 3px 21px;
- background:url('../../../images/boundary.png') no-repeat 0 0 transparent;
+ background:url('../images/boundary.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-thematic1-title {
padding:0 0 3px 21px;
- background:url('../../../images/thematic1.png') no-repeat 0 0 transparent;
+ background:url('../images/thematic1.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-thematic2-title {
padding:0 0 3px 21px;
- background:url('../../../images/thematic2.png') no-repeat 0 0 transparent;
+ background:url('../images/thematic2.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-symbol-title {
padding:0 0 3px 21px;
- background:url('../../../images/symbol.png') no-repeat 0 0 transparent;
+ background:url('../images/symbol.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-centroid-title {
padding:0 0 3px 21px;
- background:url('../../../images/centroid.png') no-repeat 0 0 transparent;
+ background:url('../images/centroid.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-favorites-title {
padding:0 0 3px 21px;
- background:url('../../../images/favorite.png') no-repeat 0 0 transparent;
+ background:url('../images/favorite.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-predefinedlegendset-title {
padding:0 0 3px 21px;
- background:url('../../../images/legendset.png') no-repeat 0 0 transparent;
+ background:url('../images/legendset.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-image-title {
padding:0 0 3px 21px;
- background:url('../../../images/export3.png') no-repeat 0 0 transparent;
+ background:url('../images/export3.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-admin-title {
padding:0 0 3px 21px;
- background:url('../../../images/gear.png') no-repeat 0 0 transparent;
+ background:url('../images/gear.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-help-title {
padding:0 0 3px 21px;
- background:url('../../../images/question.png') no-repeat 0 0 transparent;
+ background:url('../images/question.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-baselayer-title {
padding:0 0 3px 21px;
- background:url('../../../images/baselayer.png') no-repeat 0 0 transparent;
+ background:url('../images/baselayer.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-maplayer-title {
padding:0 0 3px 21px;
- background:url('../../../images/overlay.png') no-repeat 0 0 transparent;
+ background:url('../images/overlay.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-period-title {
padding:0 0 3px 21px;
- background:url('../../../images/calendar2.png') no-repeat 0 0 transparent;
+ background:url('../images/calendar2.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-labels-title {
padding:0 0 3px 21px;
- background:url('../../../images/labels.png') no-repeat 0 0 transparent;
+ background:url('../images/labels.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-locate-title {
padding:0 0 3px 21px;
- background:url('../../../images/search2.png') no-repeat 0 0 transparent;
+ background:url('../images/search2.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
#window-measure-title {
padding:0 0 3px 21px;
- background:url('../../../images/measure.png') no-repeat 0 0 transparent;
+ background:url('../images/measure.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
.window-information-title {
padding:0 0 3px 21px;
- background:url('../../../images/information2.png') no-repeat 0 0 transparent;
+ background:url('../images/information2.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
.window-relocate-title {
padding:0 0 3px 21px;
- background:url('../../../images/relocate.png') no-repeat 0 0 transparent;
+ background:url('../images/relocate.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
.window-filter-title {
padding:0 0 3px 21px;
- background:url('../../../images/filter.png') no-repeat 0 0 transparent;
+ background:url('../images/filter.png') no-repeat 0 0 transparent;
font:bold 11px arial;
color:#111;
}
@@ -554,7 +555,7 @@
padding:7px 0 0 0;
}
.menu-item-inline-bg {
- background:url('../../../images/history2_small.png') no-repeat left center;
+ background:url('../images/history2_small.png') no-repeat left center;
padding-left:24px;
}
.menu-item-inline-c1 {
=== added directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images'
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/accept.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/accept.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/accept.png 2012-07-19 14:20:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/baselayer.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/baselayer.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/baselayer.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/boundary.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/boundary.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/boundary.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/boundary_small.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/boundary_small.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/boundary_small.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/calendar2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/calendar2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/calendar2.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/cancel2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/cancel2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/cancel2.png 2012-07-19 14:20:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/centroid.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/centroid.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/centroid.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/centroid_small.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/centroid_small.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/centroid_small.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/clear2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/clear2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/clear2.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/drilldown.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/drilldown.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/drilldown.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/edit2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/edit2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/edit2.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/exit2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/exit2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/exit2.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/export3.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/export3.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/export3.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/favorite.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/favorite.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/favorite.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/favorite_medium.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/favorite_medium.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/favorite_medium.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/filter.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/filter.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/filter.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/gear.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/gear.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/gear.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/history2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/history2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/history2.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/history2_small.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/history2_small.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/history2_small.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/image2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/image2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/image2.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/information2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/information2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/information2.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/labels.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/labels.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/labels.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/legendset.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/legendset.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/legendset.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/loader.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/loader.gif 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/loader.gif 2012-07-19 14:20:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/measure.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/measure.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/measure.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/overlay.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/overlay.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/overlay.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/question.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/question.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/question.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/refresh.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/refresh.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/refresh.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/register.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/register.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/register.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/relocate.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/relocate.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/relocate.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/remove.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/remove.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/remove.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/resize.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/resize.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/resize.png 2012-07-19 14:20:24 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/search2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/search2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/search2.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/settings.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/settings.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/settings.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/settings_small.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/settings_small.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/settings_small.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol2.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol_small.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol_small.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/symbol_small.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic1.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic1.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic1.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic1_small.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic1_small.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic1_small.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic2.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic2_small.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic2_small.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/thematic2_small.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/transparency2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/transparency2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/transparency2.png 2012-07-19 13:26:54 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_in2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_in2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_in2.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_out2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_out2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_out2.png 2012-07-19 13:58:28 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_world2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_world2.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/images/zoom_world2.png 2012-07-19 13:58:28 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html 2012-05-23 09:57:53 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html 2012-07-19 13:26:54 +0000
@@ -42,7 +42,6 @@
<form id="exportForm" method="post">
<input type="hidden" id="titleField" name="title"/>
- <input type="hidden" id="viewBoxField" name="viewBox"/>
<input type="hidden" id="layerField" name="layer"/>
<input type="hidden" id="imageLegendRowsField" name="imageLegendRows"/>
<input type="hidden" id="svgField" name="svg"/>
=== 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 2012-06-12 19:38:35 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2012-07-19 13:26:54 +0000
@@ -788,6 +788,13 @@
document.getElementById('layerField').value = 0;
}
+ if (boundaryLayer.visibility) {
+ if (boundary.formValidation.validateForm.call(boundary)) {
+ var str = document.getElementById(boundaryLayer.svgId).parentNode.innerHTML;
+ svg = G.util.mergeSvg(svg, [str]);
+ }
+ }
+
var overlays = G.util.getVisibleLayers(G.util.getLayersByType(G.conf.map_layer_type_overlay));
svg = G.util.mergeSvg(svg, G.util.getOverlaysSvg(overlays));
