diff --git a/fmartingrcom/apps/config/__init__.py b/fmartingrcom/apps/config/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/fmartingrcom/apps/config/admin.py b/fmartingrcom/apps/config/admin.py new file mode 100644 index 0000000..8f6427f --- /dev/null +++ b/fmartingrcom/apps/config/admin.py @@ -0,0 +1,6 @@ +from django.contrib import admin +from solo.admin import SingletonModelAdmin +from .models import SiteConfiguration + + +admin.site.register(SiteConfiguration, SingletonModelAdmin) diff --git a/fmartingrcom/apps/config/context_processors.py b/fmartingrcom/apps/config/context_processors.py new file mode 100644 index 0000000..df2af10 --- /dev/null +++ b/fmartingrcom/apps/config/context_processors.py @@ -0,0 +1,7 @@ +from .models import SiteConfiguration + + +def config(request): + return { + 'config': SiteConfiguration.objects.get() + } diff --git a/fmartingrcom/apps/config/models.py b/fmartingrcom/apps/config/models.py new file mode 100644 index 0000000..bc6aad6 --- /dev/null +++ b/fmartingrcom/apps/config/models.py @@ -0,0 +1,15 @@ +from django.db import models +from solo.models import SingletonModel + + +class SiteConfiguration(SingletonModel): + google_analytics = models.CharField(max_length=128, null=True, blank=True) + readmore_tag = models.CharField(max_length=128, default='') + + def __unicode__(self): + return u'Site configuration' + + class Meta: + verbose_name = "Site Configuration" + verbose_name_plural = "Site Configuration" + diff --git a/fmartingrcom/settings/base.py b/fmartingrcom/settings/base.py index 94aee33..afb081d 100644 --- a/fmartingrcom/settings/base.py +++ b/fmartingrcom/settings/base.py @@ -31,6 +31,8 @@ ALLOWED_HOSTS = [] # APPLICATIONS # INSTALLED_APPS = ( + 'suit', + 'solo', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -41,6 +43,12 @@ INSTALLED_APPS = ( 'django_jinja', 'compressor', + + # Self + # 'fmartingrcom.apps._core', + # 'fmartingrcom.apps.homepage', + 'fmartingrcom.apps.config', + # 'fmartingrcom.apps.blog', ) @@ -56,8 +64,6 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) - - ROOT_URLCONF = 'fmartingrcom.urls' WSGI_APPLICATION = 'fmartingrcom.wsgi.application' @@ -128,3 +134,14 @@ TEMPLATE_DIRS = ( JINJA2_EXTENSIONS = [ 'compressor.contrib.jinja2ext.CompressorExtension', ] + +TEMPLATE_CONTEXT_PROCESSORS = ( + "django.contrib.auth.context_processors.auth", + "django.core.context_processors.debug", + "django.core.context_processors.i18n", + "django.core.context_processors.media", + "django.core.context_processors.static", + "django.core.context_processors.tz", + "django.contrib.messages.context_processors.messages", + "fmartingrcom.apps.config.context_processors.config" +) diff --git a/fmartingrcom/themes/v1/templates/_layout.jinja b/fmartingrcom/themes/v1/templates/_layout.jinja index 18dd433..fab3d99 100644 --- a/fmartingrcom/themes/v1/templates/_layout.jinja +++ b/fmartingrcom/themes/v1/templates/_layout.jinja @@ -89,7 +89,6 @@ {% block footer %} {% endblock %} - {# TODO preferences app {% if config.GOOGLE_ANALYTICS %} {% endif %} - #} diff --git a/requirements.txt b/requirements.txt index 8e2966f..3ffbab6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,7 @@ dj-database-url==0.3.0 django-suit==0.2.9 django-reversion==1.8.2 +jango-solo==1.0.5 pytz==2014.7