Merge branch 'main' into BC-7973-fix-avatar-border

hpi-schul-cloud · Aug 30, 2024 · a796d5b · a796d5b
2 parents ea9be3a + 49dba7e
commit a796d5b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/src/components/icons/custom/MdiCustomShelfOutline.vue b/src/components/icons/custom/MdiCustomShelfOutline.vue
@@ -0,0 +1,13 @@
+<template>
+	<svg
+		class="v-icon__svg"
+		role="img"
+		xmlns="http://www.w3.org/2000/svg"
+		viewBox="0 0 28 24"
+	>
+		<path
+			d="M10.0899 15H18.1618V7H10.0899M12.1079 9H16.1439V13H12.1079M0 15H8.07193V7H0M2.01798 9H6.05395V13H2.01798"
+		/>
+		<path d="M19.9281 15H28V7H19.9281M21.9461 9H25.982V13H21.9461" />
+	</svg>
+</template>
diff --git a/src/components/icons/custom/index.ts b/src/components/icons/custom/index.ts
@@ -29,6 +29,7 @@ import langIconEs from "./lang-icon-es.vue";
 import langIconUk from "./lang-icon-uk.vue";
 import lernstoreOutline from "./lernstore_outline.vue";
 import mdiCustomGridOutline from "./mdi_custom_grid_outline.vue";
+import MdiCustomShelfOutline from "./MdiCustomShelfOutline.vue";
 import n21 from "./n21.vue";
 import schoolOutline from "./school_outline.vue";
 import taskDoneFilled from "./task-done-filled.vue";
@@ -73,6 +74,7 @@ const customAliases: Record<string, any> = {
 	langIconUk: langIconUk,
 	lernstore_outline: lernstoreOutline,
 	mdiCustomGridOutline: mdiCustomGridOutline,
+	mdiCustomShelfOutline: MdiCustomShelfOutline,
 	n21: n21,
 	school_outline: schoolOutline,
 	taskDoneFilled: taskDoneFilled,
@@ -94,5 +96,4 @@ const customAliases: Record<string, any> = {
 // 			}),
 // 		]),
 // };
-
 export { customAliases };
diff --git a/src/locales/de.ts b/src/locales/de.ts
@@ -1742,7 +1742,7 @@ export default {
 	"utils.adminFilter.placeholder.date.until": "... und 03/03/2020",
 	"feature.media-shelf.title": "Medienregal",
 	"feature.media-shelf.emptyState":
-		"Aktuell sind noch keine Medien zur Verwendung freigeschaltet.",
+		"Aktuell sind keine Medien zur Verwendung vorhanden",
 	"feature.media-shelf.createLine": "Abschnitt hinzufügen",
 	"feature.media-shelf.line.title": "Abschnitt",
 	"feature.media-shelf.availableLine.title": "Verfügbare Medien",

diff --git a/src/locales/en.ts b/src/locales/en.ts
@@ -1711,7 +1711,7 @@ export default {
 	"utils.adminFilter.placeholder.date.until": "... and 03.03.2020",
 	"feature.media-shelf.title": "Media shelf",
 	"feature.media-shelf.emptyState":
-		"No media has currently been activated for use.",
+		"There are currently no media available for use",
 	"feature.media-shelf.createLine": "Add line",
 	"feature.media-shelf.line.title": "Line",
 	"feature.media-shelf.availableLine.title": "Available media",

diff --git a/src/locales/es.ts b/src/locales/es.ts
@@ -1762,7 +1762,7 @@ export default {
 	"utils.adminFilter.placeholder.date.until": "... y el 03.03.2020",
 	"feature.media-shelf.title": "Estante multimedia",
 	"feature.media-shelf.emptyState":
-		"Actualmente no se ha activado ningún medio para su uso.",
+		"Actualmente no hay medios disponibles para su uso",
 	"feature.media-shelf.createLine": "Añadir línea",
 	"feature.media-shelf.line.title": "Línea",
 	"feature.media-shelf.availableLine.title": "Medios disponibles",

diff --git a/src/locales/uk.ts b/src/locales/uk.ts
@@ -1733,7 +1733,7 @@ export default {
 	"utils.adminFilter.placeholder.date.until": "... і 03.03.2020",
 	"feature.media-shelf.title": "Полиця для медіа",
 	"feature.media-shelf.emptyState":
-		"Жоден носій не активовано для використання.",
+		"Наразі немає медіафайлів, доступних для використання",
 	"feature.media-shelf.createLine": "Додайте лінію",
 	"feature.media-shelf.line.title": "лінія",
 	"feature.media-shelf.availableLine.title": "Доступні медіа",

diff --git a/src/modules/page/media-shelf/MediaShelf.page.vue b/src/modules/page/media-shelf/MediaShelf.page.vue
@@ -15,7 +15,7 @@
 				@update:model-value="updateMediaBoardLayout"
 			>
 				<VBtn
-					:icon="mdiCustomGridOutline"
+					icon="$mdiCustomShelfOutline"
 					size="x-small"
 					width="48px"
 					:value="MediaBoardLayoutType.List"
@@ -64,7 +64,7 @@
 </template>
 
 <script setup lang="ts">
-import mdiCustomGridOutline from "@/components/icons/custom/mdi_custom_grid_outline.vue";
+import VCustomEmptyState from "@/components/molecules/vCustomEmptyState.vue";
 import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
 import { MediaBoardLayoutType } from "@/serverApi/v3";
 import { buildPageTitle } from "@/utils/pageTitle";
@@ -73,7 +73,6 @@ import { mdiViewGridOutline } from "@mdi/js";
 import { useTitle } from "@vueuse/core";
 import { computed, ComputedRef, onMounted } from "vue";
 import { useI18n } from "vue-i18n";
-import VCustomEmptyState from "@/components/molecules/vCustomEmptyState.vue";
 
 const { t } = useI18n();