diff --git a/app.vue b/app.vue index 8f4bcb7e..781a234c 100644 --- a/app.vue +++ b/app.vue @@ -547,7 +547,7 @@ a:hover, a:active { color: inherit; text-decoration: none; - font-weight: 500; + font-weight: 600; } .skiplink:not(:focus) { diff --git a/components/common/DomainSelector.vue b/components/common/DomainSelector.vue index d7726f11..62c7f526 100644 --- a/components/common/DomainSelector.vue +++ b/components/common/DomainSelector.vue @@ -12,9 +12,10 @@
- + mdi-account-multiple - + +

{{ $t("toutesPersonnes") }}
@@ -29,7 +30,7 @@ import { ref, watch } from 'vue'; import { useI18n } from "vue-i18n"; -const { t } = useI18n(); +const { t, locale } = useI18n(); const selected = ref('theses'); const router = useRouter(); const currentRoute = useRoute(); diff --git a/components/common/ExportQueryButton.vue b/components/common/ExportQueryButton.vue index 9e589824..9dc7b97f 100644 --- a/components/common/ExportQueryButton.vue +++ b/components/common/ExportQueryButton.vue @@ -2,7 +2,7 @@ diff --git a/components/common/FooterCustom.vue b/components/common/FooterCustom.vue index b8607e8f..e2ad0348 100644 --- a/components/common/FooterCustom.vue +++ b/components/common/FooterCustom.vue @@ -3,13 +3,14 @@ @@ -88,22 +89,22 @@ + :title="$t('footer.accesDonnees')"> {{ $t("donnees") }} | {{ $t("CGU") }} + :title="$t('footer.accesCGU')">{{ $t("CGU") }} | + target="_blank" :title="$t('footer.accesMention')"> {{ $t("mentions") }} | + :title="$t('footer.accesAccessibilite')"> {{ $t("accessibilite") }}

diff --git a/components/common/HeaderCustom.vue b/components/common/HeaderCustom.vue index 4274bdff..e16fdd2c 100644 --- a/components/common/HeaderCustom.vue +++ b/components/common/HeaderCustom.vue @@ -66,6 +66,8 @@ import { useColorMode } from '@vueuse/core'; const theme = useTheme(); const { locale } = useI18n(); const { mobile } = useDisplay(); +const route = useRoute(); +const router = useRouter(); const isReady = ref(false); @@ -115,6 +117,11 @@ onMounted(() => { function setLanguage(lang) { localStorage.setItem("language", lang); locale.value = lang; + + if (/\/(fr|en|es)\//.test(route.path)) { + const newPath = route.path.replace(/\/(fr|en|es)\//, `/${lang}/`); + router.push(newPath); + } useHead({ htmlAttrs: { lang: lang, diff --git a/components/common/HeaderMobile.vue b/components/common/HeaderMobile.vue index 228c4172..8ebe0dab 100644 --- a/components/common/HeaderMobile.vue +++ b/components/common/HeaderMobile.vue @@ -40,7 +40,7 @@
- @@ -138,6 +138,8 @@ import { useColorMode } from '@vueuse/core' const theme = useTheme(); const { locale } = useI18n(); const isReady = ref(false); +const route = useRoute(); +const router = useRouter(); const selectedThemeSwitch = ref(''); // Elements du DOM @@ -243,6 +245,11 @@ onMounted(() => { function setLanguage(lang) { localStorage.setItem("language", lang); locale.value = lang; + + if (/\/(fr|en|es)\//.test(route.path)) { + const newPath = route.path.replace(/\/(fr|en|es)\//, `/${lang}/`); + router.push(newPath); + } } //Paramètres d'accessibilité diff --git a/components/common/Keywords.vue b/components/common/Keywords.vue index 6f7e8268..3e12de46 100644 --- a/components/common/Keywords.vue +++ b/components/common/Keywords.vue @@ -12,15 +12,15 @@

{{ $t("motCleControle") }}

- + mdi-information-outline - Informations sur les mots clés + {{ $t("infoKeywords") }}
- {{ $t("motCleControleDescription") }} idRef. + {{ $t("motCleControleDescription") }} idRef.
{{ $t('access.fermer') }} diff --git a/components/common/Toolbar.vue b/components/common/Toolbar.vue index d2060045..0575d5a1 100644 --- a/components/common/Toolbar.vue +++ b/components/common/Toolbar.vue @@ -36,11 +36,11 @@
+ :alt="$t('footer.accessDoc')" target="_blank" variant="outlined" flat append-icon="mdi-alert-circle" role="listitem"> {{ $t("theseView.alert") }} {{ $t("theseView.alert") }} @@ -49,13 +49,13 @@
+ :alt="$t('footer.accessDoc')" target="_blank" variant="outlined" flat append-icon="mdi-alert-circle" role="listitem"> {{ $t("theseView.alert") }}
{{ $t("theseView.alert") }} diff --git a/components/common/results/FacetDrawer.vue b/components/common/results/FacetDrawer.vue index bee46501..1a9b73dc 100644 --- a/components/common/results/FacetDrawer.vue +++ b/components/common/results/FacetDrawer.vue @@ -10,7 +10,7 @@ {{ $t('results.facet.' + facet.name) }} + elevation="0" color="surface" :title="$t('reinitializeFacet') + $t('results.facet.' + facet.name)"> mdi-reload diff --git a/components/common/results/ResultList.vue b/components/common/results/ResultList.vue index 9cc9c4c3..63a7d39d 100644 --- a/components/common/results/ResultList.vue +++ b/components/common/results/ResultList.vue @@ -1,13 +1,13 @@ diff --git a/components/organismes/OrganismeView.vue b/components/organismes/OrganismeView.vue index a4ebcf3a..82fe7a80 100644 --- a/components/organismes/OrganismeView.vue +++ b/components/organismes/OrganismeView.vue @@ -15,8 +15,8 @@
@@ -48,9 +48,9 @@ {{ name }} diff --git a/components/personnes/PersonneView.vue b/components/personnes/PersonneView.vue index 09ebc981..ac20540a 100644 --- a/components/personnes/PersonneView.vue +++ b/components/personnes/PersonneView.vue @@ -11,8 +11,8 @@
@@ -49,8 +49,8 @@ {{ item.nom }} diff --git a/components/personnes/results/PersonnesCard.vue b/components/personnes/results/PersonnesCard.vue index 0dbfbdfe..373cef28 100644 --- a/components/personnes/results/PersonnesCard.vue +++ b/components/personnes/results/PersonnesCard.vue @@ -31,8 +31,8 @@ diff --git a/components/theses/ButtonsList.vue b/components/theses/ButtonsList.vue index f622cf63..ff0a6da4 100644 --- a/components/theses/ButtonsList.vue +++ b/components/theses/ButtonsList.vue @@ -31,21 +31,18 @@
{{ - $t(b.libelle) }} + :aria-label="$t(b.libelle) + $t('externalLink')" :flat="true">{{ $t(b.libelle) }} {{ - $t(b.libelle) }} + :href="b.url.startsWith('http') ? b.url : baseURL + b.url" target="_blank" :title="$t(b.libelle) + $t('externalLink')" + :aria-label="$t(b.libelle)" :flat="true">{{ $t(b.libelle) }} - + {{ $t("theseView.embargo") }} {{ b.dateFin.replaceAll("-", "/") }}. - {{ $t("theseView.confidentialite") }} {{ - b.dateFin.replaceAll("-", "/") + {{ $t("theseView.confidentialite") }} {{ b.dateFin.replaceAll("-", "/") }}
@@ -65,19 +62,15 @@
{{ - $t(b.libelle) }} + :href="b.url.startsWith('http') ? b.url : baseURL + b.url" target="_blank" :title="$t(b.libelle) + $t('externalLink')" + :aria-label="$t(b.libelle)" :flat="true">{{ $t(b.libelle) }} - {{ $t("theseView.embargoStart") }}{{ b.dateFin.replaceAll("-", "/") - }}{{ - $t("theseView.embargoEnd") }} - {{ $t("theseView.confidentialite") }} {{ - b.dateFin.replaceAll("-", "/") }} + {{ $t("theseView.embargoStart") }}{{ b.dateFin.replaceAll("-", "/") }}{{ $t("theseView.embargoEnd") }} + {{ $t("theseView.confidentialite") }} {{ b.dateFin.replaceAll("-", "/") }}
@@ -302,25 +295,10 @@ h4 { } } -.header-container { - height: 2rem; - display: grid; - grid-template-columns: 1fr 1fr 100fr; - grid-template-rows: 20% 60% 20%; - padding: 0 10px; - - @media #{ map-get(settings.$display-breakpoints, 'md-and-down')} { - width: 100%; - grid-template-columns: 1fr 10fr 3fr; - font-size: 16px; - padding: 0 10px; - } -} - .menu-icon { height: 100%; grid-column-start: 1; - grid-row-start: 2; + align-items: start; @media #{ map-get(settings.$display-breakpoints, 'md-and-down')} { grid-column-start: unset; @@ -331,14 +309,30 @@ h4 { font-size: 28px; } +.header-container { + display: inline-grid; + grid-template-columns: 40px 100fr; + padding: 0 10px; + color: rgb(var(--v-theme-text-dark-blue)); + + @media #{ map-get(settings.$display-breakpoints, 'md-and-down')} { + width: 100%; + font-size: 16px; + padding: 0 10px; + } +} + .buttons-title-header { height: 100%; - grid-column-start: 3; - grid-row-start: 2; + grid-column-start: 2; background-color: transparent; - margin-top: -5px; overflow: visible !important; + display: flex; + white-space: normal; + word-break: break-word; + overflow-wrap: break-word; + font-size: 20px; font-weight: 500; font-family: Roboto-Regular, sans-serif; diff --git a/components/theses/TheseView.vue b/components/theses/TheseView.vue index 1235608e..1323c1f3 100644 --- a/components/theses/TheseView.vue +++ b/components/theses/TheseView.vue @@ -25,8 +25,8 @@
diff --git a/components/theses/ThesisTable.vue b/components/theses/ThesisTable.vue index 6e9432a7..94edbe85 100644 --- a/components/theses/ThesisTable.vue +++ b/components/theses/ThesisTable.vue @@ -1,5 +1,5 @@