Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* issues use now the slug (and not the id) for coloring in issue list
* restyle of profile * add change/reset password functions * minor repairs of templates
- Loading branch information
chris
committed
Dec 10, 2009
1 parent
a06870f
commit cc1d2aa
Showing
14 changed files
with
166 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,3 +6,4 @@ djtracker.egg-info | |
docs/build | ||
*.rst~ | ||
*.rst\~ | ||
.tmp_*~ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
12 changes: 12 additions & 0 deletions
12
djtracker/templates/djtracker/profile/password_change_done.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{% extends "djtracker/base.html" %} | ||
{% load i18n %} | ||
|
||
{% block title %}{% trans 'Password change successful' %}{% endblock %} | ||
|
||
{% block content %} | ||
|
||
<h3>{% trans 'Password change successful' %}</h3> | ||
|
||
<p>{% trans 'Your password was changed.' %}</p> | ||
|
||
{% endblock %} |
17 changes: 17 additions & 0 deletions
17
djtracker/templates/djtracker/profile/password_change_form.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
{% extends "djtracker/base.html" %} | ||
{% load i18n %} | ||
|
||
{% block title %}{% trans 'Password change' %}{% endblock %} | ||
|
||
{% block content %} | ||
|
||
<h3>{% trans 'Password change' %}</h3> | ||
|
||
<p>{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}</p> | ||
|
||
<form action="" method="post"> | ||
<table>{{form.as_table}}</table> | ||
<input type="submit" value="{% trans 'Change my password' %}" /> | ||
</form> | ||
|
||
{% endblock %} |
14 changes: 14 additions & 0 deletions
14
djtracker/templates/djtracker/profile/password_reset_complete.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
{% extends "djtracker/base.html" %} | ||
{% load i18n %} | ||
|
||
{% block title %}{% trans 'Password reset complete' %}{% endblock %} | ||
|
||
{% block content %} | ||
|
||
<h3>{% trans 'Password reset complete' %}</h3> | ||
|
||
<p>{% trans "Your password has been set. You may go ahead and log in now." %}</p> | ||
|
||
<p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p> | ||
|
||
{% endblock %} |
27 changes: 27 additions & 0 deletions
27
djtracker/templates/djtracker/profile/password_reset_confirm.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
{% extends "djtracker/base.html" %} | ||
{% load i18n %} | ||
|
||
{% block title %}{% trans 'Password reset' %}{% endblock %} | ||
|
||
{% block content %} | ||
|
||
{% if validlink %} | ||
|
||
<h3>{% trans 'Enter new password' %}</h3> | ||
|
||
<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p> | ||
|
||
<form action="" method="post"> | ||
<table>{{form.as_table}}</table> | ||
<input type="submit" value="{% trans 'Change my password' %}" /> | ||
</form> | ||
|
||
{% else %} | ||
|
||
<h3>{% trans 'Password reset unsuccessful' %}</h3> | ||
|
||
<p>{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}</p> | ||
|
||
{% endif %} | ||
|
||
{% endblock %} |
12 changes: 12 additions & 0 deletions
12
djtracker/templates/djtracker/profile/password_reset_done.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{% extends "djtracker/base.html" %} | ||
{% load i18n %} | ||
|
||
{% block title %}{% trans 'Password reset successful' %}{% endblock %} | ||
|
||
{% block content %} | ||
|
||
<h3>{% trans 'Password reset successful' %}</h3> | ||
|
||
<p>{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}</p> | ||
|
||
{% endblock %} |
17 changes: 17 additions & 0 deletions
17
djtracker/templates/djtracker/profile/password_reset_form.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
{% extends "djtracker/base.html" %} | ||
{% load i18n %} | ||
|
||
{% block title %}{% trans "Password reset" %}{% endblock %} | ||
|
||
{% block content %} | ||
|
||
<h3>{% trans "Password reset" %}</h3> | ||
|
||
<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}</p> | ||
|
||
<form action="" method="post"> | ||
<table>{{form.as_table}}</table> | ||
<input type="submit" value="{% trans 'Reset my password' %}" /> | ||
</form> | ||
|
||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,36 @@ | ||
{% extends "djtracker/base.html" %} | ||
|
||
{% block head %} | ||
<script type="text/javascript"> | ||
{% include 'djtracker/sorttable.js' %} | ||
</script> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
{% if user %} | ||
<h3>User: {{ user.username }}</h3> | ||
<h3><small class="inlineaction"><a href="{% url django.contrib.auth.views.password_change %}">change password</a></small>User: {{ user.username }}</h3> | ||
<p>IM Information: {{ profile.instant_messanger }}</p> | ||
{% if request.user.is_authenticated %} | ||
<p>Email: <a href="mailto:{{ user.email }}">{{ user.email }}</a> | ||
{% endif %} | ||
<hr /> | ||
{% if assigned %} | ||
{% for issue in assigned %} | ||
{% if forloop.first %} | ||
<h4>Assigned Issues:</h4> | ||
<ul> | ||
{% endif %} | ||
<p><li><a href="{{ issue.get_absolute_url }}">{{ issue }}</a></li></p> | ||
{% if forloop.last %} | ||
</ul> | ||
{% endif %} | ||
{% endfor %} | ||
{% endif %} | ||
{% endif %} | ||
{% with 1 as issues_with_project %} | ||
{% if assigned %} | ||
<div class="hideable"> | ||
<h4>Issues assigned to me</h4> | ||
{% with assigned as issue_list %} | ||
{% include 'djtracker/blocks/issue_list.html' %} | ||
{% endwith %} | ||
</div> | ||
{% endif %} | ||
{% if created %} | ||
{% for issue in created %} | ||
{% if forloop.first %} | ||
<h4>Created Issues:</h4> | ||
<ul> | ||
{% endif %} | ||
<p><li><a href="{{ issue.get_absolute_url }}">{{ issue }}</a></li></p> | ||
{% if forloop.last %} | ||
</ul> | ||
{% endif %} | ||
{% endfor %} | ||
<div class="hideable"> | ||
<h4>Issues created by me</h4> | ||
{% with created as issue_list %} | ||
{% include 'djtracker/blocks/issue_list.html' %} | ||
{% endwith %} | ||
</div> | ||
{% endif %} | ||
{% endwith %} | ||
{% endif %} | ||
{% endblock %} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{% extends "djtracker/base.html" %} | ||
{% block content %} | ||
<form method="post" action=""> | ||
{{ form.as_p }} | ||
<table>{{ form.as_table }}</table> | ||
<input type="submit" value="Register" /> | ||
</form> | ||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters