Merge branch 'devel'

[qcg-portal.git] / qcg / urls.py

diff --git a/qcg/urls.py b/qcg/urls.py
index 3bb2d7d..5fbed87 100644 (file)
--- a/qcg/urls.py
+++ b/qcg/urls.py
@@ -3,21 +3,31 @@ from django.conf.urls import patterns, url
 
 from qcg import views
 
-login_url = url(r'^login/', 'django.contrib.auth.views.login', {'template_name': 'admin/login.html'}, name='login') \
-    if settings.DEBUG else url(r'^openid/login/', views.openid_begin, name='login')
+login_url = url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'admin/login.html'}, name='login') \
+    if settings.DEBUG else url(r'^openid/login/$', views.openid_begin, name='login')
 
 urlpatterns = patterns('',
     login_url,
-    url(r'^openid/complete/', 'django_openid_auth.views.login_complete', name='openid-complete'),
-    url(r'^openid/logout/', 'django.contrib.auth.views.logout', {'template_name': 'qcg/logout.html'}, name='logout'),
+    url(r'^openid/complete/$', 'django_openid_auth.views.login_complete', name='openid-complete'),
+    url(r'^openid/logout/$', 'django.contrib.auth.views.logout', {'template_name': 'qcg/logout.html'}, name='logout'),
 
     url(r'^$', views.index, name='index'),
     url(r'^jobs/$', views.jobs_list, name='jobs'),
-    url(r'^job/new/$', views.job_new, name='job_new'),
+    url(r'^job/templates/$', views.job_templates, name='job_templates'),
+
+    url(r'^job/submit/$', views.job_submit, name='job_submit'),
+    url(r'^job/template/submit/(?P<template_id>\d+)/$', views.job_submit, name='template_submit'),
+    url(r'^job/template/delete/(?P<template_id>\d+)/$', views.template_delete, name='template_delete'),
+
+    url(r'^job/cancel/(?P<job_id>[\w]+)/$', views.job_cancel, name='job_cancel'),
+    url(r'^job/clean/(?P<job_id>[\w]+)/$', views.job_clean, name='job_clean'),
+    url(r'^job/save/template/(?P<job_id>[\w]+)/$', views.job_save_template, name='job_save_template'),
+    url(r'^task/cancel/(?P<job_id>[\w]+)/(?P<task_id>[\w]+)/$', views.task_cancel, name='task_cancel'),
+    url(r'^task/clean/(?P<job_id>[\w]+)/(?P<task_id>[\w]+)/$', views.task_clean, name='task_clean'),
+
     url(r'^job/(?P<job_id>[\w]+)/?$', views.job_details, name='job'),
     url(r'^job/(?P<job_id>[\w]+)/(?P<task_id>[\w]+)/?$', views.task_details, name='task'),
 
     url(r'^gridftp/$', views.gridftp, name='gridftp'),
-
     url(r'^gridftp/upload/$', views.gridftp_upload, name='gridftp_upload'),
 )