Mercurial > agora-palash

changeset 78:d416b8198889

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use named URLs and the url function where applicable Only apps/profile/urls.py and the main urls.py for now. This is to make it easier to use the {% url %} template tag.
author dellsystem <ilostwaldo@gmail.com>
date Fri, 24 Aug 2012 16:32:17 -0400
parents d4e5ef15326a
children 96ad476f52df
files apps/profile/urls.py urls.py
diffstat 2 files changed, 31 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/apps/profile/urls.py	Fri Aug 17 16:47:31 2012 -0400
+++ b/apps/profile/urls.py	Fri Aug 24 16:32:17 2012 -0400
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('agora.apps.profile.views',
-    (r'^editprofile/(?P<user>\w*)/$', 'editprofile'),
-    (r'^(?P<user>\w*)/$', 'showprofile'),
+    url(r'^editprofile$', 'editprofile', name='edit_profile'),
+    url(r'^(?P<user>\w*)/$', 'showprofile', name='show_profile'),
 )
--- a/urls.py	Fri Aug 17 16:47:31 2012 -0400
+++ b/urls.py	Fri Aug 24 16:32:17 2012 -0400
@@ -5,26 +5,35 @@
 admin.autodiscover()
 
 urlpatterns = patterns('',
-     (r'^$',
-      'django.views.generic.simple.direct_to_template',
-      {'template': 'index.djhtml'}),
-
-     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-     (r'^admin/', include(admin.site.urls)),
-
-     (r'^accounts/logout/', 'django.contrib.auth.views.logout',
-      {'template_name' : 'index.djhtml', 'next_page' : '/'}),
-
-     (r'^accounts/', include('registration.urls')),
-
-     (r'^licenses/', include('agora.apps.free_license.urls')),
-
-     (r'^user/', include('agora.apps.profile.urls')),
-
-     (r'^snippet/', include('agora.apps.snippet.urls')),
-
-     (r'^bundles/', include('agora.apps.bundle.urls')),
-
+    url(r'^$',
+        'django.views.generic.simple.direct_to_template',
+        {'template': 'index.djhtml'},
+        name='home'),
+    url(r'^about$',
+        'django.views.generic.simple.direct_to_template',
+        {'template': 'about.djhtml'},
+        name='about'),
+    url(r'^help$',
+        'django.views.generic.simple.direct_to_template',
+        {'template': 'help.djhtml'},
+        name='help'),
+    url(r'^discuss$',
+        'django.views.generic.simple.direct_to_template',
+        {'template': 'discuss.djhtml'},
+        name='discuss'),
+    url(r'^code$',
+        'django.views.generic.simple.direct_to_template',
+        {'template': 'code.djhtml'},
+        name='code'),
+    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    url(r'^admin/', include(admin.site.urls)),
+    url(r'^accounts/logout/', 'django.contrib.auth.views.logout',
+        {'template_name' : 'index.djhtml', 'next_page' : '/'}),
+    url(r'^accounts/', include('registration.urls')),
+    url(r'^licenses/', include('agora.apps.free_license.urls')),
+    url(r'^user/', include('agora.apps.profile.urls')),
+    url(r'^snippet/', include('agora.apps.snippet.urls')),
+    url(r'^bundles/', include('agora.apps.bundle.urls')),
 )
 
 #Let Django itself serve static data during debugging