Merge branch 'issue18' into 'master'

Restricts who can view signup page Closes #18

- Now with more branches!

See merge request !14

go/go/templates/signup.html

@@ -134,9 +134,15 @@ Go - Signup
   </div>
 
 {% else %}
-  <div class="col-md-12">
-    <p>You are already signed up for Go.</p>
-  </div>
+  {% if not approved %}
+    <div class="col-md-12">
+      <p>You have already submitted a request for approval to use Go.</p>
+    </div>
+  {% else %}
+    <div class="col-md-12">
+      <p>You are already approved to use Go.</p>
+    </div>
+  {% endif %}
 {% endif %}
 </div>
 {% endblock %}

go/go/views.py

@@ -211,9 +211,17 @@ def signup(request):
     yourself, or another person.
 
     """
+    # Do not display signup page to registered or approved users (Staff can still see these pages)
     if is_registered(request.user) and not request.user.is_staff:
         return render(request, 'signup.html', {
             'registered': True,
+            'approved': False,
+        },
+        )
+    elif is_approved(request.user) and not request.user.is_staff:
+        return render(request, 'signup.html', {
+            'registered': True,
+            'approved': True,
         },
         )