Merge pull request #132 from ccmdesign/115-sidebar-about

[#115] Update sidebar for the About page

Author: Bjwebb

prefix_finder/frontend/templates/sidebar.html

@@ -4,7 +4,17 @@
   </div>
 
   <div class="sidebar__main">
-    {% if not hide_sidebar_form %}
+    {% if request.resolver_match.url_name == "list" %}
+      {% if request.META.HTTP_REFERER %}
+        <a href="{{ request.META.HTTP_REFERER }}" class="button button--main-color button--block"><i class="material-icons">arrow_back</i><span>Back to List</span></a>
+      {% else %}
+        <a href="{% url "results" %}" class="button button--main-color button--block"><i class="material-icons">arrow_back</i><span>Back to List</span></a>
+      {% endif %}
+
+    {% elif request.resolver_match.url_name == "about" %}
+      <a href="{% url "home" %}" class="button button--main-color button--block"><i class="material-icons">arrow_back</i><span>Back to Home</span></a>
+
+    {% else %}
       <form class="sidebar__filters">
         <fieldset class="filter filter--organizations">
           <label>Identifiers for…</label>
@@ -70,13 +80,6 @@
           </div>
         </fieldset>
       </form>
-
-    {% else %}
-      {% if request.META.HTTP_REFERER %}
-        <a href="{{ request.META.HTTP_REFERER }}" class="button button--main-color button--block"><i class="material-icons">arrow_back</i><span>Back to List</span></a>
-      {% else %}
-        <a href="{% url "results" %}" class="button button--main-color button--block"><i class="material-icons">arrow_back</i><span>Back to List</span></a>
-      {% endif %}
     {% endif %}
   </div>
 

prefix_finder/frontend/views.py

@@ -501,7 +501,7 @@ def list_details(request, prefix):
 
     except KeyError:
         raise Http404('Organization list {} does not exist'.format(prefix))
-    return render(request, 'list.html', context={'org_list': org_list, 'branch':use_branch, 'hide_sidebar_form': True})
+    return render(request, 'list.html', context={'org_list': org_list, 'branch':use_branch})
 
 
 def _get_filename(use_branch='master'):