added close-btn to all toasts

diff --git a/frontend/src/lib/Sidenav.svelte b/frontend/src/lib/Sidenav.svelte
index 671233cf2c7b112c131c66650418c979ab02f72b..76c17ee8ef5b8b62e986a6a6552245d0c7dc631d 100644 (file)
--- a/frontend/src/lib/Sidenav.svelte
+++ b/frontend/src/lib/Sidenav.svelte
@@ -392,6 +392,8 @@
                        <div class="toast-body">
                                {$t('search.toast.error')}
                        </div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -406,6 +408,8 @@
                        <div class="toast-body">
                                {$t('calendar.toast.error_bookmarking')}
                        </div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 </div>

diff --git a/frontend/src/routes/(authed)/+layout.svelte b/frontend/src/routes/(authed)/+layout.svelte
index cff007ef196ee1faf7688d56ba447a7b0b783d20..74b24cc91d7efed1727c2769112eaf6b7cd0151e 100644 (file)
--- a/frontend/src/routes/(authed)/+layout.svelte
+++ b/frontend/src/routes/(authed)/+layout.svelte
@@ -1679,6 +1679,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.saved_edit_tag_success')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -1691,6 +1693,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.saved_edit_tag_error')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -1703,6 +1707,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.delete_tag_error')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -1715,6 +1721,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.saved_settings_success')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -1727,6 +1735,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.saved_settings_error')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -1739,6 +1749,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.invalid_template_empty')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -1751,6 +1763,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.invalid_template_double')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -1763,6 +1777,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.saved_template_success')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -1775,6 +1791,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.delete_template_error')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -1787,6 +1805,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.delete_template_success')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -1799,6 +1819,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.logout_error')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 
@@ -1811,6 +1833,8 @@
        >
                <div class="d-flex">
                        <div class="toast-body">{$t('settings.toast.export_data_error')}</div>
+                       <button type="button" class="btn-close me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"
+                       ></button>
                </div>
        </div>
 </div>

diff --git a/frontend/src/routes/(authed)/read/+page.svelte b/frontend/src/routes/(authed)/read/+page.svelte
index 2ae3ca5800e05e34d2a525031803e9617c440380..acf180d5eb4a6caf69ff805cd93ffe3dcbb8f983 100644 (file)
--- a/frontend/src/routes/(authed)/read/+page.svelte
+++ b/frontend/src/routes/(authed)/read/+page.svelte
@@ -14,6 +14,9 @@
        import { Fa } from 'svelte-fa';
        import ImageViewer from '$lib/ImageViewer.svelte';
        import { alwaysShowSidenav } from '$lib/helpers.js';
+       import { getTranslate } from '@tolgee/svelte';
+
+       const { t } = getTranslate();
 
        axios.interceptors.request.use((config) => {
                config.withCredentials = true;
@@ -383,7 +386,7 @@
                                                                <div class="d-flex flex-row">
                                                                        <button type="button" class="loadImageBtn" onclick={() => loadImages()}>
                                                                                <Fa icon={faCloudArrowDown} class="me-2" size="2x" fw /><br />
-                                                                               Bilder laden
+                                                                               {$t('settings.read.load_images')}
                                                                        </button>
                                                                </div>
                                                        {:else}

diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 8e9b5a6b1128ee7b9a06575e0c2f02675a76bda7..474c3db7ab9d39661775c6a837effe2c959e146b 100644 (file)
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -121,6 +121,12 @@
                        >
                                <div class="d-flex">
                                        <div class="toast-body">Noch {available_backup_codes} Backup-Codes verfügbar!</div>
+                                       <button
+                                               type="button"
+                                               class="btn-close me-2 m-auto"
+                                               data-bs-dismiss="toast"
+                                               aria-label="Close"
+                                       ></button>
                                </div>
                        </div>
                </div>

diff --git a/frontend/src/routes/login/+page.svelte b/frontend/src/routes/login/+page.svelte
index 411fc4d0044f8cd3b500a220f18038c9834914f1..314535a39b9618f6c26fad5007f11f48b52776d1 100644 (file)
--- a/frontend/src/routes/login/+page.svelte
+++ b/frontend/src/routes/login/+page.svelte
@@ -538,6 +538,12 @@
                                <div class="toast-body">
                                        {$t('login.toast.login_expired')}
                                </div>
+                               <button
+                                       type="button"
+                                       class="btn-close me-2 m-auto"
+                                       data-bs-dismiss="toast"
+                                       aria-label="Close"
+                               ></button>
                        </div>
                </div>
 
@@ -552,6 +558,12 @@
                                <div class="toast-body">
                                        {$t('login.toast.login_invalid')}
                                </div>
+                               <button
+                                       type="button"
+                                       class="btn-close me-2 m-auto"
+                                       data-bs-dismiss="toast"
+                                       aria-label="Close"
+                               ></button>
                        </div>
                </div>
 
@@ -566,6 +578,12 @@
                                <div class="toast-body">
                                        {$t('login.toast.account_deleted')}
                                </div>
+                               <button
+                                       type="button"
+                                       class="btn-close me-2 m-auto"
+                                       data-bs-dismiss="toast"
+                                       aria-label="Close"
+                               ></button>
                        </div>
                </div>
        </div>