Merge branch 'server' into master

.idea/workspace.xml

@@ -670,12 +670,18 @@
       <option name="project" value="LOCAL" />
       <updated>1524911299889</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="Add a quicklaunch with shortcodes for timetable | Add a page for substitutions (without code)">
+      <created>1526737919793</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1526737919793</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="ToolWindowManager">
     <frame x="-3" y="33" width="1926" height="1041" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5010672" side_tool="true" visible="true" weight="0.21953897" />
@@ -726,7 +732,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Translate login/logout | Comment header" />
     <MESSAGE value="Add dashboard with last activities (look at README)" />
     <MESSAGE value="Add dashboard with last activities (look at README) [ADD UNVERSIONED FILES, MISTAKE]" />
     <MESSAGE value="Add notifications to dashboard" />
@@ -751,7 +756,8 @@
     <MESSAGE value="First notification with email in AUB" />
     <MESSAGE value="Finish AUB notification" />
     <MESSAGE value="Change infrastructure for server" />
-    <option name="LAST_COMMIT_MESSAGE" value="Change infrastructure for server" />
+    <MESSAGE value="Add a quicklaunch with shortcodes for timetable | Add a page for substitutions (without code)" />
+    <option name="LAST_COMMIT_MESSAGE" value="Add a quicklaunch with shortcodes for timetable | Add a page for substitutions (without code)" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
   </component>

README.md

@@ -18,7 +18,8 @@ keine
 ## Installation
 ### Grundsystem
 ```
-apt install python3 python3-dev python3-pip  git mariadb-server python3-venv libldap2-dev libsasl2-dev```
+apt install python3 python3-dev python3-pip  git mariadb-server python3-venv libldap2-dev libsasl2-dev
+```
 
 ### MySQL-Datenbank
 1. Datenbank `schoolapps` (`utf8_general_ci`) anlegen

schoolapps/aub/migrations/0001_initial.py

-# Generated by Django 2.0.4 on 2018-04-10 11:02
+# Generated by Django 2.0.4 on 2018-05-01 08:48
 
 from django.conf import settings
 from django.db import migrations, models
@@ -25,15 +25,7 @@ class Migration(migrations.Migration):
                 ('created_by', models.ForeignKey(default=1, on_delete=models.SET(1), related_name='aubs', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'permissions': (('apply_for_aub', 'Apply for a AUB'), ('allow_aub', 'Allow a AUB'), ('check_aub', 'Check a AUB')),
+                'permissions': (('apply_for_aub', 'Apply for a AUB'), ('cancel_aub', 'Cancel a AUB'), ('allow1_aub', 'First permission'), ('allow2_aub', 'Second permission'), ('check1_aub', 'Check a AUB'), ('check2_aub', 'Check a AUB')),
             },
         ),
-        migrations.CreateModel(
-            name='Status',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100)),
-                ('style_classes', models.CharField(max_length=200)),
-            ],
-        ),
     ]

schoolapps/aub/migrations/0002_status.py

+# Generated by Django 2.0.4 on 2018-05-01 08:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aub', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Status',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('style_classes', models.CharField(max_length=200)),
+            ],
+        ),
+    ]

schoolapps/aub/migrations/0002_aub_status.py → schoolapps/aub/migrations/0003_aub_status.py

-# Generated by Django 2.0.4 on 2018-04-10 11:03
+# Generated by Django 2.0.4 on 2018-05-01 08:50
 
 from django.db import migrations, models
 
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('aub', '0001_initial'),
+        ('aub', '0002_status'),
     ]
 
     operations = [

schoolapps/aub/migrations/0003_auto_20180410_2343.py

-# Generated by Django 2.0.4 on 2018-04-10 21:43
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('aub', '0002_aub_status'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='aub',
-            options={'permissions': (('apply_for_aub', 'Apply for a AUB'), ('cancel_aub', 'Cancel a AUB'), ('allow1_aub', 'First permission'), ('allow2_aub', 'Second permission'), ('check_aub', 'Check a AUB'))},
-        ),
-    ]

schoolapps/aub/migrations/0004_auto_20180411_0007.py

-# Generated by Django 2.0.4 on 2018-04-10 22:07
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('aub', '0003_auto_20180410_2343'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='aub',
-            options={'permissions': (('apply_for_aub', 'Apply for a AUB'), ('cancel_aub', 'Cancel a AUB'), ('allow1_aub', 'First permission'), ('allow2_aub', 'Second permission'), ('check1_aub', 'Check a AUB'), ('check2_aub', 'Check a AUB'))},
-        ),
-    ]

schoolapps/aub/migrations/0005_auto_20180412_1109.py

-# Generated by Django 2.0.3 on 2018-04-12 09:09
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('aub', '0004_auto_20180411_0007'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='aub',
-            name='created_by',
-            field=models.ForeignKey(default=3, on_delete=models.SET(3), related_name='aubs', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='aub',
-            name='status',
-            field=models.ForeignKey(default=2, on_delete=models.SET(2), related_name='aubs', to='aub.Status'),
-        ),
-    ]

schoolapps/schoolapps/settings.py

@@ -26,9 +26,12 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # Provided by secure_settings
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = [
+    'info.katharineum.de',
+    '178.63.239.184',
+]
 
 # Application definition
 
@@ -60,7 +63,9 @@ ROOT_URLCONF = 'schoolapps.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': ['./templates', '/srv/sites/school-apps/schoolapps/templates'],
+        'DIRS': [
+            os.path.join(BASE_DIR, 'templates')
+        ],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [