From 503ca7040495c48e14a815eb6e3c266be8227f24 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Tue, 4 Nov 2014 16:01:46 -0200 Subject: [PATCH] Allowing to disable feedzilla --- colab/planet/context_processors.py | 6 ++++++ colab/settings.py | 16 +++++++++++----- colab/templates/base.html | 4 ++++ 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 colab/planet/context_processors.py diff --git a/colab/planet/context_processors.py b/colab/planet/context_processors.py new file mode 100644 index 0000000..0ca8310 --- /dev/null +++ b/colab/planet/context_processors.py @@ -0,0 +1,6 @@ + +from django.conf import settings + + +def feedzilla(request): + return {'feedzilla': getattr(settings, 'FEEDZILLA_ENABLED', False)} diff --git a/colab/settings.py b/colab/settings.py index 2365c6c..e5c01a3 100644 --- a/colab/settings.py +++ b/colab/settings.py @@ -51,6 +51,7 @@ INSTALLED_APPS = ( 'i18n_model', 'mptt', 'dpaste', + 'taggit', # Own apps 'colab.home', @@ -61,11 +62,6 @@ INSTALLED_APPS = ( 'colab.search', 'colab.badger', 'colab.tz', - - # Feedzilla and deps - 'feedzilla', - 'taggit', - 'common', ) ROOT_URLCONF = 'colab.urls' @@ -202,6 +198,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'colab.proxy.context_processors.proxied_apps', 'colab.home.context_processors.robots', 'colab.home.context_processors.ribbon', + 'colab.planet.context_processors.feedzilla', ) MIDDLEWARE_CLASSES = ( @@ -252,6 +249,8 @@ FEEDZILLA_PAGE_SIZE = 5 FEEDZILLA_SITE_TITLE = _(u'Planet Colab') FEEDZILLA_SITE_DESCRIPTION = _(u'Colab blog aggregator') +FEEDZILLA_ENABLED = True + # Mailman API settings MAILMAN_API_URL = 'http://localhost:9000' @@ -301,6 +300,13 @@ if locals().get('RAVEN_DSN', False): } INSTALLED_APPS += ('raven.contrib.django.raven_compat',) +if FEEDZILLA_ENABLED: + INSTALLED_APPS += ( + # Feedzilla and deps + 'feedzilla', + 'common', + ) + proxied_apps = locals().get('PROXIED_APPS') or {} for app_label in proxied_apps.keys(): INSTALLED_APPS += ('colab.proxy.{}'.format(app_label),) diff --git a/colab/templates/base.html b/colab/templates/base.html index c5c876b..0761b4d 100644 --- a/colab/templates/base.html +++ b/colab/templates/base.html @@ -91,9 +91,13 @@
  • {% trans "Groups" %}
  • + + {% if feedzilla %}
  • {% trans "Blogs" %}
  • + {% endif %} + {% if proxy.gitlab %}