fnp
/
prawokultury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cas
[prawokultury.git]
/
prawokultury
/
urls.py
diff --git
a/prawokultury/urls.py
b/prawokultury/urls.py
index
436cb0e
..
e1fb40b
100644
(file)
--- a/
prawokultury/urls.py
+++ b/
prawokultury/urls.py
@@
-9,7
+9,7
@@
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from migdal.helpers import i18n_patterns
from migdal.urls import urlpatterns as migdal_urlpatterns
from django.utils.translation import ugettext_lazy as _, string_concat
from migdal.helpers import i18n_patterns
from migdal.urls import urlpatterns as migdal_urlpatterns
from django.utils.translation import ugettext_lazy as _, string_concat
-
+from events.urls import urlpatterns as events_urlpatterns
admin.autodiscover()
admin.autodiscover()
@@
-19,11
+19,18
@@
urlpatterns = patterns('',
url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
'document_root': settings.MEDIA_ROOT,
}),
url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
'document_root': settings.MEDIA_ROOT,
}),
- url(r'^search/', include('haystack.urls')),
-) + i18n_patterns('',
+ )
+
+if 'django_cas' in settings.INSTALLED_APPS:
+ urlpatterns += patterns('',
+ (r'^accounts/login/$', 'django_cas.views.login'),
+ (r'^accounts/logout/$', 'django_cas.views.logout'),
+ )
+
+urlpatterns += i18n_patterns('',
url(string_concat(r'^', _('events'), r'/'), include('events.urls')),
url(r'^comments/', include('django_comments_xtd.urls')),
url(string_concat(r'^', _('events'), r'/'), include('events.urls')),
url(r'^comments/', include('django_comments_xtd.urls')),
-) + migdal_urlpatterns
+) + migdal_urlpatterns
if settings.DEBUG:
urlpatterns += patterns('',
if settings.DEBUG:
urlpatterns += patterns('',