smile/cbmi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleaning up landing-page

Browse source
This commit is contained in:
baccenfutter 2013-11-24 23:00:49 +01:00
parent 062c45a92d
commit 05f4514b5c
2 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
account/templates/base.html
View file

@ -71,20 +71,18 @@
</span> </span>
<div class="nav-collapse collapse"> <div class="nav-collapse collapse">
<ul class="nav nav-collapse collapse pull-right"> <ul class="nav nav-collapse collapse pull-right">
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<li><a href="/account/logout/">Logout</a></li> <li><a href="/account/logout/">Logout</a></li>
{% else %} {% else %}
<li><a href="/account/login/">Login</a></li> <li><a href="/account/login/">Login</a></li>
{% endif %} {% endif %}
</ul> </ul>
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<p class="navbar-text pull-right"> <p class="navbar-text pull-right">
<i class="icon icon-user icon-white"></i> <i class="icon icon-user icon-white"></i>
{{ user.username }} {{ user.username }}
</p> </p>
{% endif %} {% endif %}
</div>
</div> </div>
<!--/.nav-collapse --> <!--/.nav-collapse -->
</div> </div>

5
account/views.py
View file

@ -26,11 +26,6 @@ def landingpage(request):
if request.user.is_authenticated(): if request.user.is_authenticated():
return HttpResponseRedirect('/account') return HttpResponseRedirect('/account')
form = LoginForm() 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() groups = Group.objects.all()
try: try:
admins = Group.objects.get(name="ldap_admins").user_set.all() admins = Group.objects.get(name="ldap_admins").user_set.all()