Merge branch 'ldap'

Conflicts:
	.gitignore

9 files changed, 108 insertions, 0 deletions

diff --git a/templates/account/account.html b/templates/account/account.html
new file mode 100644
index 0000000..550c904
--- /dev/null
+++ b/templates/account/account.html
@@ -0,0 +1,22 @@
+{% if msg %}
+    {{ msg }}
+{% else %}
+    {% if current_user %}
+        You are viewing:
+        <ul>
+        {% for attr in attr_list %}
+            {% for key, value in current_user.items %}
+                {% if key == attr %}
+                    {% if value %}
+                        <li>{{ key }}: {{ value }}</li>
+                    {% else %}
+                        <li>{{ key }}: Not Set</li>
+                    {% endif %}
+                {% endif %}
+            {% endfor %}
+        {% endfor %}
+        </ul>
+        <br /><br />You are:<br />
+        {{ user.username }} {{ user.get_profile.all_mails }}
+    {% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/templates/account/edit.html b/templates/account/edit.html
new file mode 100644
index 0000000..fa502f2
--- /dev/null
+++ b/templates/account/edit.html
@@ -0,0 +1,9 @@
+{% if msg %}
+    {{ msg }}
+{% else %}
+    <form action="." method="POST">{% csrf_token %}
+    {% for field in form %}<br />
+        {{ field.label_tag}}{{ field }}<br />
+    {% endfor %}
+    <input class="button" type="submit" value="Edit" />
+{% endif %}
diff --git a/templates/account/password.html b/templates/account/password.html
new file mode 100644
index 0000000..a2f304d
--- /dev/null
+++ b/templates/account/password.html
@@ -0,0 +1,9 @@
+<form action="." method="POST">{% csrf_token %}
+    {% for field in form %}<br />
+        {{ field.label_tag}}{{ field }}<br />
+    {% endfor %}
+    <input class="button" type="submit" value="Submit" />
+    {% if msg %}
+        <br />{{ msg }}
+    {% endif %}
+</form>
diff --git a/templates/index.html b/templates/index.html
new file mode 100644
index 0000000..1801675
--- /dev/null
+++ b/templates/index.html
@@ -0,0 +1 @@
+front page
\ No newline at end of file
diff --git a/templates/login.html b/templates/login.html
new file mode 100644
index 0000000..8a039d1
--- /dev/null
+++ b/templates/login.html
@@ -0,0 +1,19 @@
+<form action="." method="POST">{% csrf_token %}
+    {% for field in form %}
+        {% ifequal forloop.counter0 2 %}
+            <br />
+            {{ field}}
+            <label style="display: inline; margin: 0 0 0 0" for="remember">Remember Me</label>
+            <br />
+        {% else %}
+            {{ field.label_tag }}{{ field }}
+        {% endifequal %}
+    {% endfor %}
+    <input class="button" type="submit" value="Login" name="submit" />
+    <input class="button" type="submit" value="Signup" name="signup" />
+    <br />
+    <a href="/recover">Forgot your password?</a>
+    {% if msg %}
+        <p class="messages">{{ msg }}</p>
+    {% endif %}
+</form>
diff --git a/templates/recover/password.html b/templates/recover/password.html
new file mode 100644
index 0000000..50191d8
--- /dev/null
+++ b/templates/recover/password.html
@@ -0,0 +1,15 @@
+{% if form %}
+    <form action="." method="post">{% csrf_token %}
+        {% for field in form %}
+            {{ field.label_tag }}{{ field }}<br />
+        {% endfor %}
+        <input class="button" type="submit" value="submit">
+        </form>
+{% endif %}
+{% if msg %}
+    {{ msg }}
+{% else %}
+    {% if data %}
+        Password changed for user: {{ data.user }}
+    {% endif %}
+{% endif %}
diff --git a/templates/recover/recover.html b/templates/recover/recover.html
new file mode 100644
index 0000000..c13e2f4
--- /dev/null
+++ b/templates/recover/recover.html
@@ -0,0 +1,13 @@
+{% if email %}
+    You will soon recieve a mail at {{ email }} with instructions to change your password
+{% else %}
+    <form action="." method="post">{% csrf_token %}
+        {% for field in form %}
+            {{ field.label_tag }}{{ field }}<br />
+        {% endfor %}
+        <input class="button" type="submit" value="submit">
+        {% if msg %}
+            <p class="messages">{{ msg }}</p>
+        {% endif %}
+    </form>
+{% endif %}
diff --git a/templates/signup.html b/templates/signup.html
new file mode 100644
index 0000000..22a6090
--- /dev/null
+++ b/templates/signup.html
@@ -0,0 +1,13 @@
+{% if email %}
+    You will soon recieve a mail at {{ email }} to verify your account
+{% else %}
+    <form action="." method="post">{% csrf_token %}
+        {% for field in form %}
+            {{ field.label_tag }}{{ field }}<br />
+        {% endfor %}
+        <input class="button" type="submit" value="signup">
+        {% if msg %}
+            <p class="messages">{{ msg }}</p>
+        {% endif %}
+    </form>
+{% endif %}
diff --git a/templates/verification.html b/templates/verification.html
new file mode 100644
index 0000000..1d0f781
--- /dev/null
+++ b/templates/verification.html
@@ -0,0 +1,7 @@
+{% if msg %}
+    {{ msg }}
+{% else %}
+    {% if data %}
+        Activated {{data.email}} for user: {{ data.user }}
+    {% endif %}
+{% endif %}