From: Tom Hughes <tom@compton.nu>
Date: Wed, 20 Jun 2007 00:06:02 +0000 (+0000)
Subject: Add missing CSS and image resources from OpenLayers 2.4 release and
X-Git-Tag: live~8401
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e9d3d4d19bcdf91732db57ecaa8d4831c7f585a3

Add missing CSS and image resources from OpenLayers 2.4 release and
reorganise things to keep OpenLayers stuff together.
---

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 35b913979..bb730c448 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -45,7 +45,7 @@
   <%end%>
 
 </script>
-<script type="text/javascript" src="/javascripts/OpenLayers.js"></script>
+<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 
 <script type="text/javascript">
   <!--
@@ -55,7 +55,7 @@
   function init(){
 
     OpenLayers.Util.onImageLoadError = function() {
-      this.src = "http://www.openstreetmap.org/javascripts/img/404.png";
+      this.src = OpenLayers.Util.getImagesLocation + "404.png";
     }
     map = new OpenLayers.Map( "map", 
         {maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34), numZoomLevels:19, maxResolution:156543, units:'meters', projection: "EPSG:41001"} );
@@ -74,6 +74,7 @@
     markers.addMarker(marker);
     <%end%>
 
+    map.setOptions({theme:''});
     map.addControl(new OpenLayers.Control.LayerSwitcher());
     map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
 
