Note: The default ITS GitLab runner is a shared resource and is subject to slowdowns during heavy usage.
You can run your own GitLab runner that is dedicated just to your group if you need to avoid processing delays.

Commit 4a7e8056 authored by Kris Steinhoff's avatar Kris Steinhoff
Browse files

Merge branch 'overridden-accounts-pages' into 'master'

Style Remaining Django Accounts Pages

Closes #4

See merge request !5
parents 4d0d21d3 9694a5c0
Pipeline #17934 passed with stage
in 15 seconds
......@@ -2,15 +2,15 @@
{% block content %}
{% if form.errors %}
<p>Your username and password didn't match. Please try again.</p>
<div class="alert alert-danger" role="alert">Your username and password didn't match. Please try again.</div>
{% endif %}
{% if next %}
{% if user.is_authenticated %}
<p>Your account doesn't have access to this page. To proceed,
please login with an account that has access.</p>
<div class="alert alert-danger" role="alert">Your account doesn't have access to this page. To proceed,
please login with an account that has access.</div>
{% else %}
<p>Please login to see this page.</p>
<div class="alert alert-danger" role="alert">Please login to see this page.</div>
{% endif %}
{% endif %}
......@@ -21,11 +21,11 @@
<div class="form-row">
<div class="form-group col-md-6">
<label for="username">Username</label>
<input class="form-control" type="text" placeholder="Username" autofocus autocapitalize="none" autocomplete="username" maxlength="150" required id="username">
<input class="form-control" name="username" type="text" placeholder="Username" autofocus autocapitalize="none" autocomplete="username" maxlength="150" required id="username">
</div>
<div class="form-group col-md-6">
<label for="password">Password</label>
<input class="form-control" type="password" placeholder="Password" autofocus autocomplete="current-password" required id="password">
<input class="form-control" name="password" type="password" placeholder="Password" autofocus autocomplete="current-password" required id="password">
</div>
</div>
<button type="submit" class="btn btn-primary">Login</button>
......
{% extends 'base.html' %}
{% block content %}
<div class="card">
<div class="card-body">
<p>Your password has been set. You may go ahead and <a href="{% url 'login' %}">sign in</a> now.</p>
</div>
</div>
{% endblock %}
{% extends 'base.html' %}
{% block content %}
{% if validlink %}
<h1>Change password</h1>
<form method="post">
{% csrf_token %}
<div class="form-group">
<label for="new_password">New password:</label>
<input class="form-control" type="password" name="new_password1" autocomplete="new-password" placeholder="New password" required id="new_password">
</div>
<ul>
<li>Your password can’t be too similar to your other personal information.</li>
<li>Your password must contain at least 8 characters.</li>
<li>Your password can’t be a commonly used password.</li>
<li>Your password can’t be entirely numeric.</li>
{% for field, errors in form.errors.items %}
{% for error in errors %}
<li>{{ error }}</li>
{% endfor %}
{% endfor %}
</ul>
<div class="form-group">
<label for="new_password_confirmation">New password confirmation:</label>
<input class="form-control" type="password" name="new_password2" autocomplete="new-password" placeholder="New password confirmation" required id="new_password_confirmation">
</div>
<button type="submit" class="btn btn-primary">Change password</button>
</form>
{% else %}
<div class="alert alert-danger" role="alert">
The password reset link was invalid, possibly because it has already been used.
Please request a new password reset.
</div>
{% endif %}
{% endblock %}
{% extends 'base.html' %}
{% block content %}
<div class="card">
<div class="card-body">
<p>
We've emailed you instructions for setting your password, if an account exists with the email you entered.
You should receive them shortly.
</p>
<p>
If you don't receive an email, please make sure you've entered the address you registered with,
and check your spam folder.
</p>
</div>
</div>
{% endblock %}
{% extends "base.html" %}
{% block content %}
{% if form.errors %}
<div class="alert alert-danger" role="alert">Enter a valid email address.</div>
{% endif %}
<div class="card">
<div class="card-body">
<p>Forgotten your password? Enter your email address below, and we’ll email instructions for setting a new one.</p>
<form method="post" action="{% url 'password_reset' %}">
{% csrf_token %}
<fieldset>
<div class="form-group">
<label for="email" class="sr-only">Email</label>
<input class="form-control" type="email" name="email" autocomplete="email" maxlength="254" required id="email" placeholder="Email">
</div>
<button type="submit" class="btn btn-primary">Reset my password</button>
</fieldset>
</form>
</div>
</div>
{% endblock %}
......@@ -44,7 +44,7 @@
</div>
</nav>
<main role="main" class="container-fluid pt-2">
<main role="main" class="container mt-3">
<div>
{% block content %}
{% 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