proposition de style pour la recherche d'adresse

panorama/static/panorama/css/celutz.css

@@ -465,3 +465,6 @@ select {
     margin-bottom:9px;
     margin-top:9px;
 }
+.search-btn {
+    border: none; !important
+}

panorama/templates/panorama/base.html

@@ -45,10 +45,8 @@
                 {% endblock top-menu-pano-items %}
             </ul>
             <ul class="nav navbar-right top-nav">
-                <li>
-                    <input type="text" name="search" id="search" placeholder="22 rue des violettes, grenoble" class="form-control" />
-                    <span id="search-btn" class="btn btn-primary btn-sm" data-loading-text="..."><i class="fa fa-search"></i></span>
-                </li>
+                {% block top-menu-items %}
+                {% endblock top-menu-items %}
                 <li>
                     <a href="/admin"><i class="fa fa-pencil-square-o"></i>  {% trans "Admin" %}</a>
                 </li>
@@ -85,20 +83,6 @@
         {% block content %}{% endblock content %}
         </div>
     </div>
-<!-- MODAL -->
-    <div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Resultats" aria-hidden="true">
-      <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Fermer</span></button>
-            <h4 class="modal-title" id="myModalLabel">Résultats</h4>
-          </div>
-          <div class="modal-body">
-          </div>
-        </div>
-      </div>
-    </div>
-<!-- enmodal -->
     {% block js %}
     {% endblock js %}
 

panorama/templates/panorama/main.html

@@ -13,6 +13,19 @@
 {% endblock %}
 
 {% block top-menu-items %}
+    <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-search"></i>  {% trans "Search" %}<b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li>
+                <div style="display:table;" class="input-group">
+                    <input type="text" name="search" id="search" placeholder={% trans "Enter an address" %} class="form-control" />
+                    <span class="input-group-btn">
+                        <span type="button" id="search-btn" class="btn btn-primary search-btn" data-loading-text="..."><i class="fa fa-search"></i></span>
+                    </span>
+                </div>
+            </li>
+        </ul>
+    </li>
 {% endblock %}
 
 {% block sidebar %}
@@ -32,6 +45,18 @@
 
 {% block content %}
     <div id="map"></div>
+    <div id="modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Resultats" aria-hidden="true">
+      <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Fermer</span></button>
+            <h4 class="modal-title" id="myModalLabel">Résultats</h4>
+          </div>
+          <div class="modal-body">
+          </div>
+        </div>
+      </div>
+    </div>
 {% endblock content %}
 
 {% block css %}
@@ -222,4 +247,5 @@
         accordionMenus(); 
     </script>
 {% endlocalize %}
+
 {% endblock js %}