From 94535d4adc3a4960795d22e3b229a8375de10b74 Mon Sep 17 00:00:00 2001
From: supriya <supriya@dragbox.(none)>
Date: Wed, 26 Sep 2012 15:49:52 +0530
Subject: all modules integrated

---
 gstudio/urls/__init__.py | 15 +++++++++++++--
 gstudio/urls/docu.py     |  2 +-
 gstudio/urls/image.py    |  2 +-
 gstudio/urls/video.py    |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'gstudio/urls')

diff --git a/gstudio/urls/__init__.py b/gstudio/urls/__init__.py
index efc6305..8a4e015 100644
--- a/gstudio/urls/__init__.py
+++ b/gstudio/urls/__init__.py
@@ -19,6 +19,10 @@
 from django.conf.urls.defaults import url
 from django.conf.urls.defaults import include
 from django.conf.urls.defaults import patterns
+from django.conf.urls.defaults import *
+from registration.views import register
+
+from gstudio.forms import RecaptchaRegistrationForm
 
 urlpatterns = patterns(
     '',
@@ -41,8 +45,8 @@ urlpatterns = patterns(
     url(r'topicadd1/', include('gstudio.urls.topicadd1')), 
     url(r'sectionadd1/', include('gstudio.urls.sectionadd1')),
     url(r'^login', include('gstudio.urls.login')),
-    url(r'user/(\w+)/$','gstudio.views.user.userdashboard'),
-    url(r'user/wikipage/(\w+)/$','gstudio.views.user.wikidashboard'),
+    url(r'user/$','gstudio.views.user.userdashboard'),#/(\w+)
+    url(r'user/wikipage/$','gstudio.views.user.wikidashboard'),#/(\w+)
     url(r'groupadd/', include('gstudio.urls.groupadd')),
     url(r'pageadd/', include('gstudio.urls.pageadd')),
     url(r'group/',include('gstudio.urls.group')), 
@@ -53,3 +57,10 @@ urlpatterns = patterns(
 
 
     )
+
+urlpatterns += patterns('',
+    url(r'^register/$', register,
+        {'form_class': RecaptchaRegistrationForm},
+        name='registration.views.register'),
+    (r'', include('registration.urls')),
+)
diff --git a/gstudio/urls/docu.py b/gstudio/urls/docu.py
index d872bcd..13c2e47 100644
--- a/gstudio/urls/docu.py
+++ b/gstudio/urls/docu.py
@@ -20,5 +20,5 @@ from django.conf.urls.defaults import patterns
 urlpatterns = patterns('gstudio.views.docu',
                        url(r'^$', 'docu',
                            name='docu'),
-
+		       url(r'show/(\d+)/$','show',name='showdocument'),
                        )
diff --git a/gstudio/urls/image.py b/gstudio/urls/image.py
index 8836ffd..f088b29 100644
--- a/gstudio/urls/image.py
+++ b/gstudio/urls/image.py
@@ -21,5 +21,5 @@ from django.conf.urls.defaults import patterns
 urlpatterns = patterns('gstudio.views.image',
                        url(r'^$', 'image',
                            name='image'),
-			url(r'show/(\d+)/$','show',name='showimage'),
+		       url(r'show/(\d+)/$','show',name='showimage'),
                        )
diff --git a/gstudio/urls/video.py b/gstudio/urls/video.py
index e6ed0f9..5c49802 100644
--- a/gstudio/urls/video.py
+++ b/gstudio/urls/video.py
@@ -21,5 +21,5 @@ from django.conf.urls.defaults import patterns
 urlpatterns = patterns('gstudio.views.video',
                        url(r'^$', 'video',
                            name='video'),
-            	       url(r'show/(\d+)/$','show',name='showvideo'),
+		       url(r'show/(\d+)/$','show',name='showvideo'),
                        )
-- 
cgit v1.1