Skip to content

E
edx-platform
Commit 7260094e by frances botsford
Options

Merge pull request #4145 from IONISx/tusbar/rewrite-password-reset-templates 

Make use of django_main for password_reset templates
parents 4815adb6 bd1e25ba
Showing with 43 additions and 186 deletions
lms/static/sass/application-extend1.scss.mako
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
@import 'multicourse/media-kit'; @import 'multicourse/media-kit';
@import 'multicourse/about_pages'; @import 'multicourse/about_pages';
@import 'multicourse/press_release'; @import 'multicourse/press_release';
@import 'multicourse/password_reset';
@import 'multicourse/error-pages'; @import 'multicourse/error-pages';
@import 'multicourse/help'; @import 'multicourse/help';
@import 'multicourse/edge'; @import 'multicourse/edge';
......
lms/static/sass/base/_variables.scss
...@@ -382,6 +382,7 @@ $homepage-bg-image: none; ...@@ -382,6 +382,7 @@ $homepage-bg-image: none;
$login-banner-image: url(../images/bg-banner-account.png); $login-banner-image: url(../images/bg-banner-account.png);
$register-banner-image: url(../images/bg-banner-account.png); $register-banner-image: url(../images/bg-banner-account.png);
$passwordreset-banner-image: url(../images/bg-banner-account.png);
$video-thumb-url: '../images/courses/video-thumb.jpg'; $video-thumb-url: '../images/courses/video-thumb.jpg';
......
lms/static/sass/multicourse/_account.scss
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
} }
.introduction { .introduction {
padding: ($baseline*2) $baseline 0 $baseline; padding: 0;
header { header {
position: relative; position: relative;
...@@ -423,6 +423,7 @@ ...@@ -423,6 +423,7 @@
button[type="submit"] { button[type="submit"] {
@extend %m-btn-primary; @extend %m-btn-primary;
@extend %t-action2;
&:disabled, &.is-disabled { &:disabled, &.is-disabled {
opacity: 0.3; opacity: 0.3;
...@@ -533,8 +534,6 @@ ...@@ -533,8 +534,6 @@
} }
.introduction { .introduction {
padding: 0;
header { header {
height: 120px; height: 120px;
border-bottom: 1px solid $m-gray; border-bottom: 1px solid $m-gray;
...@@ -547,8 +546,6 @@ ...@@ -547,8 +546,6 @@
.view-register { .view-register {
.introduction { .introduction {
padding: 0;
header { header {
height: 120px; height: 120px;
border-bottom: 1px solid $m-gray; border-bottom: 1px solid $m-gray;
...@@ -559,26 +556,21 @@ ...@@ -559,26 +556,21 @@
// password reset // password reset
.view-passwordreset { .view-passwordreset {
background: $sidebar-color;
header.global { header.global .nav-courseware .cta-login {
display: none;
h1 {
float: none;
}
} }
.introduction { .introduction {
width: auto; header {
padding: 0; height: 120px;
border-bottom: 1px solid $m-gray;
header h1 { background: transparent $passwordreset-banner-image 0 0 no-repeat;
margin: 0;
} }
} }
.content { .content {
margin-top: 0; padding: 0;
} }
} }
......
lms/static/sass/multicourse/_password_reset.scss deleted 100644 → 0
.password-reset {
background: rgb(245,245,245);
border: 1px solid rgb(200,200,200);
border-radius: 4px;
@include box-sizing(border-box);
box-shadow: 0 5px 50px 0 rgba(0,0,0, 0.3);
margin: 120px auto 0;
padding: 0px 40px 40px;
width: flex-grid(5);
header {
margin-bottom: 30px;
overflow: hidden;
padding: 28px 20px 0px;
position: relative;
z-index: 2;
&::before {
@include background-image(radial-gradient(50% 50%, circle closest-side, rgba(255,255,255, 0.8) 0%, rgba(255,255,255, 0) 100%));
content: "";
display: block;
height: 400px;
left: 0px;
margin: 0 auto;
position: absolute;
top: -140px;
width: 100%;
z-index: 1;
}
hr {
@extend %faded-hr-divider-light;
border: none;
margin: 0px;
position: relative;
z-index: 2;
&::after {
@extend %faded-hr-divider;
bottom: 0px;
content: "";
display: block;
position: absolute;
top: -1px;
}
}
h2 {
position: relative;
text-align: center;
text-shadow: 0 1px rgba(255,255,255, 0.4);
z-index: 2;
}
}
> p {
margin-bottom: 20px;
}
form {
margin-bottom: 12px;
position: relative;
z-index: 2;
label {
display: none;
}
input[type="checkbox"] {
margin-right: 5px;
}
input[type="email"],
input[type="text"],
input[type="password"] {
border: 1px solid red !important;
background: rgb(255,255,255);
display: block;
height: 45px;
margin-bottom: 20px;
width: 100%;
}
.submit {
padding-top: 10px;
input[type="submit"] {
display: block;
height: 45px;
margin: 0 auto;
width: 100%;
}
}
}
}
lms/static/sass/shared/_footer.scss
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
} }
// marketing site design syncing // marketing site design syncing
.view-register, .view-login { .view-register, .view-login, .view-passwordreset {
.wrapper-footer footer { .wrapper-footer footer {
width: 960px; width: 960px;
......
lms/static/sass/shared/_header.scss
...@@ -298,7 +298,7 @@ header.global { ...@@ -298,7 +298,7 @@ header.global {
} }
// marketing site design syncing // marketing site design syncing
.view-register, .view-login { .view-register, .view-login, .view-passwordreset {
header.global nav { header.global nav {
width: 960px; width: 960px;
......
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">
<header class="global"> {% block body %}
<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"> <section class="introduction">
<header> <header>
<h1>{% trans "Your Password Reset is Complete" %}</h1> <h1 class="title">
<span class="title-super">
{% trans "Your Password Reset is Complete" %}
</span>
</h1>
</header> </header>
</section> </section>
<section class="passwordreset container">
{% 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">
<header class="global"> {% block body %}
<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"> <section class="introduction">
<header> <header>
<h1> <h1 class="title">
<span class="title-super">
{% blocktrans with platform_name=platform_name %} {% blocktrans with platform_name=platform_name %}
Reset Your {{ platform_name }} Password Reset Your {{ platform_name }} Password
{% endblocktrans %} {% endblocktrans %}
</span>
</h1> </h1>
</header> </header>
</section> </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