diff --git a/client/src/pages/mediaLibrary/MLCategoryDetailPage.vue b/client/src/pages/mediaLibrary/MLCategoryDetailPage.vue index ba6037a0..40ce36f5 100644 --- a/client/src/pages/mediaLibrary/MLCategoryDetailPage.vue +++ b/client/src/pages/mediaLibrary/MLCategoryDetailPage.vue @@ -82,8 +82,8 @@ function hasMoreItemsForType(itemType: MediaBlockType, items: T[]) {
diff --git a/client/src/types.ts b/client/src/types.ts index 69dec613..668f06b4 100644 --- a/client/src/types.ts +++ b/client/src/types.ts @@ -255,6 +255,7 @@ export interface MediaContentCollection { export interface MediaCategoryPage extends BaseCourseWagtailPage { type: "media_library.MediaCategoryPage"; overview_icon: string; + detail_image: string; introduction_text: string; description_title: string; description_text: string; diff --git a/server/vbv_lernwelt/media_library/create_default_media_library.py b/server/vbv_lernwelt/media_library/create_default_media_library.py index bcbb0608..13162e11 100644 --- a/server/vbv_lernwelt/media_library/create_default_media_library.py +++ b/server/vbv_lernwelt/media_library/create_default_media_library.py @@ -42,10 +42,12 @@ def create_default_media_library(): ] for idx, cat in enumerate(course.coursecategory_set.all()): overview_icon = icons[(idx + len(icons) - 1) % len(icons)] + detail_image = overview_icon.replace("icon", "image") if cat.title == "Fahrzeug": media_category = MediaCategoryPageFactory( overview_icon=overview_icon, + detail_image=detail_image, title=cat.title, course_category=cat, parent=media_lib_page, @@ -177,6 +179,7 @@ die der Fahrzeugbesitzer und die Fahrzeugbesitzerin in einem grösseren Schadenf elif cat.title == "Reisen": media_category = MediaCategoryPageFactory( overview_icon=overview_icon, + detail_image=detail_image, title=cat.title, course_category=cat, parent=media_lib_page, diff --git a/server/vbv_lernwelt/media_library/migrations/0003_mediacategorypage_detail_image.py b/server/vbv_lernwelt/media_library/migrations/0003_mediacategorypage_detail_image.py new file mode 100644 index 00000000..f9138ff3 --- /dev/null +++ b/server/vbv_lernwelt/media_library/migrations/0003_mediacategorypage_detail_image.py @@ -0,0 +1,17 @@ +# Generated by Django 4.0.8 on 2022-11-07 09:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("media_library", "0002_alter_mediacategorypage_body"), + ] + + operations = [ + migrations.AddField( + model_name="mediacategorypage", + name="detail_image", + field=models.CharField(default="image-hf-fahrzeug", max_length=255), + ), + ] diff --git a/server/vbv_lernwelt/media_library/models.py b/server/vbv_lernwelt/media_library/models.py index 642f08f4..e3e1fe2a 100644 --- a/server/vbv_lernwelt/media_library/models.py +++ b/server/vbv_lernwelt/media_library/models.py @@ -61,6 +61,7 @@ class MediaCategoryPage(Page): ) overview_icon = models.CharField(max_length=255, default="icon-hf-fahrzeug") + detail_image = models.CharField(max_length=255, default="image-hf-fahrzeug") body = fields.StreamField( [("content_collection", MediaContentCollection())], @@ -96,6 +97,7 @@ class MediaCategoryPage(Page): "course_category", "introduction_text", "overview_icon", + "detail_image", "description_title", "description_text", "items", diff --git a/server/vbv_lernwelt/static/icons/demo/icon-hf-einkommenssicherung.svg b/server/vbv_lernwelt/static/icons/demo/icon-hf-einkommenssicherung.svg deleted file mode 100644 index 6b863a1c..00000000 --- a/server/vbv_lernwelt/static/icons/demo/icon-hf-einkommenssicherung.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/server/vbv_lernwelt/static/icons/demo/icon-hf-fahrzeug.svg b/server/vbv_lernwelt/static/icons/demo/icon-hf-fahrzeug.svg deleted file mode 100644 index a750c6f0..00000000 --- a/server/vbv_lernwelt/static/icons/demo/icon-hf-fahrzeug.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/server/vbv_lernwelt/static/icons/demo/image-hf-fahrzeug.png b/server/vbv_lernwelt/static/icons/demo/image-hf-fahrzeug.png new file mode 100644 index 00000000..0d19d6d2 Binary files /dev/null and b/server/vbv_lernwelt/static/icons/demo/image-hf-fahrzeug.png differ diff --git a/server/vbv_lernwelt/static/icons/demo/image-hf-reisen.png b/server/vbv_lernwelt/static/icons/demo/image-hf-reisen.png new file mode 100644 index 00000000..f9aa3c2a Binary files /dev/null and b/server/vbv_lernwelt/static/icons/demo/image-hf-reisen.png differ