fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
book admin title readonly in basic mode, requirements-test fix
[wolnelektury.git]
/
wolnelektury
/
urls.py
diff --git
a/wolnelektury/urls.py
b/wolnelektury/urls.py
index
1a09a0a
..
e3704f4
100644
(file)
--- a/
wolnelektury/urls.py
+++ b/
wolnelektury/urls.py
@@
-15,6
+15,7
@@
admin.autodiscover()
urlpatterns = patterns('',
url(r'^katalog/', include('catalogue.urls')),
url(r'^materialy/', include('lessons.urls')),
urlpatterns = patterns('',
url(r'^katalog/', include('catalogue.urls')),
url(r'^materialy/', include('lessons.urls')),
+ url(r'^opds/', include('opds.urls')),
url(r'^sugestia/', include('suggest.urls')),
url(r'^lesmianator/?$', 'lesmianator.views.poem', name='lesmianator'),
url(r'^sugestia/', include('suggest.urls')),
url(r'^lesmianator/?$', 'lesmianator.views.poem', name='lesmianator'),
@@
-32,7
+33,7
@@
urlpatterns = patterns('',
# Admin panel
url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
# Admin panel
url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
- url(r'^admin/
(.*)$', admin.site.root
),
+ url(r'^admin/
', include(admin.site.urls)
),
# Authentication
url(r'^uzytkownicy/zaloguj/$', 'catalogue.views.login', name='login'),
# Authentication
url(r'^uzytkownicy/zaloguj/$', 'catalogue.views.login', name='login'),