From 879232af461462db7c553b3c46497f1190ccdeec Mon Sep 17 00:00:00 2001 From: Bertrand Marron Date: Wed, 18 Jun 2014 11:59:15 +0200 Subject: [PATCH] Make use of django_main for password_reset templates Remove duplicated code and make sure those views use the same visual identity. --- .../registration/password_reset_complete.html | 63 +++++++------------ .../registration/password_reset_confirm.html | 57 ++++++----------- 2 files changed, 40 insertions(+), 80 deletions(-) diff --git a/lms/templates/registration/password_reset_complete.html b/lms/templates/registration/password_reset_complete.html index ae6d6a9ae7..908f2d610f 100644 --- a/lms/templates/registration/password_reset_complete.html +++ b/lms/templates/registration/password_reset_complete.html @@ -1,25 +1,11 @@ +{% extends "main_django.html" %} {% load i18n %} -{% load compressed %} -{% load staticfiles %} - - - - {% trans "Your Password Reset is Complete" %} - - {% compressed_css 'style-vendor' %} - {% compressed_css 'style-app' %} - {% compressed_css 'style-app-extend1' %} - {% compressed_css 'style-app-extend2' %} - - {% block main_vendor_js %} - {% compressed_js 'main_vendor' %} - {% endblock %} - - +{% block title %} +{% trans "Your Password Reset is Complete" %} +{% endblock %} +{% block bodyextra %} +{% endblock %} - +{% block bodyclass %}view-passwordreset{% endblock %} - - -
- -
- -
-
-
-
-

{% trans "Your Password Reset is Complete" %}

-
-
+{% block body %} +
+
+

+ + {% trans "Your Password Reset is Complete" %} + +

+
+
+
{% block content %} -
+
{% blocktrans with link_start='' link_end='' %} Your password has been set. You may go ahead and {{ link_start }}log in{{ link_end }} now. {% endblocktrans %} -
+
{% endblock %} -
-
+ +{% endblock %} diff --git a/lms/templates/registration/password_reset_confirm.html b/lms/templates/registration/password_reset_confirm.html index ad048d458a..6bf9f3e194 100644 --- a/lms/templates/registration/password_reset_confirm.html +++ b/lms/templates/registration/password_reset_confirm.html @@ -1,29 +1,15 @@ +{% extends "main_django.html" %} {% load i18n %} -{% load compressed %} -{% load staticfiles %} - - - +{% block title %} {% blocktrans with platform_name=platform_name %} Reset Your {{ platform_name }} Password {% endblocktrans %} +{% endblock %} - {% compressed_css 'style-vendor' %} - {% compressed_css 'style-app' %} - {% compressed_css 'style-app-extend1' %} - {% compressed_css 'style-app-extend2' %} - - {% block main_vendor_js %} - {% compressed_js 'main_vendor' %} - {% endblock %} - - - +{% block bodyextra %} +{% endblock %} - +{% block bodyclass %}view-passwordreset{% endblock %} - - -
- -
- -
-
-
-
-

+{% block body %} +
+
+

+ {% blocktrans with platform_name=platform_name %} Reset Your {{ platform_name }} Password {% endblocktrans %} -

-
-
+ +

+
+
+
{% if validlink %}

{% trans "Password Reset Form" %}

-
{% csrf_token %} + {% csrf_token %}
-
+{% endblock %}