From 05f4514b5cc17ba498ffdd2d1463ae694d59ffa2 Mon Sep 17 00:00:00 2001
From: Brian Wiborg <baccenfutter@c-base.org>
Date: Sun, 24 Nov 2013 23:00:49 +0100
Subject: [PATCH] cleaning up landing-page

---
 account/templates/base.html | 22 ++++++++++------------
 account/views.py            |  5 -----
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/account/templates/base.html b/account/templates/base.html
index 0445736..e7b72e1 100644
--- a/account/templates/base.html
+++ b/account/templates/base.html
@@ -71,20 +71,18 @@
             </span>
             <div class="nav-collapse collapse">
                 <ul class="nav nav-collapse collapse pull-right">
-                        {% if request.user.is_authenticated %}
-                            <li><a href="/account/logout/">Logout</a></li>
-                        {% else %}
-                            <li><a href="/account/login/">Login</a></li>
-                        {% endif %}
-                    </ul>
+                    {% if request.user.is_authenticated %}
+                        <li><a href="/account/logout/">Logout</a></li>
+                    {% else %}
+                        <li><a href="/account/login/">Login</a></li>
+                    {% endif %}
+                </ul>
                 {% if request.user.is_authenticated %}
-                    <p class="navbar-text pull-right">
-                        <i class="icon icon-user icon-white"></i>
-                        {{ user.username }}
-                    </p>
+                <p class="navbar-text pull-right">
+                    <i class="icon icon-user icon-white"></i>
+                    {{ user.username }}
+                </p>
                 {% endif %}
-
-                </div>
             </div>
             <!--/.nav-collapse -->
         </div>
diff --git a/account/views.py b/account/views.py
index 86030b7..927aab1 100644
--- a/account/views.py
+++ b/account/views.py
@@ -26,11 +26,6 @@ def landingpage(request):
     if request.user.is_authenticated():
         return HttpResponseRedirect('/account')
     form = LoginForm()
-    is_ceymaster = is_admin = False
-    if 'ceymaster' in [g.name for g in request.user.groups.all()]:
-        is_ceymaster = True
-    if 'ldap_admins' in [g.name for g in request.user.groups.all()]:
-        is_admin = True
     groups = Group.objects.all()
     try:
         admins = Group.objects.get(name="ldap_admins").user_set.all()