From 66e1b01c2d687c90f44789b46edb73dd0aeae101 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Thu, 19 Sep 2013 15:19:20 +0100 Subject: [PATCH] Use form.navbar-form for input elements in a navbar --- examples/accessible.html | 4 +--- examples/animation.html | 4 +--- examples/bind-input.html | 4 +--- examples/bing-maps.html | 4 +--- examples/brightness-contrast.html | 4 +--- examples/canvas-tiles.html | 4 +--- examples/custom-controls.html | 4 +--- examples/device-orientation.html | 4 +--- examples/drag-rotate-and-zoom.html | 4 +--- examples/epsg-4326.html | 4 +--- examples/export-map.html | 4 +--- .../full-screen-drag-rotate-and-zoom.html | 4 +--- examples/full-screen.html | 4 +--- examples/geolocation.html | 4 +--- examples/getfeatureinfo.html | 4 +--- examples/gml.html | 4 +--- examples/gpx.html | 4 +--- examples/hue-saturation.html | 4 +--- examples/icon.html | 4 +--- examples/kml-earthquakes.html | 4 +--- examples/kml-timezones.html | 4 +--- examples/kml.html | 4 +--- examples/layer-group.html | 4 +--- examples/localized-openstreetmap.html | 4 +--- examples/mapquest.html | 4 +--- examples/mouse-position.html | 4 +--- examples/moveend.html | 4 +--- examples/navigation-controls.html | 4 +--- examples/overlay.html | 4 +--- examples/popup.html | 4 +--- examples/preload.html | 4 +--- examples/rotation.html | 4 +--- examples/scale-line.html | 4 +--- examples/select-features.html | 4 +--- examples/semi-transparent-layer.html | 4 +--- examples/side-by-side.html | 4 +--- examples/simple.html | 4 +--- examples/stamen.html | 4 +--- examples/style-rules.html | 4 +--- examples/teleport.html | 4 +--- examples/ten-thousand-points.html | 4 +--- examples/tilejson.html | 4 +--- examples/topojson.html | 4 +--- examples/vector-layer.html | 4 +--- examples/wms-capabilities.html | 4 +--- examples/wms-custom-proj.html | 4 +--- examples/wms-image-custom-proj.html | 4 +--- examples/wms-image.html | 4 +--- examples/wms-no-proj.html | 4 +--- examples/wms-tiled.html | 4 +--- examples/wmts-capabilities.html | 4 +--- examples/wmts-from-capabilities.html | 4 +--- examples/wmts-ign.html | 4 +--- examples/wmts.html | 4 +--- examples/xyz-esri.html | 4 +--- examples/xyz-seturl.html | 4 +--- examples/zoomslider.html | 4 +--- resources/example-behaviour.js | 20 +++++++++---------- 58 files changed, 67 insertions(+), 181 deletions(-) diff --git a/examples/accessible.html b/examples/accessible.html index bc2a23504f..2f54c51911 100644 --- a/examples/accessible.html +++ b/examples/accessible.html @@ -20,9 +20,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/animation.html b/examples/animation.html index e10e899935..60d6f937fd 100644 --- a/examples/animation.html +++ b/examples/animation.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/bind-input.html b/examples/bind-input.html index dbeff5126d..c5015ddc7f 100644 --- a/examples/bind-input.html +++ b/examples/bind-input.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/bing-maps.html b/examples/bing-maps.html index 89fe93c46f..0b11b7e66c 100644 --- a/examples/bing-maps.html +++ b/examples/bing-maps.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/brightness-contrast.html b/examples/brightness-contrast.html index 87cd26bf7f..07b42173a5 100644 --- a/examples/brightness-contrast.html +++ b/examples/brightness-contrast.html @@ -23,9 +23,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/canvas-tiles.html b/examples/canvas-tiles.html index 778737cce5..e896536fc8 100644 --- a/examples/canvas-tiles.html +++ b/examples/canvas-tiles.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/custom-controls.html b/examples/custom-controls.html index b4a692b3f9..766941a871 100644 --- a/examples/custom-controls.html +++ b/examples/custom-controls.html @@ -51,9 +51,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/device-orientation.html b/examples/device-orientation.html index 7587536100..0fb7ba701a 100644 --- a/examples/device-orientation.html +++ b/examples/device-orientation.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/drag-rotate-and-zoom.html b/examples/drag-rotate-and-zoom.html index 2a6b59e5d2..e3c2df70d8 100644 --- a/examples/drag-rotate-and-zoom.html +++ b/examples/drag-rotate-and-zoom.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/epsg-4326.html b/examples/epsg-4326.html index dcf5051e2e..9e55b944cb 100644 --- a/examples/epsg-4326.html +++ b/examples/epsg-4326.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/export-map.html b/examples/export-map.html index 587c236862..334b02238f 100644 --- a/examples/export-map.html +++ b/examples/export-map.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/full-screen-drag-rotate-and-zoom.html b/examples/full-screen-drag-rotate-and-zoom.html index e8620521bf..84eb71902c 100644 --- a/examples/full-screen-drag-rotate-and-zoom.html +++ b/examples/full-screen-drag-rotate-and-zoom.html @@ -26,9 +26,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/full-screen.html b/examples/full-screen.html index 0f36b569e2..89af0abe72 100644 --- a/examples/full-screen.html +++ b/examples/full-screen.html @@ -26,9 +26,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/geolocation.html b/examples/geolocation.html index 5bcb480225..34553bbe60 100644 --- a/examples/geolocation.html +++ b/examples/geolocation.html @@ -24,9 +24,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/getfeatureinfo.html b/examples/getfeatureinfo.html index 092551f73e..1997d916b8 100644 --- a/examples/getfeatureinfo.html +++ b/examples/getfeatureinfo.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/gml.html b/examples/gml.html index 21c6225323..beacda13e4 100644 --- a/examples/gml.html +++ b/examples/gml.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/gpx.html b/examples/gpx.html index e5b47c32f7..cc3f23738d 100644 --- a/examples/gpx.html +++ b/examples/gpx.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/hue-saturation.html b/examples/hue-saturation.html index aa56f33911..c1c1967025 100644 --- a/examples/hue-saturation.html +++ b/examples/hue-saturation.html @@ -23,9 +23,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/icon.html b/examples/icon.html index d28c21fd54..de344d6861 100644 --- a/examples/icon.html +++ b/examples/icon.html @@ -23,9 +23,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/kml-earthquakes.html b/examples/kml-earthquakes.html index 917216c65a..0b0f2696fa 100644 --- a/examples/kml-earthquakes.html +++ b/examples/kml-earthquakes.html @@ -36,9 +36,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/kml-timezones.html b/examples/kml-timezones.html index 55895b62e8..39f134ac00 100644 --- a/examples/kml-timezones.html +++ b/examples/kml-timezones.html @@ -26,9 +26,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/kml.html b/examples/kml.html index db1cbc0955..6bca94260b 100644 --- a/examples/kml.html +++ b/examples/kml.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/layer-group.html b/examples/layer-group.html index ead2482819..867adcfe45 100644 --- a/examples/layer-group.html +++ b/examples/layer-group.html @@ -19,9 +19,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/localized-openstreetmap.html b/examples/localized-openstreetmap.html index 3b45f0882d..a3ad06d944 100644 --- a/examples/localized-openstreetmap.html +++ b/examples/localized-openstreetmap.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/mapquest.html b/examples/mapquest.html index acdcc2a9a6..3fbfe48a25 100644 --- a/examples/mapquest.html +++ b/examples/mapquest.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/mouse-position.html b/examples/mouse-position.html index b79ca8984d..592993e894 100644 --- a/examples/mouse-position.html +++ b/examples/mouse-position.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/moveend.html b/examples/moveend.html index 0aec5863e6..4f4aa41283 100644 --- a/examples/moveend.html +++ b/examples/moveend.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/navigation-controls.html b/examples/navigation-controls.html index d43d69b65c..feb153769f 100644 --- a/examples/navigation-controls.html +++ b/examples/navigation-controls.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/overlay.html b/examples/overlay.html index df37c2b678..9926ee14d2 100644 --- a/examples/overlay.html +++ b/examples/overlay.html @@ -27,9 +27,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/popup.html b/examples/popup.html index beb12de38c..1ba3e11cfa 100644 --- a/examples/popup.html +++ b/examples/popup.html @@ -60,9 +60,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/preload.html b/examples/preload.html index d9dc6c3865..21d4635836 100644 --- a/examples/preload.html +++ b/examples/preload.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/rotation.html b/examples/rotation.html index b5f101d0ad..bc60f6ab97 100644 --- a/examples/rotation.html +++ b/examples/rotation.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/scale-line.html b/examples/scale-line.html index 6a2ac62b81..ecd7f02139 100644 --- a/examples/scale-line.html +++ b/examples/scale-line.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/select-features.html b/examples/select-features.html index 59e3dee7eb..1043e1097d 100644 --- a/examples/select-features.html +++ b/examples/select-features.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/semi-transparent-layer.html b/examples/semi-transparent-layer.html index 072b946ef8..758049c493 100644 --- a/examples/semi-transparent-layer.html +++ b/examples/semi-transparent-layer.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/side-by-side.html b/examples/side-by-side.html index a43873e70a..87eb439c87 100644 --- a/examples/side-by-side.html +++ b/examples/side-by-side.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/simple.html b/examples/simple.html index 5ef77daed0..f6c42a8e41 100644 --- a/examples/simple.html +++ b/examples/simple.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/stamen.html b/examples/stamen.html index d1781b575e..9ccd3967e8 100644 --- a/examples/stamen.html +++ b/examples/stamen.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/style-rules.html b/examples/style-rules.html index 743e55b45b..88f05e077c 100644 --- a/examples/style-rules.html +++ b/examples/style-rules.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/teleport.html b/examples/teleport.html index 1d60785214..94942df3f2 100644 --- a/examples/teleport.html +++ b/examples/teleport.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/ten-thousand-points.html b/examples/ten-thousand-points.html index 588be7b022..e65352fef5 100644 --- a/examples/ten-thousand-points.html +++ b/examples/ten-thousand-points.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/tilejson.html b/examples/tilejson.html index 70405ebeb0..e332722538 100644 --- a/examples/tilejson.html +++ b/examples/tilejson.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/topojson.html b/examples/topojson.html index f9b79e18f0..d71a38c331 100644 --- a/examples/topojson.html +++ b/examples/topojson.html @@ -14,9 +14,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/vector-layer.html b/examples/vector-layer.html index d6de2cf0a3..4695f80f48 100644 --- a/examples/vector-layer.html +++ b/examples/vector-layer.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/wms-capabilities.html b/examples/wms-capabilities.html index 01ef7e17e4..1636862845 100644 --- a/examples/wms-capabilities.html +++ b/examples/wms-capabilities.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/wms-custom-proj.html b/examples/wms-custom-proj.html index eb76160029..96ff5ba530 100644 --- a/examples/wms-custom-proj.html +++ b/examples/wms-custom-proj.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/wms-image-custom-proj.html b/examples/wms-image-custom-proj.html index e7d921bf37..86d46b7df4 100644 --- a/examples/wms-image-custom-proj.html +++ b/examples/wms-image-custom-proj.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/wms-image.html b/examples/wms-image.html index 63cc50c88f..b6e6f327a2 100644 --- a/examples/wms-image.html +++ b/examples/wms-image.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/wms-no-proj.html b/examples/wms-no-proj.html index 93434c1678..e76dcdfd16 100644 --- a/examples/wms-no-proj.html +++ b/examples/wms-no-proj.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/wms-tiled.html b/examples/wms-tiled.html index 49e92f5656..35da401567 100644 --- a/examples/wms-tiled.html +++ b/examples/wms-tiled.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/wmts-capabilities.html b/examples/wmts-capabilities.html index 271d05e50d..0d379cb167 100644 --- a/examples/wmts-capabilities.html +++ b/examples/wmts-capabilities.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/wmts-from-capabilities.html b/examples/wmts-from-capabilities.html index 81f746edb9..bd7b62b13a 100644 --- a/examples/wmts-from-capabilities.html +++ b/examples/wmts-from-capabilities.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/wmts-ign.html b/examples/wmts-ign.html index 5683be1d63..34b47828e6 100644 --- a/examples/wmts-ign.html +++ b/examples/wmts-ign.html @@ -20,9 +20,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/wmts.html b/examples/wmts.html index db722f45d5..1f67aba491 100644 --- a/examples/wmts.html +++ b/examples/wmts.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/xyz-esri.html b/examples/xyz-esri.html index 59d95e2fbe..f7bedfb982 100644 --- a/examples/xyz-esri.html +++ b/examples/xyz-esri.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/xyz-seturl.html b/examples/xyz-seturl.html index 1b09fd9618..31c8a92e03 100644 --- a/examples/xyz-seturl.html +++ b/examples/xyz-seturl.html @@ -15,9 +15,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/examples/zoomslider.html b/examples/zoomslider.html index e74cd49392..77c47723d8 100644 --- a/examples/zoomslider.html +++ b/examples/zoomslider.html @@ -67,9 +67,7 @@
- OpenLayers 3 Examples -
    -
+ OpenLayers 3 Examples
diff --git a/resources/example-behaviour.js b/resources/example-behaviour.js index 4922b8bbf5..3a66e8ae6b 100644 --- a/resources/example-behaviour.js +++ b/resources/example-behaviour.js @@ -1,7 +1,6 @@ -;(function(){ - var container = document.querySelector('.navbar ul.pull-right'), - li = document.createElement('li'), - div = document.createElement('div'), +;(function() { + var container = document.querySelector('.navbar .navbar-inner .container'), + form = document.createElement('form'), select = document.createElement('select'), possibleModes = { 'raw' : 'Development', @@ -35,6 +34,9 @@ } pairs.push(adjusted); } + if (pairs.length === 0) { + pairs[0] = 'mode=' + encodeURIComponent(newMode); + } location.href = baseUrl + '?' + pairs.join('&'); }; @@ -52,10 +54,8 @@ select.addEventListener('change', modeChangedMethod); select.className = 'input-medium'; - div.className = 'input-prepend'; - div.innerHTML = ''; - div.appendChild(select); + form.className = 'navbar-form pull-right'; + form.appendChild(select); - li.appendChild(div); - container.appendChild(li); -})(); \ No newline at end of file + container.appendChild(form); +})();