Parcourir la source

changement d'icônes dans les sidebars + liste de résultats des panoramas voyant un point dans sidebar

julpec il y a 8 ans
Parent
commit
8af1b6d435

+ 11 - 0
panorama/static/panorama/css/celutz.css

@@ -333,3 +333,14 @@ select {
 #id_reference_point option {
 #id_reference_point option {
     padding: 0px 4px;
     padding: 0px 4px;
 }
 }
+.pano-result-list {
+    padding: 5px 15px 5px 38px !important;
+}
+.pano-result-list p {
+    margin: 0 0 0 10px;
+    padding-left: 10px;
+    font-size: 11px;
+}
+.fa-map-marker::before {
+    font-size: 20px;
+}

+ 2 - 2
panorama/templates/panorama/sidebar-all.html

@@ -11,7 +11,7 @@
             </ul>
             </ul>
         </li>
         </li>
         <li>
         <li>
-            <a href="javascript:;" data-toggle="collapse" data-target="#locate-existing"><i class="fa fa-fw fa-location-arrow"></i> {% trans "Locate existing point" %}<i class="fa fa-fw fa-caret-down"></i></a>
+            <a href="javascript:;" data-toggle="collapse" data-target="#locate-existing"><i class="fa fa-fw fa-circle-thin"></i> {% trans "Locate existing point" %}<i class="fa fa-fw fa-caret-down"></i></a>
             <ul id="locate-existing" class="collapse">
             <ul id="locate-existing" class="collapse">
                 <li>
                 <li>
                     <form action="{% url 'panorama:locate_refpoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
                     <form action="{% url 'panorama:locate_refpoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
@@ -22,7 +22,7 @@
             </ul>
             </ul>
         </li>
         </li>
         <li>
         <li>
-            <a id="locate-gps-btn" href="javascript:;" data-toggle="collapse" data-target="#locate-gps"><i class="fa fa-fw fa-circle-thin"></i> {% trans "Locate GPS point" %}<i class="fa fa-fw fa-caret-down"></i></a>
+            <a id="locate-gps-btn" href="javascript:;" data-toggle="collapse" data-target="#locate-gps"><i class="fa fa-fw fa-map-marker"></i> {% trans "Locate GPS point" %}<i class="fa fa-fw fa-caret-down"></i></a>
             <ul id="locate-gps" class="collapse">
             <ul id="locate-gps" class="collapse">
                 <li>
                 <li>
                     <form action="{% url 'panorama:locate_custompoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
                     <form action="{% url 'panorama:locate_custompoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}

+ 21 - 0
panorama/templates/panorama/sidebar-simple.html

@@ -1,4 +1,6 @@
 {% load i18n %}
 {% load i18n %}
+{% load panorama_url %}
+{% load distance_filter %}
         <li>
         <li>
             <a href="{% url 'panorama:main' %}"><i class="fa fa-fw fa-home"></i> {% trans "Map" %}</a>
             <a href="{% url 'panorama:main' %}"><i class="fa fa-fw fa-home"></i> {% trans "Map" %}</a>
         </li>
         </li>
@@ -10,4 +12,23 @@
               {% endfor %}
               {% endfor %}
             </ul>
             </ul>
         </li>
         </li>
+        <li>
+            <a href="javascript:;" data-toggle="collapse" data-target="#locate-existing"><i class="fa fa-fw fa-circle-thin"></i> {% trans "Locate existing point" %}<i class="fa fa-fw fa-caret-down"></i></a>
+            <ul id="locate-existing" class="collapse">
+                <li>
+                    <form action="{% url 'panorama:locate_refpoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
+                      {{ refpoints_form.as_p }}
+                      <input type="submit" class="btn btn-primary btn-sm" value={% trans "Locate" %} />
+                    </form>
+                </li>
+            </ul>
+        </li>
+        <li>
+            <a href="#"><i class="fa fa-fw fa-eye"></i> {% trans "Panoramas seeing this point" %}</a>
+            <ul>
+              {% for panorama, distance, bearing, elevation in located_panoramas %}
+              <li><a href="{% panorama_url panorama bearing elevation %}" class="pano-result-list"><i class="fa fa-fw fa-map-marker"></i> {{ panorama.name }}<p>({% trans "at" %} {{ distance|distance }})</p></a></li>
+              {% endfor %}
+            </ul>
+        </li>