X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Furls.py;h=57aea13979a94939fe8605a5e4c2ad4762f30ea3;hb=a48622a1086a47a1abc26dcd3d1d05a384eb1e8f;hp=f265b0fc5035c7c3bdecd511668b3146b3fbef8b;hpb=b9bcd422c66e0cd9b0f20a0c037dbc2d811bb59f;p=qcg-portal.git

diff --git a/qcg/urls.py b/qcg/urls.py
index f265b0f..57aea13 100644
--- a/qcg/urls.py
+++ b/qcg/urls.py
@@ -1,14 +1,33 @@
-from django.conf.urls import patterns, url, include
+from django.conf import settings
+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')
+
 urlpatterns = patterns('',
-    url(r'^openid/login/', views.openid_begin, name='openid-login'),
+    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'^$', views.index, name='index'),
     url(r'^jobs/$', views.jobs_list, name='jobs'),
+    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'^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'),
 )