style instructions

[edumed.git] / edumed / urls.py

diff --git a/edumed/urls.py b/edumed/urls.py
index 95748cd..303e011 100644 (file)
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -1,17 +1,16 @@
 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

 
 
 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'^info/(?P<url>.*)$', 'django.contrib.flatpages.views.flatpage',

         name="info"),
         name="info"),

+    url(r'^szukaj/', include('haystack.urls')),

 )
 
 
 )