{%block contents%}
{%if success%}
-<h1>Email changed</h1>
+<h1>Email changed <i class="fas fa-envelope"></i></h1>
<p>
Your email has successfully been changed to {{user.email}}.
</p>
out and back in again for the email to be updated on that site.
</p>
{%else%}
-<h1>Change email</h1>
+<h1>Change email <i class="fas fa-envelope"></i></h1>
<p>
The token <code>{{token}}</code> was not found.
</p>
{%extends "base/page.html"%}
+{% load pgfilters %}
{%block title%}Change email{%endblock%}
{%block contents%}
-<h1>Change email</h1>
+<h1>Change email <i class="fas fa-envelope"></i></h1>
{%if token%}
<h2>Awaiting confirmation</h2>
<p>
{%endif%}
<form method="post" action=".">{% csrf_token %}
-
-<table class="pgGenericFormTable">
-{%if form.errors %}
- <tr class="errorheader">
- <td colspan="2">Please correct the errors below, and re-submit the form.</td>
- </tr>
-{%endif%}
-{%for field in form%}
- {%if field.errors %}
- <tr class="error">
- <td colspan="2">{{field.errors.as_ul}}</td>
- </tr>
- {%endif%}
- <tr {%if field.errors%}class="errorinfo"{%endif%}>
- <th>{{field.label_tag}}{%if field.help_text %}<br/>
- <span class="formfieldhelp">{{field.help_text}}</span>{%endif%}</th>
- <td>{{field}}</td>
- </tr>
-{%endfor%}
-</table>
-
-<input type="submit" value="Change email" />
+ {% if form.errors %}
+ <div class="alert alert-danger" role="alert">
+ Please correct the errors below, and re-submit the form.
+ </div>
+ {% endif %}
+ {% for field in form %}
+ <div class="form-group row">
+ {% if field.errors %}
+ {% for e in field.errors %}
+ <div class="col-lg-12 alert alert-danger">{{e}}</div>
+ {% endfor %}
+ {% endif %}
+ <label class="col-form-label col-sm-3" for="{{ field.id }}">
+ {{ field.label|title }}
+ {% if field.help_text %}
+ <p><small>{{ field.help_text }}</small></p>
+ {% endif %}
+ </label>
+ <div class="col-sm-9">
+ {{ field|field_class:"form-control" }}
+ </div>
+ </div>
+ {% endfor %}
+ <div class="submit-row">
+ <input class="btn btn-primary" type="submit" value="Change Email" />
+ </div>
</form>
{%endblock%}
{%extends "base/page.html"%}
{%block title%}Your account{%endblock%}
{%block contents%}
-<h1>Your account</h1>
+<h1>Your account <i class="far fa-address-card"></i></h1>
<p>
From this section, you can manage all information on this site connected
to your PostgreSQL community account. Other than your basic profile
{%extends "base/page.html"%}
{%block contents%}
-<h1>Sign in</h1>
+<h1>Sign in <i class="fas fa-sign-in-alt"></i></h1>
<p>
{%if sitename%}
The website you are trying to log in to ({{sitename}}) is using the
{%endfor%}
{%endif%}
<form action="." method="post" id="login-form">{% csrf_token %}
- <div class="form-row">
- <label for="id_username">Username:</label> <input type="text" name="username" id="id_username" />
+ <div class="form-group">
+ <input type="text" class="form-control" name="username" id="id_username" placeholder="Username" />
</div>
- <div class="form-row">
- <label for="id_password">Password:</label> <input type="password" name="password" id="id_password" />
+ <div class="form-group">
+ <input type="password" class="form-control" name="password" id="id_password" placeholder="Password"/>
<input type="hidden" name="this_is_the_login_form" value="1" />
<input type="hidden" name="next" value="{{next}}" />
</div>
<div class="submit-row">
- <label> </label><input type="submit" value="Sign in with community account password" />
+ <input class="btn btn-primary" type="submit" value="Community Sign-In">
</div>
</form>
{%extends "base/page.html"%}
{%block title%}Your account{%endblock%}
{%block contents%}
-<h1>{{title}}s</h1>
+<h1>{{title}}s <i class="fas fa-th-list"></i></h1>
<p>
Objects in red are awaiting moderator approval. Note that modifying a previously
approved object <em>may</em> result in it being un-approved if the changes are
{%extends "base/page.html"%}
{%block title%}Organisations{%endblock%}
{%block contents%}
-<h1>Organisations</h1>
+<h1>Organisations <i class="fa fa-users"></i></h1>
<p>
The following organisations are registered in our database. Note that any
organisations listed as <em>Migrated Connections</em> are organisations that
letting us know this, and including the name of your community account.
We will then link your account to this organisation.
</p>
-<table>
- <tr>
- <th>Organisation</th>
- <th>Manager</th>
- </tr>
-{%for o in orgs%}
- <tr>
- <td>{{o.name}}</td>
- <td>{%for m in o.managers.all%}{{m.first_name}} {{m.last_name}}{%if not forloop.last%}<br/>{%endif%}{%endfor%}</td>
- </tr>
-{%endfor%}
+<table class="table table-striped">
+ <thead class="thead-light">
+ <tr>
+ <th>Organisation</th>
+ <th>Manager</th>
+ </tr>
+ </thead>
+ <tbody>
+ {%for o in orgs%}
+ <tr>
+ <th scope="row">{{o.name}}</th>
+ <td>{%for m in o.managers.all%}{{m.first_name}} {{m.last_name}}{%if not forloop.last%}<br/>{%endif%}{%endfor%}</td>
+ </tr>
+ {%endfor%}
+ </tbody>
</table>
{%endblock%}
{%extends "base/page.html"%}
+{% load pgfilters %}
{%block title%}Change password{%endblock%}
{%block contents%}
-<h1>Change password</h1>
+<h1>Change password <i class="fas fa-lock"></i></h1>
<p>
From this form you can change the password of your community account.
</p>
-<form action="." method="post" id="login-form">{% csrf_token %}
- <div class="form-row">
- {{ form.old_password.errors }}
- <label for="id_old_password">Old password:</label>{{ form.old_password }}
+<form action="." method="post" id="login-form">
+ {% csrf_token %}
+ <div class="form-group row">
+ {% if form.old_password.errors %}
+ {% for e in form.old_password.errors %}
+ <div class="col-lg-12 alert alert-danger">{{e}}</div>
+ {% endfor %}
+ {% endif %}
+ <label class="col-form-label col-sm-3" for="id_old_password">Old Password:</label>
+ <div class="col-sm-9">
+ {{ form.old_password|field_class:"form-control" }}
+ </div>
</div>
- <div class="form-row">
- {{ form.new_password1.errors }}
- <label for="id_new_password1">New password</label>{{ form.new_password1 }}
+ <div class="form-group row">
+ {% if form.old_password.errors %}
+ {% for e in form.new_password1.errors %}
+ <div class="col-lg-12 alert alert-danger">{{e}}</div>
+ {% endfor %}
+ {% endif %}
+ <label class="col-form-label col-sm-3" for="id_new_password1">New Password:</label>
+ <div class="col-sm-9">
+ {{ form.new_password1|field_class:"form-control" }}
+ </div>
</div>
- <div class="form-row">
- {{ form.new_password2.errors }}
- <label for="id_new_password2">Confirm password:</label>{{ form.new_password2 }}
+ <div class="form-group row">
+ {% if form.new_password2.errors %}
+ {% for e in form.new_password2.errors %}
+ <div class="col-lg-12 alert alert-danger">{{e}}</div>
+ {% endfor %}
+ {% endif %}
+ <label class="col-form-label col-sm-3" for="id_new_password2">Confirm New Password:</label>
+ <div class="col-sm-9">
+ {{ form.new_password2|field_class:"form-control" }}
+ </div>
</div>
<div class="submit-row">
- <label> </label><input type="submit" value="Change password" />
+ <label> </label><input class="btn btn-primary" type="submit" value="Change Password" />
</div>
</form>
{%extends "base/page.html"%}
{%block title%}Password changed{%endblock%}
{%block contents%}
-<h1>Change password</h1>
+<h1>Change password <i class="fas fa-lock"></i></h1>
<p>
Your password has been changed.
</p>
{%block title%}Password reset{%endblock%}
{%block contents%}
-<h1>Password reset</h1>
+<h1>Password reset <i class="fas fa-key"></i></h1>
<p>
If you've forgotten your password, you can enter your email address in the field below
and we'll email you instructions for setting a new one.
</p>
<form action="" method="post">{% csrf_token %}
- <div class="form-row">
-{{ form.email.errors }}
- <label for="id_email">E-mail address</label> {{ form.email }} <input type="submit" value="Reset my password" />
+ <div class="form-group">
+ {{ form.email.errors }}
+ {{ form.email }}
</div>
+ <button type="submit" class="btn btn-primary">Reset Password</button>
</form>
{% endblock %}
{%extends "base/page.html"%}
{%block contents%}
-<h1>Password reset complete</h1>
+<h1>Password reset complete <i class="fas fa-key"></i></h1>
<p>Your password has been reset.</p>
+<p><a class="btn btn-primary" href="/account/login/">Go to Login</a>
{% endblock %}
{%extends "base/page.html"%}
+{% load pgfilters %}
{%block title%}Password reset{%endblock%}
{%block contents%}
{% if validlink %}
-<h1>Enter new password</h1>
+<h1>Enter new password <i class="fas fa-key"></i></h1>
<p>Please enter your new password twice so we can verify you typed it in correctly.</p>
-<form action="" method="post">{% csrf_token %}
- <div class="form-row">
- {{ form.new_password1.errors }}
- <label for="id_new_password1">New password:</label>{{ form.new_password1 }}
+<form action="" method="post">
+ {% csrf_token %}
+ <div class="form-group row">
+ {% if form.new_password1.errors %}
+ {% for e in form.new_password1.errors %}
+ <div class="col-lg-12 alert alert-danger">{{e}}</div>
+ {% endfor %}
+ {% endif %}
+ <label class="col-form-label col-sm-3" for="id_new_password1">New Password:</label>
+ <div class="col-sm-9">
+ {{ form.new_password1|field_class:"form-control" }}
+ </div>
</div>
- <div class="form-row">
- {{ form.new_password2.errors }}
- <label for="id_new_password2">Confirm password:</label>{{ form.new_password2 }}
+ <div class="form-group row">
+ {% if form.new_password2.errors %}
+ {% for e in form.new_password2.errors %}
+ <div class="col-lg-12 alert alert-danger">{{e}}</div>
+ {% endfor %}
+ {% endif %}
+ <label class="col-form-label col-sm-3" for="id_new_password2">Confirm New Password:</label>
+ <div class="col-sm-9">
+ {{ form.new_password2|field_class:"form-control" }}
+ </div>
</div>
<div class="submit-row">
- <label> </label><input type="submit" value="Change password" />
+ <label> </label><input class="btn btn-primary" type="submit" value="Change Password" />
</div>
</form>
{% else %}
-<h1>Password reset unsuccessful</h1>
+<h1>Password reset unsuccessful <i class="fas fa-key"></i></h1>
<p>The password reset link was invalid, possibly because it has already been used. Please request a new password reset.</p>
{%block title%}Password reset{%endblock%}
{%block contents%}
-<h1>Password reset</h1>
+<h1>Password reset <i class="fas fa-key"></i></h1>
<p>
We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly.
</p>
{%extends "base/page.html"%}
+{% load pgfilters %}
{%block title%}Edit user profile{%endblock%}
{%block contents%}
-<h1>Edit user profile</h1>
-<form method="post" action=".">{% csrf_token %}
+<h1>Edit User Profile <i class="far fa-address-card"></i></h1>
-<table class="pgGenericFormTable">
-{%if userform.errors or profileform.errors or contribform.errors %}
- <tr class="errorheader">
- <td colspan="2">Please correct the errors below, and re-submit the form.</td>
- </tr>
-{%endif%}
- <tr>
- <th>Username</th>
- <td>{{user.username}}</td>
- </tr>
- <tr>
- <th>Email</th>
- <td>{{user.email}} {%if can_change_email%}(<em><a href="change_email/">change</a></em>){%else%}
-<br/><br/>
-The email address of this account cannot be changed, because the account does
-not have a local password, most likely because it's connected to a third
-party system (such as Google or Facebook).
-{%endif%}</td>
- </tr>
-{%for field in userform%}
- {%if field.errors %}
- <tr class="error">
- <td colspan="2">{{field.errors.as_ul}}</td>
- </tr>
- {%endif%}
- <tr {%if field.errors%}class="errorinfo"{%endif%}>
- <th>{{field.label_tag}}{%if field.help_text %}<br/>
- <span class="formfieldhelp">{{field.help_text}}</span>{%endif%}</th>
- <td>{{field}}</td>
- </tr>
-{%endfor%}
-{%for field in profileform%}
- {%if field.errors %}
- <tr class="error">
- <td colspan="2">{{field.errors.as_ul}}</td>
- </tr>
- {%endif%}
- <tr {%if field.errors%}class="errorinfo"{%endif%}>
- <th>{{field.label_tag}}{%if field.help_text %}<br/>
- <span class="formfieldhelp">{{field.help_text}}</span>{%endif%}</th>
- <td>{{field}}</td>
- </tr>
-{%endfor%}
-</table>
-
-{%if contribform%}
-<h2>Edit contributor information</h2>
-<p>
-You can edit the information that's shown on the
-<a href="/community/contributors/">contributors</a> page. Please be
-careful as your changes will take effect immediately.
-</p>
-<table class="pgGenericFormTable">
-{%for field in contribform%}
- {%if field.errors %}
- <tr class="error">
- <td colspan="2">{{field.errors.as_ul}}</td>
- </tr>
- {%endif%}
- <tr {%if field.errors%}class="errorinfo"{%endif%}>
- <th>{{field.label_tag}}{%if field.help_text %}<br/>
- <span class="formfieldhelp">{{field.help_text}}</span>{%endif%}</th>
- <td>{{field}}</td>
- </tr>
-{%endfor%}
-</table>
-{%endif%}
-
-<input type="submit" value="Save" />
+<form method="post" action=".">
+ {% csrf_token %}
+ {% if userform.errors or profileform.errors or contribform.errors %}
+ <div class="alert alert-danger" role="alert">
+ Please correct the errors below, and re-submit the form.
+ </div>
+ {% endif %}
+ <div class="form-group row">
+ <label class="col-form-label col-sm-3">Username:</label>
+ <div class="col-sm-9">
+ {{ user.username }}
+ </div>
+ </div>
+ <div class="form-group row">
+ <label class="col-form-label col-sm-3">Email:</label>
+ <div class="col-sm-9">
+ {{ user.email }}
+ {% if can_change_email %}
+ (<em><a href="change_email/">change</a></em>)
+ {% else %}
+ <p><em>The email address of this account cannot be changed, because the account does
+ not have a local password, most likely because it's connected to a third
+ party system (such as Google or Facebook).</em></p>
+ {% endif %}
+ </div>
+ </div>
+ {% for field in userform %}
+ <div class="form-group row">
+ {% if field.errors %}
+ {% for e in field.errors %}
+ <div class="col-lg-12 alert alert-danger">{{e}}</div>
+ {% endfor %}
+ {% endif %}
+ <label class="col-form-label col-sm-3" for="{{ field.id }}">
+ {{ field.label|title }}
+ {% if field.help_text %}
+ <p><small>{{ field.help_text }}</small></p>
+ {% endif %}
+ </label>
+ <div class="col-sm-9">
+ {{ field|field_class:"form-control" }}
+ </div>
+ </div>
+ {% endfor %}
+ {% for field in profileform %}
+ <div class="form-group row">
+ {% if field.errors %}
+ {% for e in field.errors %}
+ <div class="col-lg-12 alert alert-danger">{{e}}</div>
+ {% endfor %}
+ {% endif %}
+ <label class="col-form-label col-sm-3" for="{{ field.id }}">
+ {{ field.label }}
+ {% if field.help_text %}
+ <p><small>{{ field.help_text }}</small></p>
+ {% endif %}
+ </label>
+ <div class="col-sm-9">
+ {{ field|field_class:"form-control" }}
+ </div>
+ </div>
+ {% endfor %}
+ {% if contribform %}
+ <h2>Edit contributor information</h2>
+ <p>You can edit the information that's shown on the <a href="/community/contributors/" target="_blank">contributors</a> page. Please be careful as your changes will take effect immediately!
+ </p>
+ {% for field in contribform %}
+ <div class="form-group row">
+ {% if field.errors %}
+ {% for e in field.errors %}
+ <div class="col-lg-12 alert alert-danger">{{e}}</div>
+ {% endfor %}
+ {% endif %}
+ <label class="col-form-label col-sm-3" for="{{ field.id }}">
+ {{ field.label }}
+ {% if field.help_text %}
+ <p><small>{{ field.help_text }}</small></p>
+ {% endif %}
+ </label>
+ <div class="col-sm-9">
+ {{ field|field_class:"form-control" }}
+ </div>
+ </div>
+ {% endfor %}
+ {% endif %}
+ <div class="submit-row">
+ <input class="btn btn-primary" type="submit" value="Save" />
+ </div>
</form>
{%endblock%}
{%extends "base/page.html"%}
{%block title%}Change email{%endblock%}
{%block contents%}
-<h1>Change email</h1>
+<h1>Change email <i class="fas fa-envelope"></i></h1>
<p>
An email has been sent to your new email address to confirm the
change of email. This token will remain valid for approximately
projects / pgweb.git / commitdiff