From afc87888a652df5c4bd75d45c24f66ee54eb6901 Mon Sep 17 00:00:00 2001
From: Skia <lordbanana25@mailoo.org>
Date: Tue, 2 Feb 2016 11:00:08 +0100
Subject: [PATCH] Finish the move to Jinja2

---
 core/templates/core/{404.html => 404.jinja}   |  0
 core/templates/core/api/markdown.html         |  4 ----
 core/templates/core/base.jinja                |  5 +++++
 core/templates/core/edit_user.html            | 20 -------------------
 .../{group_edit.html => group_edit.jinja}     |  2 +-
 .../{group_list.html => group_list.jinja}     |  2 +-
 core/templates/core/password_change.html      | 14 -------------
 core/templates/core/password_change.jinja     | 10 ++++++++++
 core/templates/core/password_change_done.html | 13 ------------
 .../templates/core/password_change_done.jinja |  6 ++++++
 ...ssword_reset.html => password_reset.jinja} |  2 +-
 ...ete.html => password_reset_complete.jinja} |  2 +-
 ...firm.html => password_reset_confirm.jinja} |  2 +-
 ...et_done.html => password_reset_done.jinja} |  0
 core/templates/core/password_reset_email.html | 15 --------------
 .../templates/core/password_reset_email.jinja | 15 ++++++++++++++
 .../core/{register.html => register.jinja}    |  4 ++--
 core/templates/core/user_edit.jinja           |  1 +
 core/views/group.py                           |  4 ++--
 19 files changed, 46 insertions(+), 75 deletions(-)
 rename core/templates/core/{404.html => 404.jinja} (100%)
 delete mode 100644 core/templates/core/api/markdown.html
 delete mode 100644 core/templates/core/edit_user.html
 rename core/templates/core/{group_edit.html => group_edit.jinja} (91%)
 rename core/templates/core/{group_list.html => group_list.jinja} (66%)
 delete mode 100644 core/templates/core/password_change.html
 create mode 100644 core/templates/core/password_change.jinja
 delete mode 100644 core/templates/core/password_change_done.html
 create mode 100644 core/templates/core/password_change_done.jinja
 rename core/templates/core/{password_reset.html => password_reset.jinja} (90%)
 rename core/templates/core/{password_reset_complete.html => password_reset_complete.jinja} (72%)
 rename core/templates/core/{password_reset_confirm.html => password_reset_confirm.jinja} (90%)
 rename core/templates/core/{password_reset_done.html => password_reset_done.jinja} (100%)
 delete mode 100644 core/templates/core/password_reset_email.html
 create mode 100644 core/templates/core/password_reset_email.jinja
 rename core/templates/core/{register.html => register.jinja} (78%)

diff --git a/core/templates/core/404.html b/core/templates/core/404.jinja
similarity index 100%
rename from core/templates/core/404.html
rename to core/templates/core/404.jinja
diff --git a/core/templates/core/api/markdown.html b/core/templates/core/api/markdown.html
deleted file mode 100644
index fafcdb01..00000000
--- a/core/templates/core/api/markdown.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% load renderer %}
-
-{{ text|markdown }}
-
diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index d638caea..138d1d3b 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -43,5 +43,10 @@
         Site réalisé par des gens biens
         {% endblock %}
     </footer>
+    <!--
+    {% block tests %}
+        {{ tests }}
+    {% endblock %}
+    -->
 </body>
 </html>
diff --git a/core/templates/core/edit_user.html b/core/templates/core/edit_user.html
deleted file mode 100644
index 2e827339..00000000
--- a/core/templates/core/edit_user.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "core/base.jinja" %}
-
-{% block title %}
-{% if profile %}
-Edit {{ profile.get_display_name }}
-{% endif %}
-{% endblock %}
-
-{% block content %}
-{% if profile %}
-<h3>Edit user</h3>
-<p><a href="{% url 'core:user_profile' profile.id %}">Back to profile</a></p>
-<p>You're editing the profile of <strong>{{ profile.get_display_name }}</strong></p>
-<form action="{% url 'core:user_edit' profile.id %}" method="post">
-    {% csrf_token %}
-    {{ user_form }}
-    <p><input type="submit" value="Save!" /></p>
-</form>
-{% endif %}
-{% endblock %}
diff --git a/core/templates/core/group_edit.html b/core/templates/core/group_edit.jinja
similarity index 91%
rename from core/templates/core/group_edit.html
rename to core/templates/core/group_edit.jinja
index 1e730337..257021f8 100644
--- a/core/templates/core/group_edit.html
+++ b/core/templates/core/group_edit.jinja
@@ -4,7 +4,7 @@
 <p><a href="{{ url('core:group_list') }}">Back to list</a></p>
     <h2>Edit group</h2>
     <form action="" method="post">
-        {{ csrf_input }}
+        {% csrf_token %}
         {{ form.as_p() }}
         <p><input type="submit" value="Update" /></p>
     </form>
diff --git a/core/templates/core/group_list.html b/core/templates/core/group_list.jinja
similarity index 66%
rename from core/templates/core/group_list.html
rename to core/templates/core/group_list.jinja
index ff74aac9..f8af5828 100644
--- a/core/templates/core/group_list.html
+++ b/core/templates/core/group_list.jinja
@@ -8,7 +8,7 @@ Group list
 <h3>Group list</h3>
 <ul>
 {% for g in group_list %}
-<li><a href="{{ url('core:group_edit', kwargs={'group_id': g.id} }}">{{ g.name }}</a></li>
+<li><a href="{{ url('core:group_edit', group_id=g.id) }}">{{ g.name }}</a></li>
 {% endfor %}
 </ul>
 {% endblock %}
diff --git a/core/templates/core/password_change.html b/core/templates/core/password_change.html
deleted file mode 100644
index 64243611..00000000
--- a/core/templates/core/password_change.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "core/base.jinja" %}
-
-{% block content %}
-
-{% if form.errors %}
-<p>Your passwords didn't match. Please try again.</p>
-{% endif %}
-
-<form method="post" action="{% url 'core:password_change' %}">
-{% csrf_token %}
-{{ form.as_p }}
-<input type="submit" value="Change!" />
-</form>
-{% endblock %}
diff --git a/core/templates/core/password_change.jinja b/core/templates/core/password_change.jinja
new file mode 100644
index 00000000..166900ff
--- /dev/null
+++ b/core/templates/core/password_change.jinja
@@ -0,0 +1,10 @@
+{% extends "core/base.jinja" %}
+
+{% block content %}
+
+<form method="post" action="{{ url('core:password_change') }}">
+{% csrf_token %}
+{{ form.as_p() }}
+<input type="submit" value="Change!" />
+</form>
+{% endblock %}
diff --git a/core/templates/core/password_change_done.html b/core/templates/core/password_change_done.html
deleted file mode 100644
index 0f70542e..00000000
--- a/core/templates/core/password_change_done.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "core/base.jinja" %}
-
-{% block content %}
-
-
-{% if form.errors %}
-<p>Your passwords didn't match. Please try again.</p>
-{% else %}
-You successfully changed your password!
-{% endif %}
-
-{% endblock %}
-
diff --git a/core/templates/core/password_change_done.jinja b/core/templates/core/password_change_done.jinja
new file mode 100644
index 00000000..160b4a44
--- /dev/null
+++ b/core/templates/core/password_change_done.jinja
@@ -0,0 +1,6 @@
+{% extends "core/base.jinja" %}
+
+{% block content %}
+<p>You successfully changed your password!</p>
+{% endblock %}
+
diff --git a/core/templates/core/password_reset.html b/core/templates/core/password_reset.jinja
similarity index 90%
rename from core/templates/core/password_reset.html
rename to core/templates/core/password_reset.jinja
index a0e88e9a..d0e9e88a 100644
--- a/core/templates/core/password_reset.html
+++ b/core/templates/core/password_reset.jinja
@@ -3,7 +3,7 @@
 {% block content %}
 <form method="post" action="">
 {% csrf_token %}
-{{ form.as_p }}
+{{ form.as_p() }}
 <input type="submit" value="Reset!" />
 </form>
 {% endblock %}
diff --git a/core/templates/core/password_reset_complete.html b/core/templates/core/password_reset_complete.jinja
similarity index 72%
rename from core/templates/core/password_reset_complete.html
rename to core/templates/core/password_reset_complete.jinja
index eab86537..f156a4b1 100644
--- a/core/templates/core/password_reset_complete.html
+++ b/core/templates/core/password_reset_complete.jinja
@@ -2,7 +2,7 @@
 
 {% block content %}
 <p>You successfully reset your password!</p>
-<a href="{% url 'core:login' %}">Login</a>
+<a href="{{ url('core:login') }}">Login</a>
 {% endblock %}
 
 
diff --git a/core/templates/core/password_reset_confirm.html b/core/templates/core/password_reset_confirm.jinja
similarity index 90%
rename from core/templates/core/password_reset_confirm.html
rename to core/templates/core/password_reset_confirm.jinja
index 14ce549e..4c55c714 100644
--- a/core/templates/core/password_reset_confirm.html
+++ b/core/templates/core/password_reset_confirm.jinja
@@ -3,7 +3,7 @@
 {% block content %}
 <form method="post" action="">
 {% csrf_token %}
-{{ form.as_p }}
+{{ form.as_p() }}
 <input type="submit" value="Reset" />
 </form>
 {% endblock %}
diff --git a/core/templates/core/password_reset_done.html b/core/templates/core/password_reset_done.jinja
similarity index 100%
rename from core/templates/core/password_reset_done.html
rename to core/templates/core/password_reset_done.jinja
diff --git a/core/templates/core/password_reset_email.html b/core/templates/core/password_reset_email.html
deleted file mode 100644
index 0f3b0823..00000000
--- a/core/templates/core/password_reset_email.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% load i18n %}{% autoescape off %}
-{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
-
-{% trans "Please go to the following page and choose a new password:" %}
-{% block reset_link %}
-{{ protocol }}://{{ domain }}{% url 'core:password_reset_confirm' uidb64=uid token=token %}
-{% endblock %}
-{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
-
-{% trans "Thanks for using our site!" %}
-
-{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
-
-{% endautoescape %}
-
diff --git a/core/templates/core/password_reset_email.jinja b/core/templates/core/password_reset_email.jinja
new file mode 100644
index 00000000..65532865
--- /dev/null
+++ b/core/templates/core/password_reset_email.jinja
@@ -0,0 +1,15 @@
+{% autoescape off %}
+{% trans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endtrans %}
+
+{% trans %}Please go to the following page and choose a new password:{% endtrans %}
+{% block reset_link %}
+{{ protocol }}://{{ domain }}{{ url('core:password_reset_confirm', uidb64=uid, token=token) }}
+{% endblock %}
+{% trans %}Your username, in case you've forgotten: {% endtrans %} {{ user.get_username() }}
+
+{% trans %}Thanks for using our site! {% endtrans %}
+
+{% trans %}The {{ site_name }} team{% endtrans %}
+
+{% endautoescape %}
+
diff --git a/core/templates/core/register.html b/core/templates/core/register.jinja
similarity index 78%
rename from core/templates/core/register.html
rename to core/templates/core/register.jinja
index 1105a4c2..3e59c973 100644
--- a/core/templates/core/register.html
+++ b/core/templates/core/register.jinja
@@ -6,13 +6,13 @@
 <h1>{{ title }}</h1>
 
 {% if user_registered %}
-Welcome {{ user_registered.get_display_name }}!
+Welcome {{ user_registered.get_display_name() }}!
 You successfully registred and you will soon receive a confirmation mail.
 
 Your username is {{ user_registered.username }}.
 {% endif %}
 
-<form action="{% url 'core:register' %}" method="post">
+<form action="{{ url('core:register') }}" method="post">
     {% csrf_token %}
     {{ form }}
     <p><input type="submit" value="Register!" /></p>
diff --git a/core/templates/core/user_edit.jinja b/core/templates/core/user_edit.jinja
index 5833d766..f7ac879d 100644
--- a/core/templates/core/user_edit.jinja
+++ b/core/templates/core/user_edit.jinja
@@ -7,6 +7,7 @@
         {{ form.as_p() }}
         <p><input type="submit" value="Update" /></p>
     </form>
+    <p><a href="{{ url('core:password_change') }}">Change my password</a></p>
 {% endblock %}
 
 
diff --git a/core/views/group.py b/core/views/group.py
index 2fe01a7c..a9861c61 100644
--- a/core/views/group.py
+++ b/core/views/group.py
@@ -10,11 +10,11 @@ class GroupListView(CanEditMixin, ListView):
     Displays the group list
     """
     model = Group
-    template_name = "core/group_list.html"
+    template_name = "core/group_list.jinja"
 
 class GroupEditView(CanEditMixin, UpdateView):
     model = Group
     pk_url_kwarg = "group_id"
-    template_name = "core/group_edit.html"
+    template_name = "core/group_edit.jinja"
     form_class = GroupEditForm