4 files changed, 12 insertions, 6 deletions
diff --git a/templates/all.html b/templates/browse.html
index 128c115..34bd10d 100644
--- a/templates/all.html
+++ b/templates/browse.html
@@ -11,7 +11,7 @@
 
   <div class="list-group">
     {% for group in groups %}
-      <a class="list-group-item" href="{{ url_for('public_group', group_name=group.name) }}">{{group}}</a>
+      <a class="list-group-item" href="{{ url_for('group', group_name=group.name) }}">{{group}}</a>
     {% endfor %}
   </div>
 
diff --git a/templates/group.html b/templates/group.html
index 38e078f..1d3205c 100644
--- a/templates/group.html
+++ b/templates/group.html
@@ -24,7 +24,7 @@
   {% endif %}
 </div>
 
-{% if not public_view %}
+{% if membership.active %}
 <div class="panel panel-default">
   <div class="panel-heading" style="border-bottom: 0">
     <h3 class="panel-title">Pads</h3>
@@ -56,7 +56,7 @@
     <div class="panel-body">No pads created.</div>
   {% endfor %}
 
-  {% if admin %}
+  {% if membership.admin %}
     <div class="panel-footer">
       <a href="{{ url_for('pad_create', group_name=group.name) }}">
         Create pad
@@ -77,7 +77,7 @@
   </ul>
 </div>
 
-{% if admin %}
+{% if membership.admin %}
   {% for member in members|rejectattr("active") %}
     {% if loop.first %}
     <div class="panel panel-default">
@@ -139,6 +139,11 @@
   </div>
 
   <div class="panel-body">
+    {% if membership %}
+    <div class="text-center">
+      Membership request pending.
+    </div>
+    {% else %}
     <form class="form-horizontal" role="form" method="POST">
       <div class="form-group">
         <div class="col-lg-offset-2 col-lg-8">
@@ -146,6 +151,7 @@
         </div>
       </div>
     </form>
+    {% endif %}
   </div>
 </div>
 {% endif %}
diff --git a/templates/group_delete.html b/templates/group_delete.html
index 543c0f9..951b640 100644
--- a/templates/group_delete.html
+++ b/templates/group_delete.html
@@ -16,7 +16,7 @@
           <p class="form-control-static text-center lead">
             Are you sure you want to delete the group {{group}}?
           </p>
-    
+
           <p class="form-control-static text-center">
             This will permanently delete all pads of this group and
             all information about the group members.
diff --git a/templates/index.html b/templates/index.html
index f79fb68..11105e0 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -16,7 +16,7 @@
   </div>
 
   <div class="panel-footer">
-    <a href="{{ url_for('all') }}">Find public browsable groups</a>
+    <a href="{{ url_for('browse') }}">Find public browsable groups</a>
   </div>
 </div>