fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preliminary math and tables support.
[wolnelektury.git]
/
wolnelektury
/
urls.py
diff --git
a/wolnelektury/urls.py
b/wolnelektury/urls.py
index
c5289a3
..
bdfb474
100644
(file)
--- a/
wolnelektury/urls.py
+++ b/
wolnelektury/urls.py
@@
-1,18
+1,18
@@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
-import os
-
-from django.conf.urls.defaults import *
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.conf.urls import include, patterns, url
from django.conf import settings
from django.contrib import admin
from django.views.generic import RedirectView
import wolnelektury_core.views
from django.conf import settings
from django.contrib import admin
from django.views.generic import RedirectView
import wolnelektury_core.views
-admin.autodiscover()
-
urlpatterns = patterns('wolnelektury_core.views',
url(r'^$', 'main_page', name='main_page'),
url(r'^planowane/$', 'publish_plan', name='publish_plan'),
urlpatterns = patterns('wolnelektury_core.views',
url(r'^$', 'main_page', name='main_page'),
url(r'^planowane/$', 'publish_plan', name='publish_plan'),
+ url(r'^widget\.html$', 'widget', name='widget'),
url(r'^zegar/$', 'clock', name='clock'),
url(r'^zegar/$', 'clock', name='clock'),
@@
-22,11
+22,15
@@
urlpatterns = patterns('wolnelektury_core.views',
url(r'^uzytkownik/signup/$', wolnelektury_core.views.RegisterFormView(), name='register'),
url(r'^uzytkownik/logout/$', 'logout_then_redirect', name='logout'),
url(r'^uzytkownik/zaloguj-utworz/$', wolnelektury_core.views.LoginRegisterFormView(), name='login_register'),
url(r'^uzytkownik/signup/$', wolnelektury_core.views.RegisterFormView(), name='register'),
url(r'^uzytkownik/logout/$', 'logout_then_redirect', name='logout'),
url(r'^uzytkownik/zaloguj-utworz/$', wolnelektury_core.views.LoginRegisterFormView(), name='login_register'),
+
+ # Includes.
+ url(r'^latests_blog_posts.html$',
+ wolnelektury_core.views.latest_blog_posts,
+ name='latest_blog_posts'),
)
urlpatterns += patterns('',
url(r'^katalog/', include('catalogue.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/', include('lesmianator.urls')),
url(r'^opds/', include('opds.urls')),
url(r'^sugestia/', include('suggest.urls')),
url(r'^lesmianator/', include('lesmianator.urls')),
@@
-36,7
+40,11
@@
urlpatterns += patterns('',
url(r'^ludzie/', include('social.urls')),
url(r'^uzytkownik/', include('allauth.urls')),
url(r'^czekaj/', include('waiter.urls')),
url(r'^ludzie/', include('social.urls')),
url(r'^uzytkownik/', include('allauth.urls')),
url(r'^czekaj/', include('waiter.urls')),
- url(r'^fund/', include('funding.urls')),
+ url(r'^wesprzyj/', include('funding.urls')),
+ url(r'^ankieta/', include('polls.urls')),
+ url(r'^biblioteki/', include('libraries.urls')),
+ url(r'^chunks/', include('chunks.urls')),
+ url(r'^sponsors/', include('sponsors.urls')),
# Admin panel
url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),
# Admin panel
url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),
@@
-74,9
+82,3
@@
urlpatterns += patterns('',
url(r'^wolontariat/$', RedirectView.as_view(
url='/info/mozesz-nam-pomoc/')),
)
url(r'^wolontariat/$', RedirectView.as_view(
url='/info/mozesz-nam-pomoc/')),
)
-
-
-if 'rosetta' in settings.INSTALLED_APPS:
- urlpatterns += patterns('',
- url(r'^rosetta/', include('rosetta.urls')),
- )