diff --git a/public/img/drag-rectangle-off.png b/public/img/drag-rectangle-off.png
deleted file mode 100644
index 620942b87..000000000
Binary files a/public/img/drag-rectangle-off.png and /dev/null differ
diff --git a/public/img/drag-rectangle-on.png b/public/img/drag-rectangle-on.png
deleted file mode 100644
index 236cb75a8..000000000
Binary files a/public/img/drag-rectangle-on.png and /dev/null differ
diff --git a/public/javascripts/img/east-mini.png b/public/javascripts/img/east-mini.png
deleted file mode 100644
index 0707567a7..000000000
Binary files a/public/javascripts/img/east-mini.png and /dev/null differ
diff --git a/public/javascripts/img/marker-blue.png b/public/javascripts/img/marker-blue.png
deleted file mode 100644
index 0bac8c049..000000000
Binary files a/public/javascripts/img/marker-blue.png and /dev/null differ
diff --git a/public/javascripts/img/marker-green.png b/public/javascripts/img/marker-green.png
deleted file mode 100644
index c91ccbe4a..000000000
Binary files a/public/javascripts/img/marker-green.png and /dev/null differ
diff --git a/public/javascripts/img/marker-yellow.png b/public/javascripts/img/marker-yellow.png
deleted file mode 100644
index 724e2c030..000000000
Binary files a/public/javascripts/img/marker-yellow.png and /dev/null differ
diff --git a/public/javascripts/img/marker.png b/public/javascripts/img/marker.png
deleted file mode 100644
index ccd191367..000000000
Binary files a/public/javascripts/img/marker.png and /dev/null differ
diff --git a/public/javascripts/img/measuring-stick-off.png b/public/javascripts/img/measuring-stick-off.png
deleted file mode 100644
index 70c2dffb1..000000000
Binary files a/public/javascripts/img/measuring-stick-off.png and /dev/null differ
diff --git a/public/javascripts/img/measuring-stick-on.png b/public/javascripts/img/measuring-stick-on.png
deleted file mode 100644
index cdb8f345b..000000000
Binary files a/public/javascripts/img/measuring-stick-on.png and /dev/null differ
diff --git a/public/javascripts/img/north-mini.png b/public/javascripts/img/north-mini.png
deleted file mode 100644
index a8a0b4033..000000000
Binary files a/public/javascripts/img/north-mini.png and /dev/null differ
diff --git a/public/javascripts/img/slider.png b/public/javascripts/img/slider.png
deleted file mode 100644
index 23afd573b..000000000
Binary files a/public/javascripts/img/slider.png and /dev/null differ
diff --git a/public/javascripts/img/south-mini.png b/public/javascripts/img/south-mini.png
deleted file mode 100644
index 6c4ac8a0f..000000000
Binary files a/public/javascripts/img/south-mini.png and /dev/null differ
diff --git a/public/javascripts/img/west-mini.png b/public/javascripts/img/west-mini.png
deleted file mode 100644
index db5f420ca..000000000
Binary files a/public/javascripts/img/west-mini.png and /dev/null differ
diff --git a/public/javascripts/img/zoom-minus-mini.png b/public/javascripts/img/zoom-minus-mini.png
deleted file mode 100644
index f9b63aba0..000000000
Binary files a/public/javascripts/img/zoom-minus-mini.png and /dev/null differ
diff --git a/public/javascripts/img/zoom-plus-mini.png b/public/javascripts/img/zoom-plus-mini.png
deleted file mode 100644
index eecf2eb4b..000000000
Binary files a/public/javascripts/img/zoom-plus-mini.png and /dev/null differ
diff --git a/public/javascripts/img/zoom-world-mini.png b/public/javascripts/img/zoom-world-mini.png
deleted file mode 100644
index 2159dde7b..000000000
Binary files a/public/javascripts/img/zoom-world-mini.png and /dev/null differ
diff --git a/public/javascripts/img/zoombar.png b/public/javascripts/img/zoombar.png
deleted file mode 100644
index 959f01a93..000000000
Binary files a/public/javascripts/img/zoombar.png and /dev/null differ
diff --git a/public/javascripts/OpenLayers.js b/public/openlayers/OpenLayers.js
similarity index 100%
rename from public/javascripts/OpenLayers.js
rename to public/openlayers/OpenLayers.js
diff --git a/public/javascripts/img/404.png b/public/openlayers/img/404.png
similarity index 100%
rename from public/javascripts/img/404.png
rename to public/openlayers/img/404.png
diff --git a/public/openlayers/img/blank.gif b/public/openlayers/img/blank.gif
new file mode 100644
index 000000000..4bcc753a1
Binary files /dev/null and b/public/openlayers/img/blank.gif differ
diff --git a/public/openlayers/img/close.gif b/public/openlayers/img/close.gif
new file mode 100644
index 000000000..a8958de9b
Binary files /dev/null and b/public/openlayers/img/close.gif differ
diff --git a/public/javascripts/img/drag-rectangle-off.png b/public/openlayers/img/drag-rectangle-off.png
similarity index 100%
rename from public/javascripts/img/drag-rectangle-off.png
rename to public/openlayers/img/drag-rectangle-off.png
diff --git a/public/javascripts/img/drag-rectangle-on.png b/public/openlayers/img/drag-rectangle-on.png
similarity index 100%
rename from public/javascripts/img/drag-rectangle-on.png
rename to public/openlayers/img/drag-rectangle-on.png
diff --git a/public/img/east-mini.png b/public/openlayers/img/east-mini.png
similarity index 100%
rename from public/img/east-mini.png
rename to public/openlayers/img/east-mini.png
diff --git a/public/javascripts/img/layer-switcher-maximize.png b/public/openlayers/img/layer-switcher-maximize.png
similarity index 100%
rename from public/javascripts/img/layer-switcher-maximize.png
rename to public/openlayers/img/layer-switcher-maximize.png
diff --git a/public/javascripts/img/layer-switcher-minimize.png b/public/openlayers/img/layer-switcher-minimize.png
similarity index 100%
rename from public/javascripts/img/layer-switcher-minimize.png
rename to public/openlayers/img/layer-switcher-minimize.png
diff --git a/public/openlayers/img/marker-blue.png b/public/openlayers/img/marker-blue.png
new file mode 100644
index 000000000..83a90b4c8
Binary files /dev/null and b/public/openlayers/img/marker-blue.png differ
diff --git a/public/openlayers/img/marker-gold.png b/public/openlayers/img/marker-gold.png
new file mode 100644
index 000000000..2ff9ec528
Binary files /dev/null and b/public/openlayers/img/marker-gold.png differ
diff --git a/public/openlayers/img/marker-green.png b/public/openlayers/img/marker-green.png
new file mode 100644
index 000000000..17168f1b9
Binary files /dev/null and b/public/openlayers/img/marker-green.png differ
diff --git a/public/img/marker.png b/public/openlayers/img/marker.png
similarity index 100%
rename from public/img/marker.png
rename to public/openlayers/img/marker.png
diff --git a/public/img/measuring-stick-off.png b/public/openlayers/img/measuring-stick-off.png
similarity index 100%
rename from public/img/measuring-stick-off.png
rename to public/openlayers/img/measuring-stick-off.png
diff --git a/public/img/measuring-stick-on.png b/public/openlayers/img/measuring-stick-on.png
similarity index 100%
rename from public/img/measuring-stick-on.png
rename to public/openlayers/img/measuring-stick-on.png
diff --git a/public/img/north-mini.png b/public/openlayers/img/north-mini.png
similarity index 100%
rename from public/img/north-mini.png
rename to public/openlayers/img/north-mini.png
diff --git a/public/img/panning-hand-off.png b/public/openlayers/img/panning-hand-off.png
similarity index 100%
rename from public/img/panning-hand-off.png
rename to public/openlayers/img/panning-hand-off.png
diff --git a/public/img/panning-hand-on.png b/public/openlayers/img/panning-hand-on.png
similarity index 100%
rename from public/img/panning-hand-on.png
rename to public/openlayers/img/panning-hand-on.png
diff --git a/public/img/slider.png b/public/openlayers/img/slider.png
similarity index 100%
rename from public/img/slider.png
rename to public/openlayers/img/slider.png
diff --git a/public/img/south-mini.png b/public/openlayers/img/south-mini.png
similarity index 100%
rename from public/img/south-mini.png
rename to public/openlayers/img/south-mini.png
diff --git a/public/img/west-mini.png b/public/openlayers/img/west-mini.png
similarity index 100%
rename from public/img/west-mini.png
rename to public/openlayers/img/west-mini.png
diff --git a/public/img/zoom-minus-mini.png b/public/openlayers/img/zoom-minus-mini.png
similarity index 100%
rename from public/img/zoom-minus-mini.png
rename to public/openlayers/img/zoom-minus-mini.png
diff --git a/public/img/zoom-plus-mini.png b/public/openlayers/img/zoom-plus-mini.png
similarity index 100%
rename from public/img/zoom-plus-mini.png
rename to public/openlayers/img/zoom-plus-mini.png
diff --git a/public/img/zoom-world-mini.png b/public/openlayers/img/zoom-world-mini.png
similarity index 100%
rename from public/img/zoom-world-mini.png
rename to public/openlayers/img/zoom-world-mini.png
diff --git a/public/img/zoombar.png b/public/openlayers/img/zoombar.png
similarity index 100%
rename from public/img/zoombar.png
rename to public/openlayers/img/zoombar.png
diff --git a/public/openlayers/theme/default/img/add_point_off.png b/public/openlayers/theme/default/img/add_point_off.png
new file mode 100644
index 000000000..aefd09cf3
Binary files /dev/null and b/public/openlayers/theme/default/img/add_point_off.png differ
diff --git a/public/openlayers/theme/default/img/add_point_on.png b/public/openlayers/theme/default/img/add_point_on.png
new file mode 100644
index 000000000..1294a2c16
Binary files /dev/null and b/public/openlayers/theme/default/img/add_point_on.png differ
diff --git a/public/openlayers/theme/default/img/drag-rectangle-off.png b/public/openlayers/theme/default/img/drag-rectangle-off.png
new file mode 100644
index 000000000..fc6daf4dc
Binary files /dev/null and b/public/openlayers/theme/default/img/drag-rectangle-off.png differ
diff --git a/public/openlayers/theme/default/img/drag-rectangle-on.png b/public/openlayers/theme/default/img/drag-rectangle-on.png
new file mode 100644
index 000000000..7f783ce13
Binary files /dev/null and b/public/openlayers/theme/default/img/drag-rectangle-on.png differ
diff --git a/public/openlayers/theme/default/img/draw_line_off.png b/public/openlayers/theme/default/img/draw_line_off.png
new file mode 100644
index 000000000..7f1561254
Binary files /dev/null and b/public/openlayers/theme/default/img/draw_line_off.png differ
diff --git a/public/openlayers/theme/default/img/draw_line_on.png b/public/openlayers/theme/default/img/draw_line_on.png
new file mode 100644
index 000000000..ba09186c7
Binary files /dev/null and b/public/openlayers/theme/default/img/draw_line_on.png differ
diff --git a/public/openlayers/theme/default/img/draw_point_off.png b/public/openlayers/theme/default/img/draw_point_off.png
new file mode 100644
index 000000000..fde94bde2
Binary files /dev/null and b/public/openlayers/theme/default/img/draw_point_off.png differ
diff --git a/public/openlayers/theme/default/img/draw_point_on.png b/public/openlayers/theme/default/img/draw_point_on.png
new file mode 100644
index 000000000..880422185
Binary files /dev/null and b/public/openlayers/theme/default/img/draw_point_on.png differ
diff --git a/public/openlayers/theme/default/img/draw_polygon_off.png b/public/openlayers/theme/default/img/draw_polygon_off.png
new file mode 100644
index 000000000..53ce9d786
Binary files /dev/null and b/public/openlayers/theme/default/img/draw_polygon_off.png differ
diff --git a/public/openlayers/theme/default/img/draw_polygon_on.png b/public/openlayers/theme/default/img/draw_polygon_on.png
new file mode 100644
index 000000000..2a3337614
Binary files /dev/null and b/public/openlayers/theme/default/img/draw_polygon_on.png differ
diff --git a/public/openlayers/theme/default/img/move_feature_off.png b/public/openlayers/theme/default/img/move_feature_off.png
new file mode 100644
index 000000000..9f588dbb2
Binary files /dev/null and b/public/openlayers/theme/default/img/move_feature_off.png differ
diff --git a/public/openlayers/theme/default/img/move_feature_on.png b/public/openlayers/theme/default/img/move_feature_on.png
new file mode 100644
index 000000000..072f066c3
Binary files /dev/null and b/public/openlayers/theme/default/img/move_feature_on.png differ
diff --git a/public/openlayers/theme/default/img/pan_off.png b/public/openlayers/theme/default/img/pan_off.png
new file mode 100644
index 000000000..30b2aed4d
Binary files /dev/null and b/public/openlayers/theme/default/img/pan_off.png differ
diff --git a/public/openlayers/theme/default/img/pan_on.png b/public/openlayers/theme/default/img/pan_on.png
new file mode 100644
index 000000000..d73e7ddd7
Binary files /dev/null and b/public/openlayers/theme/default/img/pan_on.png differ
diff --git a/public/javascripts/img/panning-hand-off.png b/public/openlayers/theme/default/img/panning-hand-off.png
similarity index 100%
rename from public/javascripts/img/panning-hand-off.png
rename to public/openlayers/theme/default/img/panning-hand-off.png
diff --git a/public/javascripts/img/panning-hand-on.png b/public/openlayers/theme/default/img/panning-hand-on.png
similarity index 100%
rename from public/javascripts/img/panning-hand-on.png
rename to public/openlayers/theme/default/img/panning-hand-on.png
diff --git a/public/openlayers/theme/default/img/remove_point_off.png b/public/openlayers/theme/default/img/remove_point_off.png
new file mode 100644
index 000000000..76c8606f5
Binary files /dev/null and b/public/openlayers/theme/default/img/remove_point_off.png differ
diff --git a/public/openlayers/theme/default/img/remove_point_on.png b/public/openlayers/theme/default/img/remove_point_on.png
new file mode 100644
index 000000000..0ff28fc71
Binary files /dev/null and b/public/openlayers/theme/default/img/remove_point_on.png differ
diff --git a/public/openlayers/theme/default/style.css b/public/openlayers/theme/default/style.css
new file mode 100644
index 000000000..ba75a09da
--- /dev/null
+++ b/public/openlayers/theme/default/style.css
@@ -0,0 +1,150 @@
+div.olMapViewport {
+   -moz-user-select: none 
+}
+
+.olLayerGoogleCopyright {
+    left: 2px;
+    bottom: 2px;  
+}
+.olLayerGooglePoweredBy {
+    left: 2px;
+    bottom: 15px;   
+}
+
+.olControlScale {
+    right: 3px;
+    bottom: 3em;
+    display: block;
+    position: absolute;
+}
+.olControlPermalink {
+    right: 3px;
+    bottom: 1.5em;
+    display: block;
+    position: absolute;
+} 
+
+div.olControlMousePosition {
+    bottom: 0em;
+    right: 3px;
+    display: block;
+    position: absolute;
+    font-family: Arial;
+    font-size: smaller;
+}
+
+.olControlOverviewMapContainer {
+    position: absolute;
+    bottom: 0px;
+    right: 0px;
+}
+
+.olControlOverviewMapElement {
+    padding: 10px 18px 10px 10px;
+    background-color: #00008B;
+    -moz-border-radius: 1em 0 0 0;
+}
+
+.olControlOverviewMapMinimizeButton {
+    right: 0px;
+    bottom: 80px;
+}    
+
+.olControlOverviewMapMaximizeButton {
+    right: 0px;
+    bottom: 80px;
+}
+
+.olControlOverviewMapExtentRectangle {
+   cursor: move;
+    border: 2px dotted red;
+}
+.olLayerGeoRSSDescription {
+    float:left;
+    width:100%;
+    overflow:auto;
+    font-size:1.0em;
+}
+.olLayerGeoRSSClose {
+    float:right;
+    color:gray;
+    font-size:1.2em;
+    font-family:sans-serif;
+}
+.olLayerGeoRSSTitle {
+    float:left;font-size:1.2em;
+}
+
+.olPopupContent {
+    padding:5px;
+}    
+.olControlNavToolbar div { 
+  display:block;
+  width:  28px;
+  height: 28px;
+  top: 300px;
+  left: 6px;
+  position: relative;
+}
+
+.olControlNavToolbar .olControlNavigationItemActive { 
+  background-image: url("img/panning-hand-on.png");
+  background-repeat: no-repeat;
+}
+.olControlNavToolbar .olControlNavigationItemInactive { 
+  background-image: url("img/panning-hand-off.png");
+  background-repeat: no-repeat;
+}
+.olControlNavToolbar .olControlZoomBoxItemActive { 
+  background-image: url("img/drag-rectangle-on.png");
+  background-color: orange;
+  background-repeat: no-repeat;
+}
+.olControlNavToolbar .olControlZoomBoxItemInactive { 
+  background-image: url("img/drag-rectangle-off.png");
+  background-repeat: no-repeat;
+}
+.olControlEditingToolbar  {
+    float:right;
+    right: 0px;
+    height: 30px; 
+    width: 200px;
+}
+.olControlEditingToolbar div { 
+  float:right;
+  width:  24px;
+  height: 24px;
+  margin: 5px;
+}
+.olControlEditingToolbar .olControlNavigationItemActive { 
+  background-image: url("img/pan_on.png");
+  background-repeat: no-repeat;
+}
+.olControlEditingToolbar .olControlNavigationItemInactive { 
+  background-image: url("img/pan_off.png");
+  background-repeat: no-repeat;
+}
+.olControlEditingToolbar .olControlDrawFeaturePointItemActive { 
+  background-image: url("img/draw_point_on.png");
+  background-repeat: no-repeat;
+}
+.olControlEditingToolbar .olControlDrawFeaturePointItemInactive { 
+  background-image: url("img/draw_point_off.png");
+  background-repeat: no-repeat;
+}
+.olControlEditingToolbar .olControlDrawFeaturePathItemInactive { 
+  background-image: url("img/draw_line_off.png");
+  background-repeat: no-repeat;
+}
+.olControlEditingToolbar .olControlDrawFeaturePathItemActive { 
+  background-image: url("img/draw_line_on.png");
+  background-repeat: no-repeat;
+}
+.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive { 
+  background-image: url("img/draw_polygon_off.png");
+  background-repeat: no-repeat;
+}
+.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive { 
+  background-image: url("img/draw_polygon_on.png");
+  background-repeat: no-repeat;
+}