diff options
author | Joaquín Aguirrezabalaga <kinote@kinote.org> | 2014-01-03 01:06:22 +0100 |
---|---|---|
committer | Joaquín Aguirrezabalaga <kinote@kinote.org> | 2014-01-03 01:06:40 +0100 |
commit | f05c5e2d8a705df1c94b63a978267b291c893bbb (patch) | |
tree | a8bd95e9cc2c0bd48be57893ccc4ddec63152d29 /wiki/urls.py | |
parent | 802a74102b9073e961ef1d7a487f99b962d76512 (diff) | |
download | elgarito-master.tar.gz elgarito-master.zip |
Diffstat (limited to 'wiki/urls.py')
-rw-r--r-- | wiki/urls.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/wiki/urls.py b/wiki/urls.py index ddcddf3..07dd356 100644 --- a/wiki/urls.py +++ b/wiki/urls.py @@ -1,12 +1,14 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url -urlpatterns = patterns('elgarito.wiki.views', - (r'^$', 'index'), +urlpatterns = patterns( + 'wiki.views', + + url(r'^$', 'index'), - #(r'^((?:[A-Z]+[a-z]+){2,})/$', 'pagina'), - (r'^nueva/$', 'nueva'), - (r'^lista/$', 'lista'), - (r'^(?P<titulo>\w+)/$', 'pagina'), - (r'^(?P<titulo>\w+)/editar/$', 'editar'), - #(r'^(?P<titulo>\w+)/eliminar/$', 'eliminar'), + #url(r'^((?:[A-Z]+[a-z]+){2,})/$', 'pagina'), + url(r'^nueva/$', 'nueva'), + url(r'^lista/$', 'lista'), + url(r'^(?P<titulo>\w+)/$', 'pagina'), + url(r'^(?P<titulo>\w+)/editar/$', 'editar'), + #url(r'^(?P<titulo>\w+)/eliminar/$', 'eliminar'), ) |