# HG changeset patch # User Nishanth Amuluru # Date 1294685627 -19800 # Node ID 563fe356947d3bdb56a025f230fe9f4ccde8bcaa # Parent 94497f8b1dae644c97b1e8a86c3753288c70ee74 created browse textbooks page diff -r 94497f8b1dae -r 563fe356947d pytask/taskapp/urls.py --- a/pytask/taskapp/urls.py Tue Jan 11 00:03:57 2011 +0530 +++ b/pytask/taskapp/urls.py Tue Jan 11 00:23:47 2011 +0530 @@ -1,7 +1,8 @@ from django.conf.urls.defaults import * from pytask.taskapp.views import create_task, view_task, claim_task, \ - select_user, edit_task, create_textbook, view_textbook + select_user, edit_task, create_textbook, view_textbook, \ + browse_textbooks from pytask.views import under_construction @@ -16,5 +17,6 @@ (r'^textbook/create/$', create_textbook), (r'^textbook/view/tid=(\w+)/$', view_textbook), + (r'^textbook/browse/$', browse_textbooks), ) diff -r 94497f8b1dae -r 563fe356947d pytask/taskapp/views.py --- a/pytask/taskapp/views.py Tue Jan 11 00:03:57 2011 +0530 +++ b/pytask/taskapp/views.py Tue Jan 11 00:23:47 2011 +0530 @@ -225,7 +225,7 @@ user = request.user if not user.is_authenticated(): - return render_to_response("task/view_textbook.html") + return render_to_response("task/view_textbook.html", {"user": user}) profile = user.get_profile() @@ -249,6 +249,26 @@ "can_approve": can_approve}) return render_to_response("task/view_textbook.html", context) +def browse_textbooks(request): + + user = request.user + + open_textbooks = TextBook.objects.filter(status="OP").\ + order_by("creation_datetime") + comp_textbooks = TextBook.objects.filter(status="CM").\ + order_by("creation_datetime") + context = {"user": user, + "open_textbooks": open_textbooks, + "comp_textbooks": comp_textbooks, + } + + if user.is_authenticated() and user.get_profile().rights != "CT": + unpub_textbooks = TextBook.objects.filter(status="UP") + + context.update({"unpub_textbooks": unpub_textbooks}) + + return render_to_response("task/browse_textbooks.html", context) + @login_required def claim_task(request, tid): diff -r 94497f8b1dae -r 563fe356947d pytask/templates/task/browse_textbooks.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pytask/templates/task/browse_textbooks.html Tue Jan 11 00:23:47 2011 +0530 @@ -0,0 +1,29 @@ +{% extends 'base.html' %} +{% block content %} + {% if comp_textbooks %} + Textbooks that were completed recently +
+ {% endif %} + + {% if open_textbooks %} + textbooks that are open for contribution +
+ {% endif %} + + {% if unpub_textbooks %} + Textbooks that have been created but need approval +
+ {% endif %} +{% endblock %}