Skip to content

E
edx-platform
Commit 879232af by Bertrand Marron
Options

Make use of django_main for password_reset templates 

Remove duplicated code and make sure those views use the same visual
identity.
parent 14de1a3f
Showing with 43 additions and 83 deletions
lms/templates/registration/password_reset_complete.html
{% extends "main_django.html" %}
{% load i18n %} {% load i18n %}
{% load compressed %}
{% load staticfiles %}
<!DOCTYPE html>
<html lang="{{LANGUAGE_CODE}}">
<head>
<title>{% trans "Your Password Reset is Complete" %}</title> {% block title %}
<title>{% trans "Your Password Reset is Complete" %}</title>
{% compressed_css 'style-vendor' %} {% endblock %}
{% compressed_css 'style-app' %}
{% compressed_css 'style-app-extend1' %}
{% compressed_css 'style-app-extend2' %}
{% block main_vendor_js %}
{% compressed_js 'main_vendor' %}
{% endblock %}
<!--[if lt IE 9]>
<script src="{% static 'js/html5shiv.js' %}"></script>
<![endif]-->
{% block bodyextra %}
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
...@@ -41,33 +27,28 @@ ...@@ -41,33 +27,28 @@
}); });
}); });
</script> </script>
{% endblock %}
</head>
{% block bodyclass %}view-passwordreset{% endblock %}
<body class="view-passwordreset">
{% block body %}
<header class="global"> <section class="introduction">
<nav> <header>
<h1 class="logo"> <h1 class="title">
<a href="{{MKTG_URL_ROOT}}"><img src="{% static 'images/header-logo.png' %}"></a> <span class="title-super">
</h1> {% trans "Your Password Reset is Complete" %}
</nav> </span>
</header> </h1>
</header>
<div class="content-wrapper"> </section>
<div class="passwordreset container">
<section class="introduction"> <section class="passwordreset container">
<header>
<h1>{% trans "Your Password Reset is Complete" %}</h1>
</header>
</section>
{% block content %} {% block content %}
<div role="main" class="content"> <section role="main" class="content">
{% blocktrans with link_start='<a href="/login">' link_end='</a>' %} {% blocktrans with link_start='<a href="/login">' link_end='</a>' %}
Your password has been set. You may go ahead and {{ link_start }}log in{{ link_end }} now. Your password has been set. You may go ahead and {{ link_start }}log in{{ link_end }} now.
{% endblocktrans %} {% endblocktrans %}
</div> </section>
{% endblock %} {% endblock %}
</div> </section>
</div> {% endblock %}
lms/templates/registration/password_reset_confirm.html
{% extends "main_django.html" %}
{% load i18n %} {% load i18n %}
{% load compressed %}
{% load staticfiles %}
<!DOCTYPE html>
<html lang="{{LANGUAGE_CODE}}">
<head>
{% block title %}
<title> <title>
{% blocktrans with platform_name=platform_name %} {% blocktrans with platform_name=platform_name %}
Reset Your {{ platform_name }} Password Reset Your {{ platform_name }} Password
{% endblocktrans %} {% endblocktrans %}
</title> </title>
{% endblock %}
{% compressed_css 'style-vendor' %} {% block bodyextra %}
{% compressed_css 'style-app' %}
{% compressed_css 'style-app-extend1' %}
{% compressed_css 'style-app-extend2' %}
{% block main_vendor_js %}
{% compressed_js 'main_vendor' %}
{% endblock %}
<!--[if lt IE 9]>
<script src="{% static 'js/html5shiv.js' %}"></script>
<![endif]-->
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
...@@ -45,38 +31,31 @@ ...@@ -45,38 +31,31 @@
}); });
}); });
</script> </script>
{% endblock %}
</head> {% block bodyclass %}view-passwordreset{% endblock %}
<body class="view-passwordreset"> {% block body %}
<section class="introduction">
<header class="global"> <header>
<nav> <h1 class="title">
<h1 class="logo"> <span class="title-super">
<a href="{{MKTG_URL_ROOT}}"><img src="{% static 'images/header-logo.png' %}"></a>
</h1>
</nav>
</header>
<section class="content-wrapper">
<section class="passwordreset container">
<section class="introduction">
<header>
<h1>
{% blocktrans with platform_name=platform_name %} {% blocktrans with platform_name=platform_name %}
Reset Your {{ platform_name }} Password Reset Your {{ platform_name }} Password
{% endblocktrans %} {% endblocktrans %}
</h1> </span>
</header> </h1>
</section> </header>
</section>
<section class="passwordreset container">
<section role="main" class="content"> <section role="main" class="content">
{% if validlink %} {% if validlink %}
<header> <header>
<h2 class="sr">{% trans "Password Reset Form" %}</h2> <h2 class="sr">{% trans "Password Reset Form" %}</h2>
</header> </header>
<form role="form" id="passwordreset-form" method="post" data-remote="true" action="">{% csrf_token %} <form role="form" id="passwordreset-form" method="post" action="">{% csrf_token %}
<!-- status messages --> <!-- status messages -->
<div role="alert" class="status message"> <div role="alert" class="status message">
<h3 class="message-title"> <h3 class="message-title">
...@@ -164,4 +143,4 @@ ...@@ -164,4 +143,4 @@
</div> </div>
</aside> </aside>
</section> </section>
</section> {% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment