diff --git a/OACPL/settings.base.py b/OACPL/settings.base.py index d3ec7c2..7324410 100644 --- a/OACPL/settings.base.py +++ b/OACPL/settings.base.py @@ -53,7 +53,8 @@ INSTALLED_APPS = [ 'main.apps.MainConfig', 'newsletters.apps.NewslettersConfig', 'tinymce', - 'widget_tweaks' + 'widget_tweaks', + 'variables' ] MIDDLEWARE = [ diff --git a/main/templates/index.html b/main/templates/index.html index f24d861..d9e65d4 100644 --- a/main/templates/index.html +++ b/main/templates/index.html @@ -5,7 +5,7 @@ @@ -18,10 +20,12 @@ {{ form.media }} @@ -37,7 +41,8 @@ + {% if banner.value %} +
{{ banner.value | safe }}
+ {% endif %} {% endif %} @@ -99,7 +110,8 @@ {% endif %} diff --git a/variables/__init__.py b/variables/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/variables/admin.py b/variables/admin.py new file mode 100644 index 0000000..81aa2c4 --- /dev/null +++ b/variables/admin.py @@ -0,0 +1,16 @@ +from django.contrib import admin + +from .models import Variable + + +@admin.register(Variable) +class VariableAdmin(admin.ModelAdmin): + fields = ['key', 'help_text', 'value'] + list_display = ['key', 'value', 'help_text'] + + def get_form(self, request, obj=None, **kwargs): + if obj: + self.readonly_fields = ['help_text', 'key'] + else: + self.readonly_fields = [] + return super().get_form(request, obj, **kwargs) diff --git a/variables/apps.py b/variables/apps.py new file mode 100644 index 0000000..7dee2a5 --- /dev/null +++ b/variables/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class VariablesConfig(AppConfig): + name = 'variables' diff --git a/variables/migrations/0001_initial.py b/variables/migrations/0001_initial.py new file mode 100644 index 0000000..1937c1c --- /dev/null +++ b/variables/migrations/0001_initial.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2018-01-31 23:23 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Variable', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('key', models.CharField(max_length=20)), + ('value', models.CharField(max_length=1000)), + ('help_text', models.CharField(max_length=1000)), + ], + ), + ] diff --git a/variables/migrations/0002_auto_20180131_1829.py b/variables/migrations/0002_auto_20180131_1829.py new file mode 100644 index 0000000..25d07b3 --- /dev/null +++ b/variables/migrations/0002_auto_20180131_1829.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2018-01-31 23:29 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('variables', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='variable', + name='help_text', + field=models.CharField(blank=True, max_length=1000, null=True), + ), + migrations.AlterField( + model_name='variable', + name='key', + field=models.CharField(max_length=20, unique=True), + ), + migrations.AlterField( + model_name='variable', + name='value', + field=models.CharField(blank=True, max_length=1000, null=True), + ), + ] diff --git a/variables/migrations/0003_auto_20180131_1834.py b/variables/migrations/0003_auto_20180131_1834.py new file mode 100644 index 0000000..961aca6 --- /dev/null +++ b/variables/migrations/0003_auto_20180131_1834.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2018-01-31 23:34 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('variables', '0002_auto_20180131_1829'), + ] + + operations = [ + migrations.AlterField( + model_name='variable', + name='help_text', + field=models.TextField(blank=True, null=True), + ), + ] diff --git a/variables/migrations/0004_auto_20180131_1834.py b/variables/migrations/0004_auto_20180131_1834.py new file mode 100644 index 0000000..7aa1279 --- /dev/null +++ b/variables/migrations/0004_auto_20180131_1834.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2018-01-31 23:34 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('variables', '0003_auto_20180131_1834'), + ] + + operations = [ + migrations.AlterField( + model_name='variable', + name='help_text', + field=models.CharField(blank=True, max_length=1000, null=True), + ), + migrations.AlterField( + model_name='variable', + name='value', + field=models.TextField(blank=True, null=True), + ), + ] diff --git a/variables/migrations/__init__.py b/variables/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/variables/models.py b/variables/models.py new file mode 100644 index 0000000..526edb9 --- /dev/null +++ b/variables/models.py @@ -0,0 +1,7 @@ +from django.db import models + + +class Variable(models.Model): + key = models.CharField(max_length=20, unique=True) + value = models.TextField(blank=True, null=True) + help_text = models.CharField(max_length=1000, blank=True, null=True) diff --git a/variables/tests.py b/variables/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/variables/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/variables/views.py b/variables/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/variables/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here.