equal
deleted
inserted
replaced
1 from django.conf.urls.defaults import * |
1 from django.conf.urls.defaults import * |
2 |
2 |
3 from pytask.taskapp.views import create_task, view_task, claim_task, \ |
3 from pytask.taskapp.views import create_task, view_task, claim_task, \ |
4 select_user, edit_task, create_textbook, view_textbook, \ |
4 select_user, edit_task, create_textbook, view_textbook, \ |
5 browse_textbooks, edit_textbook, approve_task, approved_task,\ |
5 browse_tasks, edit_textbook, approve_task, approved_task,\ |
6 browse_tasks |
6 browse_textbooks, approve_textbook, approved_textbook |
7 |
7 |
8 from pytask.views import under_construction |
8 from pytask.views import under_construction |
9 |
9 |
10 urlpatterns = patterns('', |
10 urlpatterns = patterns('', |
11 |
11 |
19 (r'^browse/$', browse_tasks), |
19 (r'^browse/$', browse_tasks), |
20 |
20 |
21 (r'^textbook/create/$', create_textbook), |
21 (r'^textbook/create/$', create_textbook), |
22 (r'^textbook/view/tid=(\w+)/$', view_textbook), |
22 (r'^textbook/view/tid=(\w+)/$', view_textbook), |
23 (r'^textbook/edit/tid=(\w+)/$', edit_textbook), |
23 (r'^textbook/edit/tid=(\w+)/$', edit_textbook), |
|
24 (r'^textbook/approve/tid=(\w+)/$', approve_textbook), |
|
25 (r'^textbook/approved/tid=(\w+)/$', approved_textbook), |
24 (r'^textbook/browse/$', browse_textbooks), |
26 (r'^textbook/browse/$', browse_textbooks), |
25 ) |
27 ) |
26 |
28 |