diff options
| -rw-r--r-- | taskapp/views/user.py | 4 | ||||
| -rw-r--r-- | templates/user/browse.html | 7 | ||||
| -rw-r--r-- | templates/user/edit_profile.html | 8 | ||||
| -rw-r--r-- | templates/user/my_profile.html | 5 | ||||
| -rw-r--r-- | urls.py | 4 |
5 files changed, 20 insertions, 8 deletions
diff --git a/taskapp/views/user.py b/taskapp/views/user.py index 231bc7d..8d3abb3 100644 --- a/taskapp/views/user.py +++ b/taskapp/views/user.py @@ -128,3 +128,7 @@ def edit_my_profile(request): profile = Profile.objects.get(user = request.user) edit_profile_form = UserProfileEditForm(instance = profile) return render_to_response('user/edit_profile.html',{'edit_profile_form' : edit_profile_form}) + +def browse_users(request): + userlist = User.objects.order_by('username') + return render_to_response('user/browse.html',{'userlist':userlist}) diff --git a/templates/user/browse.html b/templates/user/browse.html new file mode 100644 index 0000000..4b7ff61 --- /dev/null +++ b/templates/user/browse.html @@ -0,0 +1,7 @@ +{% extends 'base.html' %} +{% block content %} + List of all the users:<br /> + {% for user in userlist %} + <a href="/user/view/uid={{ user.id }}">{{ user.username }}</a><br /> + {% endfor %} +{% endblock %} diff --git a/templates/user/edit_profile.html b/templates/user/edit_profile.html index d0a0ae1..c7f5aff 100644 --- a/templates/user/edit_profile.html +++ b/templates/user/edit_profile.html @@ -1,7 +1,7 @@ {% extends 'base.html' %} {% block content %} -<form action="/user/edit/" method="post"> -{{ edit_profile_form.as_p }} -<input type="submit" value="Apply Changes" /> -</form> + <form action="/user/edit/" method="post"> + {{ edit_profile_form.as_p }} + <input type="submit" value="Apply Changes" /> + </form> {% endblock %} diff --git a/templates/user/my_profile.html b/templates/user/my_profile.html index 8e96b46..cd45155 100644 --- a/templates/user/my_profile.html +++ b/templates/user/my_profile.html @@ -7,11 +7,12 @@ {% block content %} <!--{{ view_profile_form.as_p }}--> - <h2>{{ profile }}'s Profile</h2><hr> + <h2>{{ profile }}'s Profile</h2> + <hr> {% if edit_profile %} <a href="/user/edit/">edit profile</a> + <hr> {% endif %} - <hr> {% if profile.aboutme %} <br><h4>About Me</h4><hr>{{ profile.aboutme }} {% endif %} @@ -4,7 +4,7 @@ from django.conf.urls.defaults import * from django.contrib import admin admin.autodiscover() -from pytask.taskapp.views.user import homepage, register, user_login, user_logout, view_my_profile, edit_my_profile +from pytask.taskapp.views.user import homepage, register, user_login, user_logout, view_my_profile, edit_my_profile, browse_users from pytask.taskapp.views.task import browse_tasks, view_task, create_task, add_mentor, add_tasks, claim_task, assign_task urlpatterns = patterns('', @@ -33,5 +33,5 @@ urlpatterns = patterns('', (r'^user/view/uid=(\d+)$', view_my_profile), (r'^user/edit/?$', edit_my_profile), - + (r'^user/browse/?$',browse_users), ) |