Merge branch 'ccmd-frontend' into 115-sidebar-about

Author: rbika

prefix_finder/frontend/templates/home.html

@@ -23,20 +23,6 @@
         </span>
       </label>
 
-      {% if lookups.substructure %}
-        <label class="homepage__field">
-          In particular
-          <span class="homepage__select">
-            <select name="substructure">
-              <option value="">Any type</option>
-              {% for code, title, disabled in lookups.substructure %}
-                <option {% if query.substructure == code %}selected{% elif disabled %}disabled{% endif %} value="{{ code }}">{% if title|slice:"1" in "AEIOU" %}An{%else%}A{%endif%} {{ title|lower }}</option>
-              {% endfor %}
-            </select>
-          </span>
-        </label>
-      {% endif %}
-
       <label class="homepage__field">
         Registered in
         <span class="homepage__select">
@@ -49,27 +35,13 @@
         </span>
       </label>
 
-      {% if lookups.subnational %}
-        <label class="homepage__field">
-          In the state or region of
-          <span class="homepage__select">
-            <select name="subnational">
-              <option value="">Any subnational location</option>
-              {% for code, title, disabled in lookups.subnational %}
-                <option {% if query.subnational == code %}selected{% elif disabled %}disabled{% endif %} value="{{ code }}">{{ title }}</option>
-              {% endfor %}
-            </select>
-          </span>
-        </label>
-      {% endif %}
-
       <label class="homepage__field">
         Working in
         <span class="homepage__select">
           <select name="sector" >
             <option value="">Any sector</option>
             {% for code, title, disabled in lookups.sector %}
-               <option {% if query.sector == code %}selected{% elif disabled %}disabled{% endif %} value="{{ code }}">{{ title }}</option>
+              <option {% if query.sector == code %}selected{% elif disabled %}disabled{% endif %} value="{{ code }}">{{ title }}</option>
             {% endfor %}
           </select>
         </span>

prefix_finder/frontend/templates/sidebar.html

@@ -5,7 +5,11 @@
 
   <div class="sidebar__main">
     {% if request.resolver_match.url_name == "list" %}
-      <a href="{% url "results" %}" class="button button--main-color button--block"><i class="material-icons">arrow_back</i><span>Back to List</span></a>
+      {% 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>

prefix_finder/frontend/views.py

@@ -181,7 +181,8 @@ def refresh_data(branch="master"):
 
     try:
         sha = requests.get(
-            'https://api.github.com/repos/org-id/register/branches/'+branch
+            'https://api.github.com/repos/org-id/register/branches/'+branch,
+            auth=(settings.GITHUB_USER, settings.GITHUB_API_TOKEN) if settings.GITHUB_USER and settings.GITHUB_API_TOKEN else ''
         ).json()['commit']['sha']
         using_github = True
         if sha == git_commit_ref.get(branch,''):

prefix_finder/settings.py

@@ -32,6 +32,8 @@
     SECRET_KEY=(str, secret_key),
     DB_NAME=(str, os.path.join(BASE_DIR, 'db.sqlite3')),
     LOCAL_DATA=(bool, False),
+    GITHUB_USER=(str, ''),
+    GITHUB_API_TOKEN=(str, ''),
 )
 
 PIWIK = {
@@ -40,6 +42,8 @@
 }
 
 LOCAL_DATA = env('LOCAL_DATA')
+GITHUB_USER = env('GITHUB_USER')
+GITHUB_API_TOKEN = env('GITHUB_API_TOKEN')
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/