Images and icons

[prawokultury.git] / migdal / urls.py

diff --git a/migdal/urls.py b/migdal/urls.py
index b600cef..49a4346 100644 (file)
--- a/migdal/urls.py
+++ b/migdal/urls.py
@@ -2,14 +2,15 @@
 # This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls import patterns, include, url
+from django.conf.urls import patterns, include, url, handler404

 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import string_concat
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import string_concat

-from migdal import feeds, settings
-from migdal.helpers import i18n_patterns
+from migdal import feeds, app_settings
+from migdal.views import SearchPublishedView
+from fnpdjango.utils.urls import i18n_patterns

 
 pats = []
 
 pats = []

-for t in settings.TYPES:
+for t in app_settings.TYPES:

     pats += [
         # entry list
         url(string_concat(r'^', t.slug, r'/$'),
     pats += [
         # entry list
         url(string_concat(r'^', t.slug, r'/$'),


@@ -24,15 +25,20 @@ for t in settings.TYPES:
             name='migdal_entry_%s' % t.db),
     ]
 
             name='migdal_entry_%s' % t.db),
     ]
 

+

 urlpatterns = i18n_patterns('',
     # main page
 urlpatterns = i18n_patterns('',
     # main page

-    url(r'^$', 'migdal.views.entry_list', name='migdal_main'),
+    url(r'^$', 'migdal.views.main', name='migdal_main'),

     url(r'^rss.xml$', feeds.EntriesFeed(), name='migdal_main_feed'),
     url(r'^rss.xml$', feeds.EntriesFeed(), name='migdal_main_feed'),

+    # submit new entry
+    url(string_concat(r'^', _('submit'), r'/$'), 'migdal.views.submit', name='migdal_submit'),
+    url(string_concat(r'^', _('submit'), r'/', _('thanks'), r'$'), 'migdal.views.submit_thanks', name='migdal_submit_thanks'),

     # category
     url(string_concat(r'^', _('categories'), r'/(?P<category_slug>[^/]*)/$'),
         'migdal.views.entry_list', name='migdal_category'),
     url(string_concat(r'^', _('categories'), r'/(?P<category_slug>[^/]*)/rss.xml$'),
         feeds.EntriesFeed(), name='migdal_category_feed'),
     # category
     url(string_concat(r'^', _('categories'), r'/(?P<category_slug>[^/]*)/$'),
         'migdal.views.entry_list', name='migdal_category'),
     url(string_concat(r'^', _('categories'), r'/(?P<category_slug>[^/]*)/rss.xml$'),
         feeds.EntriesFeed(), name='migdal_category_feed'),

+    url(string_concat(r'^', _('search')), SearchPublishedView(), name='search'),

     # type-specific views
     *pats
 )
     # type-specific views
     *pats
 )