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 @@
+ {% if request.user.is_authenticated %} +
  • Logout
    • + {% else %} +
  • Login
    • + {% endif %} + {% if request.user.is_authenticated %} -

    - - {{ user.username }} -

    +

    + + {{ user.username }} +

    {% endif %} - -
    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()