Use form.navbar-form for input elements in a navbar

examples/accessible.html

@@ -21,8 +21,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/animation.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/bind-input.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/bing-maps.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/brightness-contrast.html

@@ -24,8 +24,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/canvas-tiles.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/custom-controls.html

@@ -52,8 +52,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/device-orientation.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/drag-rotate-and-zoom.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/epsg-4326.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/export-map.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/full-screen-drag-rotate-and-zoom.html

@@ -27,8 +27,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/full-screen.html

@@ -27,8 +27,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/geolocation.html

@@ -25,8 +25,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/getfeatureinfo.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/gml.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/gpx.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/hue-saturation.html

@@ -24,8 +24,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/icon.html

@@ -24,8 +24,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/kml-earthquakes.html

@@ -37,8 +37,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/kml-timezones.html

@@ -27,8 +27,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/kml.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/layer-group.html

@@ -20,8 +20,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/localized-openstreetmap.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/mapquest.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/mouse-position.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/moveend.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/navigation-controls.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/overlay.html

@@ -28,8 +28,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/popup.html

@@ -61,8 +61,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/preload.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/rotation.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/scale-line.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/select-features.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/semi-transparent-layer.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/side-by-side.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/simple.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/stamen.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/style-rules.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/teleport.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/ten-thousand-points.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="example-list.html">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/tilejson.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/topojson.html

@@ -15,8 +15,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/vector-layer.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/wms-capabilities.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/wms-custom-proj.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/wms-image-custom-proj.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/wms-image.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/wms-no-proj.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/wms-tiled.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/wmts-capabilities.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/wmts-from-capabilities.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/wmts-ign.html

@@ -21,8 +21,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/wmts.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/xyz-esri.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/xyz-seturl.html

@@ -16,8 +16,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

examples/zoomslider.html

@@ -68,8 +68,6 @@
       <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="./">OpenLayers 3 Examples</a>          
-          <ul class="nav pull-right">
-          </ul>
         </div>
       </div>
     </div>

resources/example-behaviour.js

@@ -1,7 +1,6 @@
-;(function(){
+;(function() {
-  var container = document.querySelector('.navbar ul.pull-right'),
+  var container = document.querySelector('.navbar .navbar-inner .container'),
-      li = document.createElement('li'),
+      form = document.createElement('form'),
-      div = document.createElement('div'),
       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';
+  form.className = 'navbar-form pull-right';
-  div.innerHTML = '<span class="add-on"><i class="icon-refresh"></i></span>';
+  form.appendChild(select);
-  div.appendChild(select);
 
-  li.appendChild(div);
+  container.appendChild(form);
-  container.appendChild(li);
 })();