X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Furls.py;h=3bb2d7d5041b8d69b9b615df7b8c3d418afea963;hb=a5eea24f30969c1434c7743516f0195aa4bc53ae;hp=c48f41bfadb467efdc1da0b309a1dd06c2832819;hpb=7f31f6b03f768014d3f14b309277d32a7f82ce28;p=qcg-portal.git

diff --git a/qcg/urls.py b/qcg/urls.py
index c48f41b..3bb2d7d 100644
--- a/qcg/urls.py
+++ b/qcg/urls.py
@@ -1,13 +1,23 @@
-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_login, 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'^openid/', include('django_openid_auth.urls')),
 
     url(r'^$', views.index, name='index'),
     url(r'^jobs/$', views.jobs_list, name='jobs'),
-    url(r'^job/$', views.job_details, name='job'),
+    url(r'^job/new/$', views.job_new, name='job_new'),
+    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'),
 )