fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Starting with forum.
[edumed.git]
/
edumed
/
urls.py
diff --git
a/edumed/urls.py
b/edumed/urls.py
index
77b9872
..
f55af4d
100644
(file)
--- a/
edumed/urls.py
+++ b/
edumed/urls.py
@@
-1,17
+1,18
@@
from django.conf.urls import patterns, include, url
from django.conf import settings
from django.conf.urls import patterns, include, url
from django.conf import settings
-from
django.views.generic import Templat
eView
+from
.views import Hom
eView
urlpatterns = patterns('',
urlpatterns = patterns('',
- # Examples:
- # url(r'^$', 'edumed.views.home', name='home'),
- url(r'^$', TemplateView.as_view(template_name="home.html"), name="home"),
+ url(r'^$', HomeView.as_view(), name="home"),
url(r'^kompetencje/', include('curriculum.urls')),
url(r'^lekcje/', include('catalogue.urls')),
# url(r'^i/', include('django.contrib.flatpages.urls')),
url(r'^kompetencje/', include('curriculum.urls')),
url(r'^lekcje/', include('catalogue.urls')),
# url(r'^i/', include('django.contrib.flatpages.urls')),
- url(r'^i/(?P<url>.*)$', 'django.contrib.flatpages.views.flatpage',
+ url(r'^i
nfo
/(?P<url>.*)$', 'django.contrib.flatpages.views.flatpage',
name="info"),
name="info"),
+ url(r'^szukaj/', include('haystack.urls')),
+ url(r'^zglos/', include('contact.urls')),
+ url(r'^forum/', include('pybb.urls', namespace='pybb')),
)
)
@@
-31,3
+32,11
@@
if 'django_cas' in settings.INSTALLED_APPS:
(r'^accounts/login/$', 'django_cas.views.login'),
(r'^accounts/logout/$', 'django_cas.views.logout'),
)
(r'^accounts/login/$', 'django_cas.views.login'),
(r'^accounts/logout/$', 'django_cas.views.logout'),
)
+
+
+if settings.DEBUG:
+ urlpatterns += patterns('',
+ url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+ 'document_root': settings.MEDIA_ROOT,
+ }),
+ )