From 9c9796a5bd5ced3ebbe4e2b143906d0bce9f0024 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 16 May 2012 12:56:44 +0200 Subject: Fix RSS feeds for django 1.4 - reintegrate them in the main application --- example_project/extra-locales/chimere_rss | 1 - example_project/settings.py | 9 +++------ example_project/urls.py | 4 ---- 3 files changed, 3 insertions(+), 11 deletions(-) delete mode 120000 example_project/extra-locales/chimere_rss (limited to 'example_project') diff --git a/example_project/extra-locales/chimere_rss b/example_project/extra-locales/chimere_rss deleted file mode 120000 index 1a8285a..0000000 --- a/example_project/extra-locales/chimere_rss +++ /dev/null @@ -1 +0,0 @@ -../../chimere_rss/ \ No newline at end of file diff --git a/example_project/settings.py b/example_project/settings.py index ddd8261..82c4454 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -54,6 +54,8 @@ CHIMERE_DISPLAY_AREAS = True # don't forget to run the upgrade.py script to create appropriate fields in # the database CHIMERE_DAYS_BEFORE_EVENT = 30 +# allow feeds +CHIMERE_FEEDS = True CHIMERE_ICON_WIDTH = 21 CHIMERE_ICON_HEIGHT = 25 @@ -180,15 +182,10 @@ INSTALLED_APPS = ( 'djcelery', 'south', 'chimere', - # activate it if you want to use migration scripts + # activate it if you want to use old migration scripts #'chimere.scripts', - # activate it if you want to use RSS feeds - #'chimere_rss' ) -if 'chimere_rss' in INSTALLED_APPS: - TEMPLATE_DIRS.append(ROOT_PATH + 'chimere_rss/templates') - LOGGING = {'version': 1, 'disable_existing_loggers': False, 'handlers': { diff --git a/example_project/urls.py b/example_project/urls.py index 6dc5e32..a49cb4f 100644 --- a/example_project/urls.py +++ b/example_project/urls.py @@ -30,10 +30,6 @@ urlpatterns = patterns('django.views.static', ) urlpatterns += staticfiles_urlpatterns() -if 'chimere_rss' in settings.INSTALLED_APPS: - urlpatterns += patterns('', - url(r'^feeds/', include('chimere_rss.urls', namespace="chimere-rss")),) - urlpatterns += patterns('', (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), -- cgit v1.2.3