Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make use of django_main for password_reset templates

Browse Source 
Remove duplicated code and make sure those views use the same visual
identity.
This commit is contained in:
Bertrand Marron
2014-06-18 11:59:15 +02:00
parent 14de1a3f9e
commit 879232af46
2 changed files with 40 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lms/templates/registration/password_reset_complete.html
View File

@@ -1,25 +1,11 @@
{% extends "main_django.html" %}
{% load i18n %}
{% load compressed %}
{% load staticfiles %}
<!DOCTYPE html>
<html lang="{{LANGUAGE_CODE}}">
<head>
<title>{% trans "Your Password Reset is Complete" %}</title>
{% 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 %}
<!--[if lt IE 9]>
<script src="{% static 'js/html5shiv.js' %}"></script>
<![endif]-->
{% block title %}
<title>{% trans "Your Password Reset is Complete" %}</title>
{% endblock %}
{% block bodyextra %}
<script type="text/javascript">
$(function() {
@@ -41,33 +27,28 @@
});
});
</script>
{% endblock %}
</head>
{% block bodyclass %}view-passwordreset{% endblock %}
<body class="view-passwordreset">
<header class="global">
<nav>
<h1 class="logo">
<a href="{{MKTG_URL_ROOT}}"><img src="{% static 'images/header-logo.png' %}"></a>
</h1>
</nav>
</header>
<div class="content-wrapper">
<div class="passwordreset container">
<section class="introduction">
<header>
<h1>{% trans "Your Password Reset is Complete" %}</h1>
</header>
</section>
{% block body %}
<section class="introduction">
<header>
<h1 class="title">
<span class="title-super">
{% trans "Your Password Reset is Complete" %}
</span>
</h1>
</header>
</section>
<section class="passwordreset container">
{% block content %}
<div role="main" class="content">
<section role="main" class="content">
{% 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.
{% endblocktrans %}
</div>
</section>
{% endblock %}
</div>
</div>
</section>
{% endblock %}

57
lms/templates/registration/password_reset_confirm.html
View File

@@ -1,29 +1,15 @@
{% extends "main_django.html" %}
{% load i18n %}
{% load compressed %}
{% load staticfiles %}
<!DOCTYPE html>
<html lang="{{LANGUAGE_CODE}}">
<head>
{% block title %}
<title>
{% blocktrans with platform_name=platform_name %}
Reset Your {{ platform_name }} Password
{% endblocktrans %}
</title>
{% 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 %}
<!--[if lt IE 9]>
<script src="{% static 'js/html5shiv.js' %}"></script>
<![endif]-->
{% block bodyextra %}
<script type="text/javascript">
$(function() {
@@ -45,38 +31,31 @@
});
});
</script>
{% endblock %}
</head>
{% block bodyclass %}view-passwordreset{% endblock %}
<body class="view-passwordreset">
<header class="global">
<nav>
<h1 class="logo">
<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>
{% block body %}
<section class="introduction">
<header>
<h1 class="title">
<span class="title-super">
{% blocktrans with platform_name=platform_name %}
Reset Your {{ platform_name }} Password
{% endblocktrans %}
</h1>
</header>
</section>
</span>
</h1>
</header>
</section>
<section class="passwordreset container">
<section role="main" class="content">
{% if validlink %}
<header>
<h2 class="sr">{% trans "Password Reset Form" %}</h2>
</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 -->
<div role="alert" class="status message">
<h3 class="message-title">
@@ -164,4 +143,4 @@
</div>
</aside>
</section>
</section>
{% endblock %}