use flatblocks for motd

6 files changed, 8 insertions, 5 deletions

diff --git a/requirements.txt b/requirements.txt
index 3ad23d5..54ef3ae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,3 +11,4 @@ django-celery==2.4.2
 redis==2.4.10
 django-redisession==0.2
 sorl-thumbnail==11.12
+django-flatblocks==0.6.0
diff --git a/sublab_project/fixtures/flatblocks.json b/sublab_project/fixtures/flatblocks.json
new file mode 100644
index 0000000..ae1f010
--- /dev/null
+++ b/sublab_project/fixtures/flatblocks.json
@@ -0,0 +1 @@
+[{"pk": 1, "model": "flatblocks.flatblock", "fields": {"content": "sublab website - jetzt mit <a href=\"http://djangoproject.com/\">Django</a>", "header": "", "slug": "motd"}}]
\ No newline at end of file
diff --git a/sublab_project/fixtures/permissions.json b/sublab_project/fixtures/permissions.json
index 4d1d178..f3473b0 100644
--- a/sublab_project/fixtures/permissions.json
+++ b/sublab_project/fixtures/permissions.json
@@ -1 +1 @@
-[{"pk": 67, "model": "auth.permission", "fields": {"codename": "add_userprofile", "name": "Can add user profile", "content_type": 23}}, {"pk": 68, "model": "auth.permission", "fields": {"codename": "change_userprofile", "name": "Can change user profile", "content_type": 23}}, {"pk": 69, "model": "auth.permission", "fields": {"codename": "delete_userprofile", "name": "Can delete user profile", "content_type": 23}}, {"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 8}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": 4}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": 4}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": 4}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 3}}, {"pk": 64, "model": "auth.permission", "fields": {"codename": "add_event", "name": "Can add Termin", "content_type": 22}}, {"pk": 65, "model": "auth.permission", "fields": {"codename": "change_event", "name": "Can change Termin", "content_type": 22}}, {"pk": 66, "model": "auth.permission", "fields": {"codename": "delete_event", "name": "Can delete Termin", "content_type": 22}}, {"pk": 13, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 5}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 5}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 5}}, {"pk": 49, "model": "auth.permission", "fields": {"codename": "add_crontabschedule", "name": "Can add crontab", "content_type": 17}}, {"pk": 50, "model": "auth.permission", "fields": {"codename": "change_crontabschedule", "name": "Can change crontab", "content_type": 17}}, {"pk": 51, "model": "auth.permission", "fields": {"codename": "delete_crontabschedule", "name": "Can delete crontab", "content_type": 17}}, {"pk": 46, "model": "auth.permission", "fields": {"codename": "add_intervalschedule", "name": "Can add interval", "content_type": 16}}, {"pk": 47, "model": "auth.permission", "fields": {"codename": "change_intervalschedule", "name": "Can change interval", "content_type": 16}}, {"pk": 48, "model": "auth.permission", "fields": {"codename": "delete_intervalschedule", "name": "Can delete interval", "content_type": 16}}, {"pk": 55, "model": "auth.permission", "fields": {"codename": "add_periodictask", "name": "Can add periodic task", "content_type": 19}}, {"pk": 56, "model": "auth.permission", "fields": {"codename": "change_periodictask", "name": "Can change periodic task", "content_type": 19}}, {"pk": 57, "model": "auth.permission", "fields": {"codename": "delete_periodictask", "name": "Can delete periodic task", "content_type": 19}}, {"pk": 52, "model": "auth.permission", "fields": {"codename": "add_periodictasks", "name": "Can add periodic tasks", "content_type": 18}}, {"pk": 53, "model": "auth.permission", "fields": {"codename": "change_periodictasks", "name": "Can change periodic tasks", "content_type": 18}}, {"pk": 54, "model": "auth.permission", "fields": {"codename": "delete_periodictasks", "name": "Can delete periodic tasks", "content_type": 18}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "add_taskmeta", "name": "Can add task meta", "content_type": 14}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_taskmeta", "name": "Can change task meta", "content_type": 14}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "delete_taskmeta", "name": "Can delete task meta", "content_type": 14}}, {"pk": 43, "model": "auth.permission", "fields": {"codename": "add_tasksetmeta", "name": "Can add taskset meta", "content_type": 15}}, {"pk": 44, "model": "auth.permission", "fields": {"codename": "change_tasksetmeta", "name": "Can change taskset meta", "content_type": 15}}, {"pk": 45, "model": "auth.permission", "fields": {"codename": "delete_tasksetmeta", "name": "Can delete taskset meta", "content_type": 15}}, {"pk": 61, "model": "auth.permission", "fields": {"codename": "add_taskstate", "name": "Can add task", "content_type": 21}}, {"pk": 62, "model": "auth.permission", "fields": {"codename": "change_taskstate", "name": "Can change task", "content_type": 21}}, {"pk": 63, "model": "auth.permission", "fields": {"codename": "delete_taskstate", "name": "Can delete task", "content_type": 21}}, {"pk": 58, "model": "auth.permission", "fields": {"codename": "add_workerstate", "name": "Can add worker", "content_type": 20}}, {"pk": 59, "model": "auth.permission", "fields": {"codename": "change_workerstate", "name": "Can change worker", "content_type": 20}}, {"pk": 60, "model": "auth.permission", "fields": {"codename": "delete_workerstate", "name": "Can delete worker", "content_type": 20}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_flatpage", "name": "Can add flat page", "content_type": 9}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_flatpage", "name": "Can change flat page", "content_type": 9}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_flatpage", "name": "Can delete flat page", "content_type": 9}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_news", "name": "Can add News", "content_type": 12}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "change_news", "name": "Can change News", "content_type": 12}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "delete_news", "name": "Can delete News", "content_type": 12}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "add_project", "name": "Can add Projekt", "content_type": 13}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_project", "name": "Can change Projekt", "content_type": 13}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "delete_project", "name": "Can delete Projekt", "content_type": 13}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": 6}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": 6}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 6}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_site", "name": "Can add site", "content_type": 7}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_site", "name": "Can change site", "content_type": 7}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_site", "name": "Can delete site", "content_type": 7}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_migrationhistory", "name": "Can add migration history", "content_type": 10}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_migrationhistory", "name": "Can change migration history", "content_type": 10}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_migrationhistory", "name": "Can delete migration history", "content_type": 10}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_kvstore", "name": "Can add kv store", "content_type": 11}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_kvstore", "name": "Can change kv store", "content_type": 11}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_kvstore", "name": "Can delete kv store", "content_type": 11}}, {"pk": 1, "model": "auth.group", "fields": {"name": "members", "permissions": [64, 65, 66, 25, 26, 27, 34, 35, 36, 37, 38, 39]}}]
\ No newline at end of file
+[{"pk": 67, "model": "auth.permission", "fields": {"codename": "add_userprofile", "name": "Can add user profile", "content_type": 23}}, {"pk": 68, "model": "auth.permission", "fields": {"codename": "change_userprofile", "name": "Can change user profile", "content_type": 23}}, {"pk": 69, "model": "auth.permission", "fields": {"codename": "delete_userprofile", "name": "Can delete user profile", "content_type": 23}}, {"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 8}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": 4}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": 4}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": 4}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 3}}, {"pk": 64, "model": "auth.permission", "fields": {"codename": "add_event", "name": "Can add Termin", "content_type": 22}}, {"pk": 65, "model": "auth.permission", "fields": {"codename": "change_event", "name": "Can change Termin", "content_type": 22}}, {"pk": 66, "model": "auth.permission", "fields": {"codename": "delete_event", "name": "Can delete Termin", "content_type": 22}}, {"pk": 13, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 5}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 5}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 5}}, {"pk": 49, "model": "auth.permission", "fields": {"codename": "add_crontabschedule", "name": "Can add crontab", "content_type": 17}}, {"pk": 50, "model": "auth.permission", "fields": {"codename": "change_crontabschedule", "name": "Can change crontab", "content_type": 17}}, {"pk": 51, "model": "auth.permission", "fields": {"codename": "delete_crontabschedule", "name": "Can delete crontab", "content_type": 17}}, {"pk": 46, "model": "auth.permission", "fields": {"codename": "add_intervalschedule", "name": "Can add interval", "content_type": 16}}, {"pk": 47, "model": "auth.permission", "fields": {"codename": "change_intervalschedule", "name": "Can change interval", "content_type": 16}}, {"pk": 48, "model": "auth.permission", "fields": {"codename": "delete_intervalschedule", "name": "Can delete interval", "content_type": 16}}, {"pk": 55, "model": "auth.permission", "fields": {"codename": "add_periodictask", "name": "Can add periodic task", "content_type": 19}}, {"pk": 56, "model": "auth.permission", "fields": {"codename": "change_periodictask", "name": "Can change periodic task", "content_type": 19}}, {"pk": 57, "model": "auth.permission", "fields": {"codename": "delete_periodictask", "name": "Can delete periodic task", "content_type": 19}}, {"pk": 52, "model": "auth.permission", "fields": {"codename": "add_periodictasks", "name": "Can add periodic tasks", "content_type": 18}}, {"pk": 53, "model": "auth.permission", "fields": {"codename": "change_periodictasks", "name": "Can change periodic tasks", "content_type": 18}}, {"pk": 54, "model": "auth.permission", "fields": {"codename": "delete_periodictasks", "name": "Can delete periodic tasks", "content_type": 18}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "add_taskmeta", "name": "Can add task meta", "content_type": 14}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_taskmeta", "name": "Can change task meta", "content_type": 14}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "delete_taskmeta", "name": "Can delete task meta", "content_type": 14}}, {"pk": 43, "model": "auth.permission", "fields": {"codename": "add_tasksetmeta", "name": "Can add taskset meta", "content_type": 15}}, {"pk": 44, "model": "auth.permission", "fields": {"codename": "change_tasksetmeta", "name": "Can change taskset meta", "content_type": 15}}, {"pk": 45, "model": "auth.permission", "fields": {"codename": "delete_tasksetmeta", "name": "Can delete taskset meta", "content_type": 15}}, {"pk": 61, "model": "auth.permission", "fields": {"codename": "add_taskstate", "name": "Can add task", "content_type": 21}}, {"pk": 62, "model": "auth.permission", "fields": {"codename": "change_taskstate", "name": "Can change task", "content_type": 21}}, {"pk": 63, "model": "auth.permission", "fields": {"codename": "delete_taskstate", "name": "Can delete task", "content_type": 21}}, {"pk": 58, "model": "auth.permission", "fields": {"codename": "add_workerstate", "name": "Can add worker", "content_type": 20}}, {"pk": 59, "model": "auth.permission", "fields": {"codename": "change_workerstate", "name": "Can change worker", "content_type": 20}}, {"pk": 60, "model": "auth.permission", "fields": {"codename": "delete_workerstate", "name": "Can delete worker", "content_type": 20}}, {"pk": 70, "model": "auth.permission", "fields": {"codename": "add_flatblock", "name": "Can add Flat block", "content_type": 24}}, {"pk": 71, "model": "auth.permission", "fields": {"codename": "change_flatblock", "name": "Can change Flat block", "content_type": 24}}, {"pk": 72, "model": "auth.permission", "fields": {"codename": "delete_flatblock", "name": "Can delete Flat block", "content_type": 24}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_flatpage", "name": "Can add flat page", "content_type": 9}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_flatpage", "name": "Can change flat page", "content_type": 9}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_flatpage", "name": "Can delete flat page", "content_type": 9}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_news", "name": "Can add News", "content_type": 12}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "change_news", "name": "Can change News", "content_type": 12}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "delete_news", "name": "Can delete News", "content_type": 12}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "add_project", "name": "Can add Projekt", "content_type": 13}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_project", "name": "Can change Projekt", "content_type": 13}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "delete_project", "name": "Can delete Projekt", "content_type": 13}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": 6}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": 6}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 6}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_site", "name": "Can add site", "content_type": 7}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_site", "name": "Can change site", "content_type": 7}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_site", "name": "Can delete site", "content_type": 7}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_migrationhistory", "name": "Can add migration history", "content_type": 10}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_migrationhistory", "name": "Can change migration history", "content_type": 10}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_migrationhistory", "name": "Can delete migration history", "content_type": 10}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_kvstore", "name": "Can add kv store", "content_type": 11}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_kvstore", "name": "Can change kv store", "content_type": 11}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_kvstore", "name": "Can delete kv store", "content_type": 11}}, {"pk": 1, "model": "auth.group", "fields": {"name": "members", "permissions": [64, 65, 66, 71, 25, 26, 27, 34, 35, 36, 37, 38, 39]}}]
\ No newline at end of file
diff --git a/sublab_project/settings.py b/sublab_project/settings.py
index 3739fb5..a1edc25 100644
--- a/sublab_project/settings.py
+++ b/sublab_project/settings.py
@@ -141,7 +141,8 @@ INSTALLED_APPS = (
     'redisession',
     'sorl.thumbnail',
     'preview_admin',
-    'sublab_monitor'
+    'sublab_monitor',
+    'flatblocks'
 )
 
 # A sample logging configuration. The only tangible logging
diff --git a/sublab_project/templates/base.html b/sublab_project/templates/base.html
index 41b7d59..8dc99b0 100644
--- a/sublab_project/templates/base.html
+++ b/sublab_project/templates/base.html
@@ -1,4 +1,5 @@
 {% load host_status %}
+{% load flatblock_tags %}
 <!DOCTYPE HTML>
 <html>
 	<head>
@@ -102,9 +103,7 @@
 				</div>
 				<hr>
 				<p class="status">
-					{% block motd %}
-					sublab website - jetzt mit <a href="http://djangoproject.com/">Django</a>
-					{% endblock %}
+					{% flatblock "motd" %}
 				</p>
 				<hr>
 				<a href="/webcam/" class="img"><img src="{{ STATIC_URL }}img/thumb.rack.webcam.jpg" alt="Webcam im Fenster" class="webcamthumb"></a>
diff --git a/sublab_project/templates/flatblocks/flatblock.html b/sublab_project/templates/flatblocks/flatblock.html
new file mode 100644
index 0000000..c926c4a
--- /dev/null
+++ b/sublab_project/templates/flatblocks/flatblock.html
@@ -0,0 +1 @@
+{{ flatblock.content|safe }}