Skip to content

gs #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
adampalay wants to merge 1 commit into from
Closed

gs #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions lms/templates/registration/password_reset_complete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<%! from django.utils.translation import ugettext as _ %>
{% load i18n %}
{% load compressed %}
{% load staticfiles %}
<!DOCTYPE html>
<html>
<head>

<title>${_("Your Password Reset is Complete")}</title>
<title>{% trans "Your Password Reset is Complete" %}</title>

{% compressed_css 'application' %}

Expand Down Expand Up @@ -54,13 +53,15 @@ <h1 class="logo">
<section class="passwordreset container">
<section class="introduction">
<header>
<h1>${_("Your Password Reset is Complete")}</h1>
<h1>{% trans "Your Password Reset is Complete" %}</h1>
</header>
</section>

{% block content %}
<section role="main" class="content">
<p>${_('Your password has been set. You may go ahead and {link_start}log in{link_end} now.').format(link_start='<a href="/login">', link_end='</a>')}</p>
{% 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 %}
</section>
{% endblock %}
</section>
Expand Down
41 changes: 20 additions & 21 deletions lms/templates/registration/password_reset_confirm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<%! from django.utils.translation import ugettext as _ %>
{% load i18n %}
{% load compressed %}
{% load staticfiles %}
<!DOCTYPE html>
<html>
<head>

<title>${_("Reset Your {platform_name} Password").format(platform_name=settings.PLATFORM_NAME)}</title>
<title>{% trans "Reset Your edX Password" %}</title>

{% compressed_css 'application' %}

Expand Down Expand Up @@ -53,78 +53,77 @@ <h1 class="logo">
<section class="passwordreset container">
<section class="introduction">
<header>
<h1>${_("Reset Your {platform_name} Password").format(platform_name=settings.PLATFORM_NAME)}</h1>
<h1>{% trans "Reset Your edX Password" %}</h1>
</header>
</section>

<section role="main" class="content">
{% if validlink %}
<header>
<h2 class="sr">${_("Password Reset Form")}</h2>
<h2 class="sr">{% trans "Password Reset Form" %}</h2>
</header>

<form role="form" id="passwordreset-form" method="post" data-remote="true" action="">{% csrf_token %}
<!-- status messages -->
<div role="alert" class="status message">
<h3 class="message-title">${_("We're sorry, {platform_name} enrollment is not available in your region").format(platform_name=settings.PLATFORM_NAME)}</h3>
<h3 class="message-title">{% trans "We're sorry, edX enrollment is not available in your region" %}</h3>
</div>

<div role="alert" class="status message submission-error">
<h3 class="message-title">${_("The following errors occured while processing your registration: ")}</h3>
<h3 class="message-title">{% trans "The following errors occured while processing your registration: " %}</h3>
<ul class="message-copy">
<li>${_("You must complete all fields.")}</li>
<li>${_("The two password fields didn't match.")}</li>
<li>{% trans "You must complete all fields." %}</li>
<li>{% trans "The two password fields didn't match." %}</li>
</ul>
</div>

<div role="alert" class="status message system-error">
<h3 class="message-title">${_("We're sorry, our systems seem to be having trouble processing your password reset")}</h3>
<p class="message-copy">${_('Someone has been made aware of this issue. Please try again shortly. Please <a href="{{MKTG_URL_CONTACT}}">contact us</a> about any concerns you have.')}</p>
<h3 class="message-title">{% trans "We're sorry, our systems seem to be having trouble processing your password reset" %}</h3>
<p class="message-copy">{% trans 'Someone has been made aware of this issue. Please try again shortly. Please <a href="{{MKTG_URL_CONTACT}}">contact us</a> about any concerns you have.' %}</p>
</div>

<p class="instructions">
${_('Please enter your new password twice so we can verify you typed it in correctly. <br /> '
'Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>.')}
{% trans 'Please enter your new password twice so we can verify you typed it in correctly. <br /> Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>.' %}
</p>

<fieldset class="group group-form group-form-requiredinformation">
<legend class="sr">${_("Required Information")}</legend>
<legend class="sr">{% trans "Required Information" %}</legend>

<ol class="list-input">
<li class="field required password" id="field-new_password1">
<label for="new_password1">${_("Your New Password")}</label>
<label for="new_password1">{% trans "Your New Password" %}</label>
<input id="new_password1" type="password" name="new_password1" placeholder="*****" />
</li>
<li class="field required password" id="field-new_password2">
<label for="new_password2">${_("Your New Password Again")}</label>
<label for="new_password2">{% trans "Your New Password Again" %}</label>
<input id="new_password2" type="password" name="new_password2" placeholder="*****" />
</li>
</ol>
</fieldset>

<div class="form-actions">
<button name="submit" type="submit" id="submit" class="action action-primary action-update">${_("Change My Password")}</button>
<button name="submit" type="submit" id="submit" class="action action-primary action-update">{% trans "Change My Password" %}</button>
</div>
</form>

{% else %}

<header>
<h2 class="sr">${_("Your Password Reset Was Unsuccessful")}</h2>
<h2 class="sr">{% trans "Your Password Reset Was Unsuccessful" %}</h2>
</header>
<p>${_('The password reset link was invalid, possibly because the link has already been used. Please return to the <a href="/login">login page</a> and start the password reset process again.')}</p>
<p>{% trans 'The password reset link was invalid, possibly because the link has already been used. Please return to the <a href="/login">login page</a> and start the password reset process again.' %}</p>

{% endif %}
</section>

<aside role="complementary">
<header>
<h3 class="sr">${_("Password Reset Help")}</h3>
<h3 class="sr">{% trans "Password Reset Help" %}</h3>
</header>

<div class="cta cta-help">
<h3>${_("Need Help?")}</h3>
<p>${_('View our <a href="{{MKTG_URL_FAQ}}">help section for contact information and answers to commonly asked questions</a>')}</p>
<h3>{% trans "Need Help?" %}</h3>
<p>{% trans 'View our <a href="{{MKTG_URL_FAQ}}">help section for contact information and answers to commonly asked questions</a>' %}</p>
</div>
</aside>
</section>
Expand Down