diff --git a/components/btn/Sort.vue b/components/btn/Sort.vue index b07e1be7cd842e9dc81ce4082fd00ebfe4d34b79..6f4c6426353f5f6b91861548559f401eff8167c0 100644 --- a/components/btn/Sort.vue +++ b/components/btn/Sort.vue @@ -1,5 +1,5 @@ <template> - <div class="d-flex align-items-center"> + <div class="d-flex align-items-center justify-content-center"> <div style="width: fit-content">{{ title }}</div> <div class="ml-2"> <div diff --git a/components/member/List.vue b/components/member/List.vue index b6e7fc5fdee1651db3794fd8fe2ed758f275f003..e14ed56ae98eaa5f4e31c2f39c327156b6ef02b1 100644 --- a/components/member/List.vue +++ b/components/member/List.vue @@ -1,6 +1,6 @@ <template> <div class="table-responsive pb-3"> - <table class="table table-striped table-hover"> + <table class="table table-striped table-hover text-center"> <thead class="thead-light sortable" v-if="displayHead"> <tr> <th class="position-relative" scope="col" @click="sort('uid')"> @@ -28,7 +28,7 @@ v-if="displayDate"> <BtnSort fieldName="date_sortie" - :title="$t('membre.datelimpertestatut')" + :title="getTitleDate" :currentSort="currentSort" :currentSortDir="currentSortDir" /> </th> @@ -69,11 +69,12 @@ @click="redirect(member.hash)"> <BadgeDate :date="date(member)" styleDate="long" /> </td> - <td class="py-1 text-center" :title="$t('favoris.supprimer')"> + <td class="py-1"> <button class="btn btn-danger" v-if="$favourites.list.includes(member.uid)" - @click="$favourites.toggleFavourite(member.uid, $event)"> + @click="$favourites.toggleFavourite(member.uid, $event)" + :title="$t('favoris.supprimer')"> X </button> </td> @@ -196,6 +197,13 @@ export default { let end = this.currentPage * this.pageSize if (index >= start && index < end) return true }) + }, + getTitleDate() { + if (this.adhesion || this.certif) { + return this.$t("date") + } else { + return this.$t("membre.datelimpertestatut") + } } } } diff --git a/components/navigation/menu/Sidebar.vue b/components/navigation/menu/Sidebar.vue index d32a319ec8dbe547ed006d3c8ebad30b9a70dbb6..26f8368a3db8b855313ab2558da8191d1e67a828 100644 --- a/components/navigation/menu/Sidebar.vue +++ b/components/navigation/menu/Sidebar.vue @@ -5,7 +5,7 @@ <img :src="$icon(512)" alt="Accueil" class="logo" /> <div> <h1 class="h3"> - Wotwizard <small><span class="small">v0.13</span></small> + Wotwizard <small><span class="small">v0.14</span></small> </h1> <small class="text-muted">{{ $t("slogan") }}</small> </div> diff --git a/i18n/locales/de.json b/i18n/locales/de.json index dbf87acb79219804db7e5d9fe09f9fc9ab18801d..45b202158ee57c344aacfae0b0cf93cf8ab20beb 100644 --- a/i18n/locales/de.json +++ b/i18n/locales/de.json @@ -57,6 +57,7 @@ } }, "copie": "Kopiert", + "date": "Datum", "description": "Beschreibung", "dev": "In Entwicklung", "dividende": { diff --git a/i18n/locales/en.json b/i18n/locales/en.json index a8520c319a6aadcb2d6ea2696f76dd60b6b4c955..4227863f88d9f46a6efd2957e8cc74c8e3e460fa 100644 --- a/i18n/locales/en.json +++ b/i18n/locales/en.json @@ -58,6 +58,7 @@ } }, "copie": "Copied", + "date": "Date", "description": "Description", "dev": "In development", "dividende": { diff --git a/i18n/locales/es.json b/i18n/locales/es.json index a48d8307da9da5e6cd76218ee05e83728a284ada..41f675f6bccef4d13ff69e3e8302e3fcf7c71d93 100644 --- a/i18n/locales/es.json +++ b/i18n/locales/es.json @@ -58,6 +58,7 @@ } }, "copie": "Copiada", + "date": "Fecha", "description": "Descripción", "dev": "En desarrollo", "dividende": { diff --git a/i18n/locales/fr.json b/i18n/locales/fr.json index 673524140ab17551244b64c1478433b47c7ab5d2..97d51c64a528b4b2463049ecd592392408838e2b 100644 --- a/i18n/locales/fr.json +++ b/i18n/locales/fr.json @@ -58,6 +58,7 @@ } }, "copie": "Copiée", + "date": "Date", "description": "Description", "dev": "En Développement", "dividende": { diff --git a/pages/previsions/futures_sorties.vue b/pages/previsions/futures_sorties.vue index d5579742e8488432b4e0488421dde11d756fc9db..d434fe0b22f59e518e98fc42a7b9f1ef204be5e0 100644 --- a/pages/previsions/futures_sorties.vue +++ b/pages/previsions/futures_sorties.vue @@ -2,16 +2,16 @@ <main class="container"> <h2 class="text-center my-5 font-weight-light">{{ $t("futureexits") }}</h2> <div class="row flex-column align-items-center"> - <div class="col-6 mb-4 text-center"> + <div class="col mb-4 text-center"> <input type="checkbox" id="favoris" v-model="favoris" /> <label for="favoris" class="form-label">{{ $t("favoris.use") }}</label> </div> - <div class="col-6 mb-4" v-if="!favoris"> - <div class="form-group row"> - <label for="period" class="col-sm-6 col-form-label text-right">{{ + <div class="col-10 mb-4" v-if="!favoris"> + <div class="form-group row period"> + <label for="period" class="col-sm-6 col-form-label">{{ $t("previsions.period.title") + " :" }}</label> - <div class="col-sm-6"> + <div class="col-sm-6 col-md-5 col-lg-4 col-xl-3"> <select class="form-control" id="period" @@ -157,3 +157,19 @@ export default { } } </script> + +<style lang="scss"> +.period { + text-align: center; + + select { + text-align: inherit; + } + + @media (min-width: 576px) { + label { + text-align: right; + } + } +} +</style>