Refactor common sidebar code

panorama/templates/panorama/locate_point.html

@@ -29,7 +29,7 @@
 {% block sidebar %}
 <div class="collapse navbar-collapse navbar-ex1-collapse">
     <ul class="nav navbar-nav side-nav">
-    {% include "panorama/sidebar-simple.html" %}
+    {% include "panorama/sidebar-locate-point.html" %}
     </ul>
 </div>
 {% endblock %}

panorama/templates/panorama/sidebar-all.html

@@ -2,25 +2,7 @@
         <li>
             <a href="{% url 'panorama:main' %}"><i class="fa fa-fw fa-home"></i> {% trans "Map" %}</a>
         </li>
-        <li>
-            <a id="pano-list-btn" href="javascript:;" data-toggle="collapse" data-target="#panos"><i class="fa fa-fw fa-image"></i> {% trans "Panoramas" %}<i class="fa fa-fw fa-caret-down"></i></a>
-            <ul id="panos" class="collapse">
-              {% for pano in panoramas %}
-              <li><a href="{% url 'panorama:view_pano' pano.id %}"><i class="fa fa-fw fa-eye"></i> {{ pano.name }}</a></li>
-              {% endfor %}
-            </ul>
-        </li>
-        <li>
-            <a id="locate-existing-btn" 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>
+{% include "panorama/sidebar-common.html" %}
         <li>
             <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">

panorama/templates/panorama/sidebar-common.html

@@ -0,0 +1,20 @@
+{% load i18n %}
+        <li>
+            <a id="pano-list-btn" href="javascript:;" data-toggle="collapse" data-target="#panos"><i class="fa fa-fw fa-image"></i> {% trans "Panoramas" %}<i class="fa fa-fw fa-caret-down"></i></a>
+            <ul id="panos" class="collapse">
+              {% for pano in panoramas %}
+              <li><a href="{% url 'panorama:view_pano' pano.id %}"><i class="fa fa-fw fa-eye"></i> {{ pano.name }}</a></li>
+              {% endfor %}
+            </ul>
+        </li>
+        <li>
+            <a id="locate-existing-btn" 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>

panorama/templates/panorama/sidebar-locate-point.html

@@ -0,0 +1,16 @@
+{% load i18n %}
+{% load panorama_url %}
+{% load distance_filter %}
+{% include "panorama/sidebar-common.html" %}
+        <li>
+            {% if located_point_name != None %}
+                <a href="javascript:;" data-toggle="collapse" data-target="#result"><i class="fa fa-fw fa-eye"></i> {% trans "Results for the point" %} <b>{{ located_point_name }}</b></a>
+            {% else %}
+                <a href="javascript:;" data-toggle="collapse" data-target="#result"><i class="fa fa-fw fa-eye"></i> {% trans "Results for the searched point" %}</a>
+            {% endif %}
+            <ul id="result" class="collapse in">
+              {% 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>

panorama/templates/panorama/sidebar-simple.html

@@ -1,35 +0,0 @@
-{% load i18n %}
-{% load panorama_url %}
-{% load distance_filter %}
-        <li>
-            <a href="javascript:;" data-toggle="collapse" data-target="#panos"><i class="fa fa-fw fa-image"></i> {% trans "Panoramas" %}<i class="fa fa-fw fa-caret-down"></i></a>
-            <ul id="panos" class="collapse">
-              {% for pano in panoramas %}
-              <li><a href="{% url 'panorama:view_pano' pano.id %}"><i class="fa fa-fw fa-eye"></i> {{ pano.name }}</a></li>
-              {% endfor %}
-            </ul>
-        </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>
-            {% if located_point_name != None %}
-                <a href="javascript:;" data-toggle="collapse" data-target="#result"><i class="fa fa-fw fa-eye"></i> {% trans "Results for the point" %} <b>{{ located_point_name }}</b></a>
-            {% else %}
-                <a href="javascript:;" data-toggle="collapse" data-target="#result"><i class="fa fa-fw fa-eye"></i> {% trans "Results for the searched point" %}</a>
-            {% endif %}
-            <ul id="result" class="collapse in">
-              {% 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>
-