Skip to content

Commit

Permalink
THE-1384 retour a la ligne du titre des boutons d'acces
Browse files Browse the repository at this point in the history
  • Loading branch information
clementdelafontaine committed Nov 15, 2024
1 parent 61077a9 commit 9f8b188
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions components/common/Keywords.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<div class="mots-cles-controlles" v-if="rameauKeywords.length > 0">
<div ref="backFromKeywordModal" aria-labelledby="mots-cles-controles-header" class="subtitle">
<h3 id="mots-cles-controles-header">{{ $t("motCleControle") }}</h3>
<v-btn class="info-button" @click="overlayIsOpened = !overlayIsOpened" flat title="Informations sur les mots clés">
<v-btn class="info-button" @click="overlayIsOpened = !overlayIsOpened" flat :title="$t('infoKeywords')">
<v-icon size="22">mdi-information-outline</v-icon>
<span class="sr-only">Informations sur les mots clés</span>
<span class="sr-only">{{ $t("infoKeywords") }}</span>
</v-btn>
<v-overlay v-model="overlayIsOpened" location-strategy="connected" scroll-strategy="close">
<div tabindex="0" id="legend-tooltip">
Expand Down
65 changes: 31 additions & 34 deletions components/theses/ButtonsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,18 @@
<div class="buttons-list" v-for="b in sousCategorie.boutons" :key="b">
<v-btn v-if="b.typeAcces == 'ACCES_ESR'" role="listitem" class="thesis-access-buttons" append-icon="mdi-open-in-new"
@click="checkboxModal = false; dialog = true; dialogUrl = b.url.startsWith('http') ? b.url : baseURL + b.url"
:aria-label="$t(b.libelle) + $t('externalLink')" :flat="true">{{
$t(b.libelle) }}
:aria-label="$t(b.libelle) + $t('externalLink')" :flat="true">{{ $t(b.libelle) }}
</v-btn>
<v-btn v-else-if="b.url" role="listitem" class="thesis-access-buttons" append-icon="mdi-open-in-new"
:href="b.url.startsWith('http') ? b.url : baseURL + b.url" target="_blank" :title="b.libelle + $t('externalLink')"
:aria-label="$t(b.libelle)" :flat="true">{{
$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) }}
</v-btn>
<v-card class="texte-embargo" role="listitem" variant="outlined" tabindex="0" v-else>
<img :alt="$t('theseView.alertSign')" class="icon-alert"
src="@/assets/triangle-exclamation-solid.svg" />
<span v-if="b.libelle === 'Embargo'">{{ $t("theseView.embargo") }} {{ b.dateFin.replaceAll("-", "/")
}}.</span>
<span v-if="b.libelle === 'Confidentialite'">{{ $t("theseView.confidentialite") }} {{
b.dateFin.replaceAll("-", "/")
<span v-if="b.libelle === 'Confidentialite'">{{ $t("theseView.confidentialite") }} {{ b.dateFin.replaceAll("-", "/")
}}</span>
</v-card>
</div>
Expand All @@ -65,19 +62,15 @@
<v-expansion-panel-text role="list" aria-labelledby="other-title">
<div class="buttons-list" v-for="b in boutonsAutres" :key="b">
<v-btn v-if="b.url" role="listitem" class="thesis-access-buttons" append-icon="mdi-open-in-new"
:href="b.url.startsWith('http') ? b.url : baseURL + b.url" target="_blank" :title="b.libelle + $t('externalLink')"
:aria-label="$t(b.libelle)" :flat="true">{{
$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) }}
</v-btn>
<v-card class="texte-embargo" role="listitem" variant="outlined" tabindex="0"
v-if="b.libelle === 'Embargo' || b.libelle === 'Confidentialite'">
<img :alt="$t('theseView.alertSign')" class="icon-alert"
src="@/assets/triangle-exclamation-solid.svg" />
<span v-if="b.libelle === 'Embargo'">{{ $t("theseView.embargoStart") }}{{ b.dateFin.replaceAll("-", "/")
}}{{
$t("theseView.embargoEnd") }}</span>
<span v-if="b.libelle === 'Confidentialite'">{{ $t("theseView.confidentialite") }} {{
b.dateFin.replaceAll("-", "/") }}</span>
<span v-if="b.libelle === 'Embargo'">{{ $t("theseView.embargoStart") }}{{ b.dateFin.replaceAll("-", "/") }}{{ $t("theseView.embargoEnd") }}</span>
<span v-if="b.libelle === 'Confidentialite'">{{ $t("theseView.confidentialite") }} {{ b.dateFin.replaceAll("-", "/") }}</span>
</v-card>
</div>
</v-expansion-panel-text>
Expand Down Expand Up @@ -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;
Expand All @@ -331,13 +309,32 @@ 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;
//grid-row-start: 2;
background-color: transparent;
margin-top: -5px;
//margin-top: -5px;
overflow: visible !important;
//#TODO
// width: auto;
display: flex;
white-space: normal;
word-break: break-word;
overflow-wrap: break-word;
font-size: 20px;
font-weight: 500;
Expand Down
1 change: 1 addition & 0 deletions locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"motCleControle": "Controlled keywords",
"motCleControleDescription": "Controlled keywords are keywords that have an identifier. They come from thesauri accessible on the website ",
"motCleLibres": "Free keywords",
"infoKeywords": "Information on keywords",
"showMoreKeywords": "Show more keywords",
"showLessKeywords": "Reduce the list of keywords",
"showAllKeywords": "Show all keywords ",
Expand Down
1 change: 1 addition & 0 deletions locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"motCleControle": "Palabras clave controladas",
"motCleControleDescription": "Las palabras clave controladas son palabras clave que tienen un identificador. Proceden de tesauros, disponibles en el sitio web",
"motCleLibres": "Palabras clave libres",
"infoKeywords": "Información sobre las palavras clave",
"showMoreKeywords": "Mostrar más palabras clave",
"showLessKeywords": "Reducir la lista de palabras clave",
"showAllKeywords": "Mostrar todas las palabras clave ",
Expand Down
1 change: 1 addition & 0 deletions locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"motCleControle": "Mots clés contrôlés",
"motCleControleDescription": "Les mots clés contrôlés sont les mots clés qui possèdent un identifiant. Ils proviennent de thésaurus, accessibles sur le site ",
"motCleLibres": "Mots clés libres",
"infoKeywords": "Informations sur les mots clés",
"showMoreKeywords": "Afficher plus de mots-clés",
"showLessKeywords": "Réduire la liste des mots-clés",
"showAllKeywords": "Afficher tous les mots-clés ",
Expand Down

0 comments on commit 9f8b188

Please sign in to comment.