Add interdisciplinary instrument

client/src/components/ContentBlock.vue

@@ -57,7 +57,9 @@
 
   const instruments = {
     base_communication: 'Sprache & Kommunikation',
-    base_society: 'Gesellschaft'
+    base_society: 'Gesellschaft',
+    base_interdisciplinary: 'Überfachliches Instrument',
+
   };
 
   export default {
@@ -291,6 +293,14 @@
       }
     }
 
+    &--base_interdisciplinary {
+      @include content-box($color-accent-4-list);
+
+      .content-block__instrument-label {
+        color: $color-accent-4-dark;
+      }
+    }
+
     /deep/ p {
       line-height: 1.5;
       margin-bottom: 1em;

client/src/styles/_variables.scss

@@ -21,6 +21,7 @@ $color-accent-5: #DBE6EC;
 
 $color-accent-1-list: $color-accent-1 $color-accent-1-light $color-accent-1-dark;
 $color-accent-2-list: $color-accent-2 $color-accent-2-light $color-accent-2-dark;
+$color-accent-4-list: $color-accent-4 $color-accent-4-light $color-accent-4-dark;
 
 /* brand */
 $color-brand-dark: #138E72;

server/basicknowledge/migrations/0005_auto_20200408_0834.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.15 on 2020-04-08 08:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('basicknowledge', '0004_auto_20191128_1601'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='basicknowledge',
+            name='type',
+            field=models.CharField(choices=[('language_communication', 'Sprache & Kommunikation'), ('society', 'Gesellschaft'), ('interdisciplinary', 'Überfachliches Instrument')], max_length=100),
+        ),
+    ]

server/basicknowledge/models.py

@@ -26,10 +26,12 @@ class BasicKnowledge(StrictHierarchyPage):
 
     LANGUAGE_COMMUNICATION = 'language_communication'
     SOCIETY = 'society'
+    INTERDISCIPLINARY = 'interdisciplinary'
 
     TYPE_CHOICES = (
         (LANGUAGE_COMMUNICATION, 'Sprache & Kommunikation'),
         (SOCIETY, 'Gesellschaft'),
+        (INTERDISCIPLINARY, 'Überfachliches Instrument'),
     )
 
     type = models.CharField(

server/books/migrations/0019_auto_20200408_0841.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.15 on 2020-04-08 08:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0018_remove_module_solutions_enabled_by'),
+    ]
+
+    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'), ('base_interdisciplinary', 'Überfachliches Instrument')], default='normal', max_length=100),
+        ),
+    ]

server/books/models/contentblock.py

@@ -27,12 +27,14 @@ class ContentBlock(StrictHierarchyPage):
     BASE_COMMUNICATION = 'base_communication'
     TASK = 'task'
     BASE_SOCIETY = 'base_society'
+    BASE_INTERDISCIPLINARY = 'base_interdisciplinary'
 
     TYPE_CHOICES = (
         (NORMAL, 'Normal'),
         (BASE_COMMUNICATION, 'Instrument Sprache & Kommunikation'),
         (TASK, 'Auftrag'),
         (BASE_SOCIETY, 'Instrument Gesellschaft'),
+        (BASE_INTERDISCIPLINARY, 'Überfachliches Instrument'),
     )
 
     # blocks without owner are visible by default, need to be hidden for each class