X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/ce728e78bb55eb75753f40dc5cd0997a53e7dd27..773a8c2da4c355af5d81d27a4849e9548e2d8864:/migdal/urls.py diff --git a/migdal/urls.py b/migdal/urls.py index 9215078..49a4346 100644 --- a/migdal/urls.py +++ b/migdal/urls.py @@ -2,11 +2,12 @@ # 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 migdal import feeds, app_settings -from migdal.helpers import i18n_patterns +from migdal.views import SearchPublishedView +from fnpdjango.utils.urls import i18n_patterns pats = [] for t in app_settings.TYPES: @@ -24,9 +25,10 @@ for t in app_settings.TYPES: name='migdal_entry_%s' % t.db), ] + 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'), # submit new entry url(string_concat(r'^', _('submit'), r'/$'), 'migdal.views.submit', name='migdal_submit'), @@ -36,6 +38,7 @@ urlpatterns = i18n_patterns('', 'migdal.views.entry_list', name='migdal_category'), url(string_concat(r'^', _('categories'), r'/(?P[^/]*)/rss.xml$'), feeds.EntriesFeed(), name='migdal_category_feed'), + url(string_concat(r'^', _('search')), SearchPublishedView(), name='search'), # type-specific views *pats )