Update naming to be more consistent

server/assignments/wagtail_hooks.py

@@ -4,7 +4,7 @@ from .models import Assignment
 
 class AssignmentAdmin(ModelAdmin):
     model = Assignment
-    menu_label = 'Aufgaben'
+    menu_label = 'Assignments'
     list_display = ('title', 'module', 'pk',)
 
 

server/basicknowledge/migrations/0003_auto_20190912_1228.py

@@ -0,0 +1,17 @@
+# Generated by Django 2.0.6 on 2019-09-12 12:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('basicknowledge', '0002_auto_20190722_0932'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='basicknowledge',
+            options={'verbose_name': 'Instrument'},
+        ),
+    ]

server/basicknowledge/models.py

@@ -41,3 +41,6 @@ class BasicKnowledge(StrictHierarchyPage):
         FieldPanel('type'),
         StreamFieldPanel('contents')
     ]
+
+    class Meta:
+        verbose_name = 'Instrument'

server/basicknowledge/wagtail_hooks.py

@@ -4,7 +4,7 @@ from .models import BasicKnowledge
 
 class InstrumentAdmin(ModelAdmin):
     model = BasicKnowledge
-    menu_label = 'Instrument'
+    menu_label = 'Instruments'
     list_display = ('title',)
 
 

server/books/migrations/0014_auto_20190912_1228.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.6 on 2019-09-12 12:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0013_auto_20190808_0649'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contentblock',
+            name='type',
+            field=models.CharField(choices=[('normal', 'Normal'), ('base_communication', 'Instrument Sprache & Kommunikation'), ('task', 'Auftrag'), ('base_society', 'Instrument Gesellschaft')], default='normal', max_length=100),
+        ),
+    ]

server/books/models/contentblock.py

@@ -29,7 +29,7 @@ class ContentBlock(StrictHierarchyPage):
     TYPE_CHOICES = (
         (NORMAL, 'Normal'),
         (BASE_COMMUNICATION, 'Instrument Sprache & Kommunikation'),
-        (TASK, 'Aufgabe'),
+        (TASK, 'Auftrag'),
         (BASE_SOCIETY, 'Instrument Gesellschaft'),
     )
 

server/core/templates/wagtailadmin/base.html

@@ -2,5 +2,5 @@
 {% load staticfiles %}
 
 {% block branding_logo %}
-    skillBox
+    Myskillbox
 {% endblock %}