dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #09050
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2314: (GIS) Minor bug fixed. Unnecessary files removed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2314 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2010-12-08 23:45:39 +0100
message:
(GIS) Minor bug fixed. Unnecessary files removed.
removed:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_line_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_point_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_polygon_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_pan.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomfull.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomin.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomout.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/resultset_next.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/resultset_previous.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/routing-start-node.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/routing-stop-node.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/de.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/en.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/fr.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/blank.gif
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/cloud-popup-relative.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/drag-rectangle-off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/drag-rectangle-on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/east-mini.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/layer-switcher-maximize.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/layer-switcher-minimize.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-blue.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-gold.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-green.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/measuring-stick-off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/measuring-stick-on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/north-mini.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/panning-hand-off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/panning-hand-on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/slider.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/south-mini.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/west-mini.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-minus-mini.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-plus-mini.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-world-mini.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoombar.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/add_point_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/add_point_on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/blank.gif
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/close.gif
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/drag-rectangle-off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/drag-rectangle-on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_line_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_line_on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_point_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_point_on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_polygon_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_polygon_on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/editing_tool_bar.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/move_feature_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/move_feature_on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/navigation_history.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/overview_replacement.gif
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan-panel-NOALPHA.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan-panel.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan_on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/panning-hand-off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/panning-hand-on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/remove_point_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/remove_point_on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/ruler.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/save_features_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/save_features_on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_next_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_next_on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_previous_off.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_previous_on.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/zoom-panel-NOALPHA.png
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/zoom-panel.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/script/globals.js
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/MapFish.js
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/Symbol.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 2010-12-06 13:25:24 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2010-12-08 21:53:31 +0000
@@ -370,7 +370,7 @@
}
#help h3 {
padding:8px 0 0 0;
- font:bold 11px arial;
+ font:bold 11px ubuntu,arial;
color:#333;
letter-spacing:0px;
}
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/globals.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/globals.js 2010-12-06 12:32:39 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/globals.js 2010-12-08 21:53:31 +0000
@@ -27,7 +27,6 @@
// Layout
- north_height: 0, // viewport north
west_width: 270, // viewport west
gridpanel_width: 270 - 15,
multiselect_width: 210,
@@ -54,6 +53,7 @@
map_legend_type_predefined: 'predefined',
map_layer_type_baselayer: 'baselayer',
map_layer_type_overlay: 'overlay',
+ map_layer_type_thematic: 'thematic',
map_value_type_indicator: 'indicator',
map_value_type_dataelement: 'dataelement',
map_date_type_fixed: 'fixed',
@@ -325,7 +325,7 @@
parameter: null,
activePanel: {
- value: null,
+ value: GLOBAL.conf.thematicMap,
setPolygon: function() {
this.value = GLOBAL.conf.thematicMap;
},
=== 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 2010-12-06 13:25:24 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2010-12-08 21:53:31 +0000
@@ -2147,8 +2147,8 @@
baseLayerOptionsWindow.show();
}
-
- function showVectorLayerOptions(layer) {
+
+ function showVectorLayerOptions(layer, type) {
if (Ext.getCmp('vectorlayeroptions_w')) {
Ext.getCmp('vectorlayeroptions_w').destroy();
}
@@ -2171,91 +2171,86 @@
id: 'locatefeature_w',
title: 'Locate features',
layout: 'fit',
- defaults: {layout: 'fit', bodyStyle:'padding:8px; border:0px'},
+ defaults: {bodyStyle:'padding:8px; border:0px'},
width: 250,
height: GLOBAL.util.getMultiSelectHeight() + 145,
items: [
{
xtype: 'panel',
items: [
- {
- xtype: 'panel',
- items: [
- { html: '<div class="window-field-label-first">' + i18n_highlight_color + '</div>' },
- {
- xtype: 'colorfield',
- labelSeparator: GLOBAL.conf.labelseparator,
- id: 'highlightcolor_cf',
- allowBlank: false,
- isFormField: true,
- width: GLOBAL.conf.combo_width,
- value: "#0000FF"
- },
- { html: '<div class="window-field-label">' + i18n_feature_filter + '</div>' },
- {
- xtype: 'textfield',
- id: 'locatefeature_tf',
- enableKeyEvents: true,
- listeners: {
- 'keyup': {
- fn: function() {
- var p = Ext.getCmp('locatefeature_tf').getValue();
- featureStore.filter('name', p, true, false);
- }
- }
- }
- },
- { html: '<div class="window-field-nolabel"></div>' },
- {
- xtype: 'grid',
- id: 'featuregrid_gp',
- height: GLOBAL.util.getMultiSelectHeight(),
- store: featureStore,
- cm: new Ext.grid.ColumnModel({
- columns: [{id: 'name', header: 'Features', dataIndex: 'name', width: 250}]
- }),
- sm: new Ext.grid.RowSelectionModel({singleSelect:true}),
- viewConfig: {forceFit: true},
- sortable: true,
- autoExpandColumn: 'name',
- listeners: {
- 'cellclick': {
- fn: function(g, ri, ci) {
- layer.redraw();
-
- var id, feature, backupF, backupS;
- id = g.getStore().getAt(ri).data.id;
-
- for (var i = 0; i < layer.features.length; i++) {
- if (layer.features[i].data.id == id) {
- feature = layer.features[i];
- break;
- }
- }
-
- var color = Ext.getCmp('highlightcolor_cf').getValue();
- var symbolizer;
-
- if (feature.attributes.featureType == GLOBAL.conf.map_feature_type_multipolygon ||
- feature.attributes.featureType == GLOBAL.conf.map_feature_type_polygon) {
- symbolizer = new OpenLayers.Symbolizer.Polygon({
- 'strokeColor': color,
- 'fillColor': color
- });
- }
- else if (feature.attributes.featureType == GLOBAL.conf.map_feature_type_point) {
- symbolizer = new OpenLayers.Symbolizer.Point({
- 'pointRadius': 7,
- 'fillColor': color
- });
- }
-
- layer.drawFeature(feature,symbolizer);
- }
- }
- }
- }
- ]
+ { html: '<div class="window-field-label-first">' + i18n_highlight_color + '</div>' },
+ {
+ xtype: 'colorfield',
+ labelSeparator: GLOBAL.conf.labelseparator,
+ id: 'highlightcolor_cf',
+ allowBlank: false,
+ isFormField: true,
+ width: GLOBAL.conf.combo_width,
+ value: "#0000FF"
+ },
+ { html: '<div class="window-field-label">' + i18n_feature_filter + '</div>' },
+ {
+ xtype: 'textfield',
+ id: 'locatefeature_tf',
+ enableKeyEvents: true,
+ listeners: {
+ 'keyup': {
+ fn: function() {
+ var p = Ext.getCmp('locatefeature_tf').getValue();
+ featureStore.filter('name', p, true, false);
+ }
+ }
+ }
+ },
+ { html: '<div class="window-field-nolabel"></div>' },
+ {
+ xtype: 'grid',
+ id: 'featuregrid_gp',
+ height: GLOBAL.util.getMultiSelectHeight(),
+ store: featureStore,
+ cm: new Ext.grid.ColumnModel({
+ columns: [{id: 'name', header: 'Features', dataIndex: 'name', width: 250}]
+ }),
+ sm: new Ext.grid.RowSelectionModel({singleSelect:true}),
+ viewConfig: {forceFit: true},
+ sortable: true,
+ autoExpandColumn: 'name',
+ listeners: {
+ 'cellclick': {
+ fn: function(g, ri, ci) {
+ layer.redraw();
+
+ var id, feature, backupF, backupS;
+ id = g.getStore().getAt(ri).data.id;
+
+ for (var i = 0; i < layer.features.length; i++) {
+ if (layer.features[i].data.id == id) {
+ feature = layer.features[i];
+ break;
+ }
+ }
+
+ var color = Ext.getCmp('highlightcolor_cf').getValue();
+ var symbolizer;
+
+ if (feature.attributes.featureType == GLOBAL.conf.map_feature_type_multipolygon ||
+ feature.attributes.featureType == GLOBAL.conf.map_feature_type_polygon) {
+ symbolizer = new OpenLayers.Symbolizer.Polygon({
+ 'strokeColor': color,
+ 'fillColor': color
+ });
+ }
+ else if (feature.attributes.featureType == GLOBAL.conf.map_feature_type_point) {
+ symbolizer = new OpenLayers.Symbolizer.Point({
+ 'pointRadius': 7,
+ 'fillColor': color
+ });
+ }
+
+ layer.drawFeature(feature,symbolizer);
+ }
+ }
+ }
}
]
}
@@ -2289,13 +2284,15 @@
listeners: {
'click': {
fn: function() {
- if (layer.features.length > 0) {
- locateFeatureWindow.setPagePosition(Ext.getCmp('east').x - 272, Ext.getCmp('center').y + 50);
- locateFeatureWindow.show();
- vectorLayerOptionsWindow.hide();
- }
- else {
- Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + ' </span>' + i18n_has_no_orgunits);
+ if (type != GLOBAL.conf.map_layer_type_overlay) {
+ if (layer.features.length > 0) {
+ locateFeatureWindow.setPagePosition(Ext.getCmp('east').x - 272, Ext.getCmp('center').y + 50);
+ locateFeatureWindow.show();
+ vectorLayerOptionsWindow.hide();
+ }
+ else {
+ Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + ' </span>' + i18n_has_no_orgunits);
+ }
}
}
}
@@ -2308,26 +2305,28 @@
listeners: {
'click': {
fn: function() {
- if (layer.features.length > 0) {
- if (layer.name == 'Polygon layer') {
- if (GLOBAL.vars.activePanel.isPolygon()) {
- GLOBAL.util.toggleFeatureLabels(choropleth);
- }
- else {
- Ext.message.msg(false, 'Please use <span class="x-msg-hl">Point layer</span> options');
- }
- }
- else if (layer.name == 'Point layer') {
- if (GLOBAL.vars.activePanel.isPoint()) {
- GLOBAL.util.toggleFeatureLabels(symbol);
- }
- else {
- Ext.message.msg(false, 'Please use <span class="x-msg-hl">Polygon layer</span> options');
- }
- }
- }
- else {
- Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + ' </span>' + i18n_has_no_orgunits);
+ if (type != GLOBAL.conf.map_layer_type_overlay) {
+ if (layer.features.length > 0) {
+ if (layer.name == 'Polygon layer') {
+ if (GLOBAL.vars.activePanel.isPolygon()) {
+ GLOBAL.util.toggleFeatureLabels(choropleth);
+ }
+ else {
+ Ext.message.msg(false, 'Please use <span class="x-msg-hl">Point layer</span> options');
+ }
+ }
+ else if (layer.name == 'Point layer') {
+ if (GLOBAL.vars.activePanel.isPoint()) {
+ GLOBAL.util.toggleFeatureLabels(symbol);
+ }
+ else {
+ Ext.message.msg(false, 'Please use <span class="x-msg-hl">Polygon layer</span> options');
+ }
+ }
+ }
+ else {
+ Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + ' </span>' + i18n_has_no_orgunits);
+ }
}
}
}
@@ -2433,7 +2432,7 @@
showWMSLayerOptions(GLOBAL.vars.map.getLayersByName(n.attributes.layer.name)[0]);
}
else if (n.parentNode.attributes.text == 'Overlays') {
- showVectorLayerOptions(GLOBAL.vars.map.getLayersByName(n.attributes.layer.name)[0]);
+ showVectorLayerOptions(GLOBAL.vars.map.getLayersByName(n.attributes.layer.name)[0], GLOBAL.conf.map_layer_type_overlay);
}
else if (n.isLeaf()) {
showVectorLayerOptions(GLOBAL.vars.map.getLayersByName(n.attributes.layer)[0]);
@@ -2696,7 +2695,7 @@
region: 'north',
id: 'north',
el: 'north',
- height: GLOBAL.conf.north_height
+ height: 0
}),
{
region: 'east',
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/MapFish.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/MapFish.js 2010-11-08 17:27:58 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/MapFish.js 2010-12-08 21:53:31 +0000
@@ -92,7 +92,7 @@
if(!singleFile) {
var jsfiles = new Array(
- "lang/en.js",
+ //"lang/en.js",
"core/Color.js",
"core/GeoStat.js",
"core/GeoStat/Choropleth.js",
=== removed directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img'
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_line_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_line_off.png 2009-04-17 23:00:32 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_line_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_point_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_point_off.png 2009-04-17 23:00:32 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_point_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_polygon_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_polygon_off.png 2009-04-17 23:00:32 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/draw_polygon_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_pan.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_pan.png 2009-04-17 23:00:32 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_pan.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomfull.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomfull.png 2009-04-17 23:00:32 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomfull.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomin.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomin.png 2009-04-17 23:00:32 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomin.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomout.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomout.png 2009-04-17 23:00:32 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/icon_zoomout.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/resultset_next.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/resultset_next.png 2009-04-17 23:00:32 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/resultset_next.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/resultset_previous.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/resultset_previous.png 2009-04-17 23:00:32 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/resultset_previous.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/routing-start-node.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/routing-start-node.png 2009-04-17 23:00:32 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/routing-start-node.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/routing-stop-node.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/routing-stop-node.png 2009-04-17 23:00:32 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/img/routing-stop-node.png 1970-01-01 00:00:00 +0000 differ
=== removed directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang'
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/de.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/de.js 2009-04-17 23:00:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/de.js 1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-/**
- * @requires OpenLayers/Lang/en.js
- */
-OpenLayers.Util.extend(OpenLayers.Lang.de, {
- 'mf.layertree.opacity': 'Opazität',
- 'mf.layertree.remove': 'Ausblenden',
- 'mf.print.mapTitle': 'Titel',
- 'mf.print.comment': 'Bemerkung',
- 'mf.print.loadingConfig': 'Laden der Konfiguration...',
- 'mf.print.serverDown': ' Der Druck-Systemdienst funktioniert nicht',
- 'mf.print.unableToPrint': "Unable to print",
- 'mf.print.generatingPDF': "Generierung des PDFs...",
- 'mf.print.dpi': 'DPI',
- 'mf.print.scale': 'Maßstab',
- 'mf.print.rotation': 'Rotation',
- 'mf.print.print': 'Drücken',
- 'mf.print.resetPos': 'Reset Pos.',
- 'mf.print.layout': 'Layout',
- 'mf.print.addPage': 'Seite hinzufügen',
- 'mf.print.remove': 'Seite entfernen',
- 'mf.print.clearAll': 'Alles löschen',
- 'mf.print.popupBlocked': 'Popup-Fenster blockiert werden von Ihrem Browser.<br />' +
- '<br />Verwenden Sie diese URL zum Download Ihr Dokument:',
- 'mf.print.noPage': 'Keine Seite ausgewählt, bitte auf "' + this['mf.print.addPage'] + '"-' +
- 'Button klicken um eine Seite zu hinzufügen.',
- 'mf.error': 'Fehler',
- 'mf.warning': 'Warnung',
- 'mf.information': 'Information'
-});
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/en.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/en.js 2009-04-17 23:00:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/en.js 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/**
- * @requires OpenLayers/Lang/en.js
- */
-OpenLayers.Util.extend(OpenLayers.Lang.en, {
- 'mf.layertree.opacity': 'Opacity',
- 'mf.layertree.remove': 'Remove',
- 'mf.print.mapTitle': 'Title',
- 'mf.print.comment': 'Comments',
- 'mf.print.loadingConfig': 'Loading the configuration...',
- 'mf.print.serverDown': 'The print service is not working',
- 'mf.print.unableToPrint': "Unable to print",
- 'mf.print.generatingPDF': "Generating PDF...",
- 'mf.print.dpi': 'DPI',
- 'mf.print.scale': 'Scale',
- 'mf.print.rotation': 'Rotation',
- 'mf.print.print': 'Print',
- 'mf.print.resetPos': 'Reset Pos.',
- 'mf.print.layout': 'Layout',
- 'mf.print.addPage': 'Add page',
- 'mf.print.remove': 'Remove page',
- 'mf.print.clearAll': 'Clear all',
- 'mf.print.popupBlocked': 'Popup windows are blocked by your browser.<br />' +
- '<br />Use this url to download your document:',
- 'mf.print.noPage': 'No page selected, click on the "Add page" button to add one.',
- 'mf.error': 'Error',
- 'mf.warning': 'Warning',
- 'mf.information': 'Information'
-});
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/fr.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/fr.js 2009-04-17 23:00:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/lang/fr.js 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/**
- * @requires OpenLayers/Lang/fr.js
- */
-OpenLayers.Util.extend(OpenLayers.Lang.fr, {
- 'scale': "Echelle = 1 : ${scaleDenom}",
- 'mf.layertree.opacity': 'Opacité',
- 'mf.layertree.remove': 'Supprimer',
- 'mf.print.mapTitle': 'Titre',
- 'mf.print.comment': 'Commentaires',
- 'mf.print.unableToPrint': "Impossible d'imprimer",
- 'mf.print.generatingPDF': "Génération du PDF...",
- 'mf.print.dpi': 'Résolution',
- 'mf.print.scale': 'Échelle',
- 'mf.print.rotation': 'Rotation',
- 'mf.print.print': 'Imprimer',
- 'mf.print.resetPos': 'Réinit. pos.',
- 'mf.print.layout': 'Format',
- 'mf.print.addPage': 'Ajouter page',
- 'mf.print.remove': 'Enlever page',
- 'mf.print.clearAll': 'Supprimer toutes',
- 'mf.print.popupBlocked': 'Fenêtres bloquées par votre navigateur.<br />' +
- '<br />Utilisez cette adresse pour charger votre document:',
- 'mf.print.noPage': 'Pas de page sélectionnée, appuyez sur le bouton "Ajouter page" pour en créer une.',
- 'mf.error': 'Erreur',
- 'mf.warning': 'Attention',
- 'mf.information': 'Information'
-});
=== 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 2010-12-06 15:05:09 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2010-12-08 21:53:31 +0000
@@ -897,7 +897,15 @@
labelSeparator: GLOBAL.conf.labelseparator,
emptyText: i18n_comma_separated_values,
width: GLOBAL.conf.combo_width,
- hidden: true
+ hidden: true,
+ listeners: {
+ 'change': {
+ scope: this,
+ fn: function() {
+ this.classify(false, true);
+ }
+ }
+ }
},
{
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2010-12-06 15:05:09 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2010-12-08 21:53:31 +0000
@@ -937,14 +937,7 @@
fn: function() {
this.classify(false, true);
}
- },
- 'specialkey': {
- scope: this,
- fn: function() {
- this.classify(false, true);
- }
- }
-
+ }
}
}
=== removed directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img'
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/blank.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/blank.gif 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/blank.gif 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/cloud-popup-relative.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/cloud-popup-relative.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/cloud-popup-relative.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/drag-rectangle-off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/drag-rectangle-off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/drag-rectangle-off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/drag-rectangle-on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/drag-rectangle-on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/drag-rectangle-on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/east-mini.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/east-mini.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/east-mini.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/layer-switcher-maximize.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/layer-switcher-maximize.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/layer-switcher-maximize.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/layer-switcher-minimize.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/layer-switcher-minimize.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/layer-switcher-minimize.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-blue.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-blue.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-blue.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-gold.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-gold.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-gold.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-green.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-green.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker-green.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/marker.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/measuring-stick-off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/measuring-stick-off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/measuring-stick-off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/measuring-stick-on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/measuring-stick-on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/measuring-stick-on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/north-mini.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/north-mini.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/north-mini.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/panning-hand-off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/panning-hand-off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/panning-hand-off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/panning-hand-on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/panning-hand-on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/panning-hand-on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/slider.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/slider.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/slider.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/south-mini.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/south-mini.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/south-mini.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/west-mini.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/west-mini.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/west-mini.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-minus-mini.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-minus-mini.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-minus-mini.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-plus-mini.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-plus-mini.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-plus-mini.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-world-mini.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-world-mini.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoom-world-mini.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoombar.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoombar.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/img/zoombar.png 1970-01-01 00:00:00 +0000 differ
=== removed directory 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img'
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/add_point_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/add_point_off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/add_point_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/add_point_on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/add_point_on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/add_point_on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/blank.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/blank.gif 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/blank.gif 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/close.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/close.gif 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/close.gif 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/drag-rectangle-off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/drag-rectangle-off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/drag-rectangle-off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/drag-rectangle-on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/drag-rectangle-on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/drag-rectangle-on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_line_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_line_off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_line_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_line_on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_line_on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_line_on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_point_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_point_off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_point_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_point_on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_point_on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_point_on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_polygon_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_polygon_off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_polygon_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_polygon_on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_polygon_on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/draw_polygon_on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/editing_tool_bar.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/editing_tool_bar.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/editing_tool_bar.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/move_feature_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/move_feature_off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/move_feature_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/move_feature_on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/move_feature_on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/move_feature_on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/navigation_history.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/navigation_history.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/navigation_history.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/overview_replacement.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/overview_replacement.gif 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/overview_replacement.gif 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan-panel-NOALPHA.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan-panel-NOALPHA.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan-panel-NOALPHA.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan-panel.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan-panel.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan-panel.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan_off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan_on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan_on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/pan_on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/panning-hand-off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/panning-hand-off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/panning-hand-off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/panning-hand-on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/panning-hand-on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/panning-hand-on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/remove_point_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/remove_point_off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/remove_point_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/remove_point_on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/remove_point_on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/remove_point_on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/ruler.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/ruler.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/ruler.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/save_features_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/save_features_off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/save_features_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/save_features_on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/save_features_on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/save_features_on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_next_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_next_off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_next_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_next_on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_next_on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_next_on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_previous_off.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_previous_off.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_previous_off.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_previous_on.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_previous_on.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/view_previous_on.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/zoom-panel-NOALPHA.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/zoom-panel-NOALPHA.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/zoom-panel-NOALPHA.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/zoom-panel.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/zoom-panel.png 2010-09-14 17:14:48 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/openlayers-2.10/theme/default/img/zoom-panel.png 1970-01-01 00:00:00 +0000 differ
