From 77bd1bc09d68b341a210c8bfa92bdcdd59661af7 Mon Sep 17 00:00:00 2001
From: paidge <paidge_cs@hotmail.com>
Date: Tue, 1 Feb 2022 12:57:20 +0100
Subject: [PATCH] v0.14 tag
---
components/btn/Sort.vue | 2 +-
components/member/List.vue | 16 ++++++++++++----
components/navigation/menu/Sidebar.vue | 2 +-
i18n/locales/de.json | 1 +
i18n/locales/en.json | 1 +
i18n/locales/es.json | 1 +
i18n/locales/fr.json | 1 +
pages/previsions/futures_sorties.vue | 26 +++++++++++++++++++++-----
8 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/components/btn/Sort.vue b/components/btn/Sort.vue
index b07e1be..6f4c642 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 b6e7fc5..e14ed56 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 d32a319..26f8368 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 dbf87ac..45b2021 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 a8520c3..4227863 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 a48d830..41f675f 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 6735241..97d51c6 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 d557974..d434fe0 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>
--
GitLab