Change JSONField implementation

[edumed.git] / edumed / urls.py

diff --git a/edumed/urls.py b/edumed/urls.py
index 77b9872..059821b 100644 (file)
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -1,17 +1,20 @@
 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 TemplateView
+from .views import HomeView, AvatarlessProfileEditView
+

 
 
 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'^kompetencje/', include('curriculum.urls')),
+    url(r'^$', HomeView.as_view(), name="home"),

     url(r'^lekcje/', include('catalogue.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'^info/(?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/profile/edit/$', AvatarlessProfileEditView.as_view(), name='edit_profile'),
+    url(r'^forum/', include('forum.urls')),
+    url(r'^forum/', include('pybb.urls', namespace='pybb')),
+    url(r'^kompetencje/', include('curriculum.urls')),

 )
 
 
 )
 
 


@@ -20,6 +23,10 @@ if 'django.contrib.admin' in settings.INSTALLED_APPS:
     from django.contrib import admin
     admin.autodiscover()
 
     from django.contrib import admin
     admin.autodiscover()
 

+    if 'django_cas' in settings.INSTALLED_APPS:
+        urlpatterns += patterns('',
+            (r'^admin/logout/$', 'django_cas.views.logout'),
+        )

     urlpatterns += patterns('',
         url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
         url(r'^admin/', include(admin.site.urls)),
     urlpatterns += patterns('',
         url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
         url(r'^admin/', include(admin.site.urls)),


@@ -28,6 +35,14 @@ if 'django.contrib.admin' in settings.INSTALLED_APPS:
 # Auth stuff, if necessary
 if 'django_cas' in settings.INSTALLED_APPS:
     urlpatterns += patterns('',
 # Auth stuff, if necessary
 if 'django_cas' in settings.INSTALLED_APPS:
     urlpatterns += patterns('',

-        (r'^accounts/login/$', 'django_cas.views.login'),
-        (r'^accounts/logout/$', 'django_cas.views.logout'),
+        url(r'^accounts/login/$', 'django_cas.views.login', name='login'),
+        url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),

     )
     )

+
+
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+   )