sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/mergeworkoutcreation

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-13 11:24:10 +01:00
parent 99a44271a5 f17a43313d
commit bb7652522e
4 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/base.html
View File

@@ -38,7 +38,7 @@
{% if user.is_authenticated %}
<p><a class="button gray small" href="/password_change/">Password Change</a></p>
{% else %}
<p><a class="button gray small" href="/password_reset/">Forgotten Password?</a></p>
<p><a class="button gray small" href="/password_reset/">Forgot Password?</a></p>
{% endif %}
</div>
</div>

6
rowers/templates/registration/login.html
View File

@@ -17,10 +17,14 @@
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
<tr>
<td></td>
<td><a href="/password_reset/">Forgot password?</a></td>
</tr>
</table>
<input type="submit" value="login" />
<input type="hidden" name="next" value="{{ next }}" />
</form>
{% endblock %}
{% endblock %}