User menu, various fixes

templates/registration/create_user.html

@@ -8,33 +8,35 @@
 {% endblock %}
 
 {% block content %}
-    <section class="row">
-        <div class="col-md-4">
-            {% for message in messages %}
-                <div {% if message.tags %} class="alert alert-{{ message.tags }}"{% endif %}>{{ message }}<a class="close" data-dismiss="alert">×</a></div>
-            {% endfor %}
-        </div>
-    </section>
-    <section class="row">
-        <div class="col-md-5">
-            <h1>Legg til ny bruker</h1>
-            {% if form.errors %}
-                <p>{{ form.errors }}.</p>
-            {% endif %}
+    {% if perms.auth.can_add_user %}
+        <section class="row">
+            <div class="col-md-4">
+                {% for message in messages %}
+                    <div {% if message.tags %} class="alert alert-{{ message.tags }}"{% endif %}>{{ message }}<a class="close" data-dismiss="alert">×</a></div>
+                {% endfor %}
+            </div>
+        </section>
+        <section class="row">
+            <div class="col-md-5">
+                <h1>Legg til ny bruker</h1>
+                {% if form.errors %}
+                    <p>{{ form.errors }}.</p>
+                {% endif %}
 
-            <form method="post" role="form">
-                {% csrf_token %}
+                <form method="post" role="form">
+                    {% csrf_token %}
 
-                <div class="form-group">
-                    <label for="id_first_name">{{ form.first_name.label }}</label>{{ form.first_name|add_class:"form-control"}}
-                    <label for="id_last_name">{{ form.last_name.label }}</label>{{ form.last_name|add_class:"form-control"}}
-                    <label for="id_email">{{ form.email.label }}</label>{{ form.email|add_class:"form-control"}}
-                    <label for="id_facebook_username">{{ form.facebook_username.label }}</label>{{ form.facebook_username|add_class:"form-control"|attr:"placeholder: F.eks simbras"}}
+                    <div class="form-group">
+                        <label for="id_first_name">{{ form.first_name.label }}</label>{{ form.first_name|add_class:"form-control"}}{{ form.first_name.error }}
+                        <label for="id_last_name">{{ form.last_name.label }}</label>{{ form.last_name|add_class:"form-control"}}{{ form.last_name.error }}
+                        <label for="id_email">{{ form.email.label }}</label>{{ form.email|add_class:"form-control"}}{{ form.email.error }}
+                        <label for="id_facebook_username">{{ form.facebook_username.label }}</label>{{ form.facebook_username|add_class:"form-control"|attr:"placeholder: F.eks simbras"}}{{form.facebook_username.error}}
 
-                </div>
-                <input type="submit" value="Legg til" class="btn btn-primary btn-lg" />
-                <a href="{% url register %}" class="btn btn-default" />Tilbake</a>
-            </form>
-        </div>
-    </section>
+                    </div>
+                    <input type="submit" value="Legg til" class="btn btn-primary btn-lg" />
+                    <a href="{% url register %}" class="btn btn-default" />Tilbake</a>
+                </form>
+            </div>
+        </section>
+        {% endif %}
 {% endblock %}

templates/registration/login.html

@@ -6,3 +6,4 @@
 {% include "registration/login_form.html" %}
 
 {% endblock %}
+{% block footer %}{% endblock %}

templates/registration/login_form.html

@@ -1,20 +1,16 @@
-{% if form.errors %}
-<p>Brukernavn og passord stemmer ikke overens. Prøv igjen.</p>
-{% endif %}
+{% load widget_tweaks %}
+<div class="form-login">
+    {% if form.errors %}
+    <p class="alert alert-danger">Brukernavn og passord stemmer ikke overens. Prøv igjen.</p>
+    {% endif %}
 
-<form method="post" action="{% url django.contrib.auth.views.login %}" class="bp">
-{% csrf_token %}
-<table>
-<tr>
-    <th><label for="id_username">Brukernavn:</label></th>
-    <td>{{ form.username }}</td>
-</tr>
-<tr>
-    <th><label for="id_password">Passord: </label></th>
-    <td>{{ form.password }}</td>
-</tr>
-</table>
-
-<input type="submit" value="Logg inn" />
-<input type="hidden" name="next" value="{{ next }}" />
-</form>
+    <form method="post" action="{% url django.contrib.auth.views.login %}" class="">
+        {% csrf_token %}
+        <label for="id_username">Brukernavn:</label>
+        {{ form.username|add_class:"form-control" }}
+        <label for="id_password">Passord: </label>
+        {{ form.password|add_class:"form-control" }}<br/>
+        <input type="submit" value="Logg inn" class="btn btn-primary btn-lg"/>
+        <input type="hidden" name="next" value="{{ next }}" />
+    </form>
+</div>

templates/registration/logout.html

@@ -3,6 +3,14 @@
 {% block title %}Logg inn{% endblock %}
 
 {% block content %}
-Du er logget ut. Vil du <a href="{% url main.views.home %}">logge inn igjen</a>.
-
+<div class="row">
+    <div class="col-md-6">
+        {% if user.is_authenticated %}
+            <p class="alert alert-success">Du er logget ut.</p>
+            <p>Vil du <a href="{% url home %}">logge inn igjen?</a></p>
+        {% else %}
+            <p>Du er allerede logget ut.</p>
+        {% endif %}
+    </div>
+</div>
 {% endblock %}