clean templates, add userdetail and proper landing page

account/views.py

@@ -12,10 +12,34 @@ from django.contrib.auth.models import Group
 from django.shortcuts import render
 from django.utils.translation import ugettext as _
 
-from forms import GastroPinForm, WlanPresenceForm, LoginForm, PaswordForm, \
-    RFIDForm, NRF24Form
+from forms import GastroPinForm, WlanPresenceForm, LoginForm, PasswordForm, \
+    RFIDForm, NRF24Form, SIPPinForm
 from cbase_members import MemberValues, retrieve_member
 
+
+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()
+    admins = Group.objects.get(name="ldap_admins").user_set.all()
+
+    # values = get_user_values(request.user.username, request.session['ldap_password'])
+    #return render_to_response("dashboard.html", locals())
+    return render(request, 'base.html', {'form': form, 'admins': admins})
+
+@login_required
+def home(request):
+    member = retrieve_member(request)
+    context = {'member': member.to_dict()}
+    print context
+    return render(request, 'start.html', context)
+
 def auth_login(request):
     redirect_to = request.GET.get('next', '') or '/'
     if request.method == 'POST':
@@ -44,6 +68,7 @@ def auth_login(request):
     return render_to_response('login.html',
             RequestContext(request, locals()))
 
+@login_required
 def auth_logout(request):
     redirect_to = request.GET.get('next', '') or '/'
     logout(request)
@@ -51,19 +76,6 @@ def auth_logout(request):
     response.delete_cookie('sessionkey')
     return response
 
-def landingpage(request):
-    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()
-    admins = Group.objects.get(name="ldap_admins").user_set.all()
-    if request.user.is_authenticated():
-        # values = get_user_values(request.user.username, request.session['ldap_password'])
-        return render_to_response("dashboard.html", locals())
-    return render_to_response("base.html", locals())
-
 @login_required(redirect_field_name="/" ,login_url="/account/login/")
 def groups_list(request, group_name):
     group = get_object_or_404(Group, name=group_name)
@@ -76,24 +88,13 @@ def groups_list(request, group_name):
 
 @login_required
 def gastropin(request):
-    if request.method == 'POST':
-        form = GastroPinForm(request.POST)
-        if form.is_valid():
-            user = request.user
-            user_profile = user.get_profile()
-            user_profile.gastropin = form.cleaned_data['gastropin']
-            user_profile.save()
-            return render(request, 'gastropin.html',
-                {'message': _('Your Gastro-PIN was changed. Thank you!'),
-                 'form:': form})
-        else:
-            return render(request, 'gastropin.html', {'form:': form})
-
-    else:
-        form = GastroPinForm()
-
-    return render(request, 'gastropin.html', {'form': form})
+    return set_ldap_field(request, GastroPinForm,
+        [('gastropin', 'gastropin')], 'gastropin.html')
 
+@login_required
+def sippin(request):
+    return set_ldap_field(request, SIPPinForm, [('sippin', 'sippin')],
+        'sippin.html')
 
 def set_ldap_field(request, form_type, field_names, template_name):
     """
@@ -135,4 +136,7 @@ def rfid(request):
 def nrf24(request):
     return set_ldap_field(request, NRF24Form, [('nrf24', 'nrf24')], 'nrf24.html')
 
+@login_required
+def password(request):
+    return set_ldap_field(request, PasswordForm, [('password1', 'password')], 'password.html')