From 9e2e07160984861edcce4136a21481573564c8fe Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:37:41 +0200
Subject: [PATCH 01/13] Fix an issue with group activity items when moving
 resources

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/Activity/ResourceActivityItem.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/src/components/Activity/ResourceActivityItem.vue b/js/src/components/Activity/ResourceActivityItem.vue
index f546571b5..c178147e4 100644
--- a/js/src/components/Activity/ResourceActivityItem.vue
+++ b/js/src/components/Activity/ResourceActivityItem.vue
@@ -172,7 +172,8 @@ export default class ResourceActivityItem extends mixins(ActivityMixin) {
     if (this.subjectParams.resource_path) {
       const parentPath = this.parentPath(this.subjectParams.resource_path);
       const directory = parentPath.split("/");
-      return directory.pop();
+      const res = directory.pop();
+      res === "" ? null : res;
     }
     return null;
   }

From 8a58f5ba7c2bc6682bb6cf1cecec021904becda8 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:38:47 +0200
Subject: [PATCH 02/13] Cleanup Followers.vue

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/Admin/Followers.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/src/components/Admin/Followers.vue b/js/src/components/Admin/Followers.vue
index 80c7b43df..828eaafde 100644
--- a/js/src/components/Admin/Followers.vue
+++ b/js/src/components/Admin/Followers.vue
@@ -128,7 +128,7 @@
   </div>
 </template>
 <script lang="ts">
-import { Component, Mixins, Ref } from "vue-property-decorator";
+import { Component, Mixins } from "vue-property-decorator";
 import { SnackbarProgrammatic as Snackbar } from "buefy";
 import { formatDistanceToNow } from "date-fns";
 import {
@@ -173,8 +173,6 @@ export default class Followers extends Mixins(RelayMixin) {
 
   FOLLOWERS_PER_PAGE = FOLLOWERS_PER_PAGE;
 
-  @Ref("table") readonly table!: any;
-
   toggle(row: Record<string, unknown>): void {
     this.table.toggleDetails(row);
   }

From bc1f71e742bd33b3a921de2820895fe36308c783 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:40:31 +0200
Subject: [PATCH 03/13] Refactor addressautocomplete components into a mixin

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 .../components/Event/AddressAutoComplete.vue  | 171 ++--------------
 .../Event/FullAddressAutoComplete.vue         | 166 +++-------------
 js/src/mixins/AddressAutoCompleteMixin.ts     | 188 ++++++++++++++++++
 3 files changed, 228 insertions(+), 297 deletions(-)
 create mode 100644 js/src/mixins/AddressAutoCompleteMixin.ts

diff --git a/js/src/components/Event/AddressAutoComplete.vue b/js/src/components/Event/AddressAutoComplete.vue
index a6af4d692..a3c806801 100644
--- a/js/src/components/Event/AddressAutoComplete.vue
+++ b/js/src/components/Event/AddressAutoComplete.vue
@@ -11,6 +11,7 @@
         icon="map-marker"
         expanded
         @select="updateSelected"
+        v-bind="$attrs"
       >
         <template #default="{ option }">
           <b-icon :icon="option.poiInfos.poiIcon.icon" />
@@ -20,7 +21,11 @@
         </template>
       </b-autocomplete>
     </b-field>
-    <b-field v-if="canDoGeoLocation">
+    <b-field
+      v-if="canDoGeoLocation"
+      :message="fieldErrors"
+      :type="{ 'is-danger': fieldErrors.length }"
+    >
       <b-button
         type="is-text"
         v-if="!gettingLocation"
@@ -52,26 +57,16 @@
   </div>
 </template>
 <script lang="ts">
-import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import { LatLng } from "leaflet";
-import debounce from "lodash/debounce";
-import { DebouncedFunc } from "lodash";
+import { Component, Mixins, Prop, Watch } from "vue-property-decorator";
 import { Address, IAddress } from "../../types/address.model";
-import { ADDRESS, REVERSE_GEOCODE } from "../../graphql/address";
-import { CONFIG } from "../../graphql/config";
-import { IConfig } from "../../types/config.model";
+import AddressAutoCompleteMixin from "@/mixins/AddressAutoCompleteMixin";
 
 @Component({
-  components: {
-    "map-leaflet": () =>
-      import(/* webpackChunkName: "map" */ "@/components/Map.vue"),
-  },
-  apollo: {
-    config: CONFIG,
-  },
+  inheritAttrs: false,
 })
-export default class AddressAutoComplete extends Vue {
-  @Prop({ required: true }) value!: IAddress;
+export default class AddressAutoComplete extends Mixins(
+  AddressAutoCompleteMixin
+) {
   @Prop({ required: false, default: false }) type!: string | false;
   @Prop({ required: false, default: true, type: Boolean })
   doGeoLocation!: boolean;
@@ -80,84 +75,20 @@ export default class AddressAutoComplete extends Vue {
 
   selected: IAddress = new Address();
 
-  isFetching = false;
-
   initialQueryText = "";
 
   addressModalActive = false;
 
   showmap = false;
 
-  private gettingLocation = false;
-
-  // eslint-disable-next-line no-undef
-  private location!: GeolocationPosition;
-
-  private gettingLocationError: any;
-
-  private mapDefaultZoom = 15;
-
-  config!: IConfig;
-
-  fetchAsyncData!: DebouncedFunc<(query: string) => Promise<void>>;
-
-  // We put this in data because of issues like
-  // https://github.com/vuejs/vue-class-component/issues/263
-  data(): Record<string, unknown> {
-    return {
-      fetchAsyncData: debounce(this.asyncData, 200),
-    };
-  }
-
-  async asyncData(query: string): Promise<void> {
-    if (!query.length) {
-      this.addressData = [];
-      this.selected = new Address();
-      return;
-    }
-
-    if (query.length < 3) {
-      this.addressData = [];
-      return;
-    }
-
-    this.isFetching = true;
-    const variables: { query: string; locale: string; type?: string } = {
-      query,
-      locale: this.$i18n.locale,
-    };
-    if (this.type) {
-      variables.type = this.type;
-    }
-    const result = await this.$apollo.query({
-      query: ADDRESS,
-      fetchPolicy: "network-only",
-      variables,
-    });
-
-    this.addressData = result.data.searchAddress.map(
-      (address: IAddress) => new Address(address)
-    );
-    this.isFetching = false;
-  }
-
-  @Watch("config")
-  watchConfig(config: IConfig): void {
-    if (!config.geocoding.autocomplete) {
-      // If autocomplete is disabled, we put a larger debounce value
-      // so that we don't request with incomplete address
-      this.fetchAsyncData = debounce(this.asyncData, 2000);
-    }
-  }
-
-  get queryText(): string {
+  get queryText2(): string {
     if (this.value !== undefined) {
       return new Address(this.value).fullName;
     }
     return this.initialQueryText;
   }
 
-  set queryText(queryText: string) {
+  set queryText2(queryText: string) {
     this.initialQueryText = queryText;
   }
 
@@ -186,80 +117,6 @@ export default class AddressAutoComplete extends Vue {
     this.showmap = !this.showmap;
   }
 
-  async reverseGeoCode(e: LatLng, zoom: number): Promise<void> {
-    // If the position has been updated through autocomplete selection, no need to geocode it!
-    if (this.checkCurrentPosition(e)) return;
-    const result = await this.$apollo.query({
-      query: REVERSE_GEOCODE,
-      variables: {
-        latitude: e.lat,
-        longitude: e.lng,
-        zoom,
-        locale: this.$i18n.locale,
-      },
-    });
-
-    this.addressData = result.data.reverseGeocode.map(
-      (address: IAddress) => new Address(address)
-    );
-    if (this.addressData.length > 0) {
-      const defaultAddress = new Address(this.addressData[0]);
-      this.selected = defaultAddress;
-      this.$emit("input", this.selected);
-      this.queryText = `${defaultAddress.poiInfos.name} ${defaultAddress.poiInfos.alternativeName}`;
-    }
-  }
-
-  checkCurrentPosition(e: LatLng): boolean {
-    if (!this.selected || !this.selected.geom) return false;
-    const lat = parseFloat(this.selected.geom.split(";")[1]);
-    const lon = parseFloat(this.selected.geom.split(";")[0]);
-
-    return e.lat === lat && e.lng === lon;
-  }
-
-  async locateMe(): Promise<void> {
-    this.gettingLocation = true;
-    try {
-      this.location = await AddressAutoComplete.getLocation();
-      this.mapDefaultZoom = 12;
-      this.reverseGeoCode(
-        new LatLng(
-          this.location.coords.latitude,
-          this.location.coords.longitude
-        ),
-        12
-      );
-    } catch (e) {
-      console.error(e);
-      this.gettingLocationError = e.message;
-    }
-    this.gettingLocation = false;
-  }
-
-  // eslint-disable-next-line no-undef
-  static async getLocation(): Promise<GeolocationPosition> {
-    return new Promise((resolve, reject) => {
-      if (!("geolocation" in navigator)) {
-        reject(new Error("Geolocation is not available."));
-      }
-
-      navigator.geolocation.getCurrentPosition(
-        (pos) => {
-          resolve(pos);
-        },
-        (err) => {
-          reject(err);
-        }
-      );
-    });
-  }
-
-  // eslint-disable-next-line class-methods-use-this
-  get isSecureContext(): boolean {
-    return window.isSecureContext;
-  }
-
   get canDoGeoLocation(): boolean {
     return this.isSecureContext && this.doGeoLocation;
   }
diff --git a/js/src/components/Event/FullAddressAutoComplete.vue b/js/src/components/Event/FullAddressAutoComplete.vue
index 835a7a651..b1af7d7a1 100644
--- a/js/src/components/Event/FullAddressAutoComplete.vue
+++ b/js/src/components/Event/FullAddressAutoComplete.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="address-autocomplete">
-    <b-field expanded>
+    <b-field
+      :label-for="id"
+      expanded
+      :message="fieldErrors"
+      :type="{ 'is-danger': fieldErrors.length }"
+    >
       <template slot="label">
         {{ actualLabel }}
         <b-button
@@ -8,8 +13,13 @@
           size="is-small"
           icon-right="map-marker"
           @click="locateMe"
+          :title="$t('Use my location')"
         />
-        <span v-else-if="gettingLocation">{{ $t("Getting location") }}</span>
+        <span
+          class="is-size-6 has-text-weight-normal"
+          v-else-if="gettingLocation"
+          >{{ $t("Getting location") }}</span
+        >
       </template>
       <b-autocomplete
         :data="addressData"
@@ -21,6 +31,8 @@
         icon="map-marker"
         expanded
         @select="updateSelected"
+        v-bind="$attrs"
+        :id="id"
       >
         <template #default="{ option }">
           <b-icon :icon="option.poiInfos.poiIcon.icon" />
@@ -51,6 +63,7 @@
         @click="resetAddress"
         class="reset-area"
         icon-left="close"
+        :title="$t('Clear address field')"
       />
     </b-field>
     <div class="map" v-if="selected && selected.geom && selected.poiInfos">
@@ -109,95 +122,29 @@
   </div>
 </template>
 <script lang="ts">
-import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import { Component, Prop, Watch, Mixins } from "vue-property-decorator";
 import { LatLng } from "leaflet";
-import debounce from "lodash/debounce";
-import { DebouncedFunc } from "lodash";
 import { Address, IAddress } from "../../types/address.model";
-import { ADDRESS, REVERSE_GEOCODE } from "../../graphql/address";
-import { CONFIG } from "../../graphql/config";
-import { IConfig } from "../../types/config.model";
+import AddressAutoCompleteMixin from "../../mixins/AddressAutoCompleteMixin";
 
 @Component({
-  components: {
-    "map-leaflet": () =>
-      import(/* webpackChunkName: "map" */ "@/components/Map.vue"),
-  },
-  apollo: {
-    config: CONFIG,
-  },
+  inheritAttrs: false,
 })
-export default class FullAddressAutoComplete extends Vue {
-  @Prop({ required: true }) value!: IAddress;
-
+export default class FullAddressAutoComplete extends Mixins(
+  AddressAutoCompleteMixin
+) {
   @Prop({ required: false, default: "" }) label!: string;
 
-  addressData: IAddress[] = [];
-
-  selected: IAddress = new Address();
-
-  isFetching = false;
-
-  queryText: string = (this.value && new Address(this.value).fullName) || "";
-
   addressModalActive = false;
 
-  private gettingLocation = false;
+  private static componentId = 0;
 
-  // eslint-disable-next-line no-undef
-  private location!: GeolocationPosition;
-
-  private gettingLocationError: any;
-
-  private mapDefaultZoom = 15;
-
-  config!: IConfig;
-
-  fetchAsyncData!: DebouncedFunc<(query: string) => Promise<void>>;
-
-  // We put this in data because of issues like
-  // https://github.com/vuejs/vue-class-component/issues/263
-  data(): Record<string, unknown> {
-    return {
-      fetchAsyncData: debounce(this.asyncData, 200),
-    };
+  created(): void {
+    FullAddressAutoComplete.componentId += 1;
   }
 
-  async asyncData(query: string): Promise<void> {
-    if (!query.length) {
-      this.addressData = [];
-      this.selected = new Address();
-      return;
-    }
-
-    if (query.length < 3) {
-      this.addressData = [];
-      return;
-    }
-
-    this.isFetching = true;
-    const result = await this.$apollo.query({
-      query: ADDRESS,
-      fetchPolicy: "network-only",
-      variables: {
-        query,
-        locale: this.$i18n.locale,
-      },
-    });
-
-    this.addressData = result.data.searchAddress.map(
-      (address: IAddress) => new Address(address)
-    );
-    this.isFetching = false;
-  }
-
-  @Watch("config")
-  watchConfig(config: IConfig): void {
-    if (!config.geocoding.autocomplete) {
-      // If autocomplete is disabled, we put a larger debounce value
-      // so that we don't request with incomplete address
-      this.fetchAsyncData = debounce(this.asyncData, 2000);
-    }
+  get id(): string {
+    return `full-address-autocomplete-${FullAddressAutoComplete.componentId}`;
   }
 
   @Watch("value")
@@ -225,30 +172,6 @@ export default class FullAddressAutoComplete extends Vue {
     this.addressModalActive = true;
   }
 
-  async reverseGeoCode(e: LatLng, zoom: number): Promise<void> {
-    // If the position has been updated through autocomplete selection, no need to geocode it!
-    if (this.checkCurrentPosition(e)) return;
-    const result = await this.$apollo.query({
-      query: REVERSE_GEOCODE,
-      variables: {
-        latitude: e.lat,
-        longitude: e.lng,
-        zoom,
-        locale: this.$i18n.locale,
-      },
-    });
-
-    this.addressData = result.data.reverseGeocode.map(
-      (address: IAddress) => new Address(address)
-    );
-    if (this.addressData.length > 0) {
-      const defaultAddress = new Address(this.addressData[0]);
-      this.selected = defaultAddress;
-      this.$emit("input", this.selected);
-      this.queryText = `${defaultAddress.poiInfos.name} ${defaultAddress.poiInfos.alternativeName}`;
-    }
-  }
-
   checkCurrentPosition(e: LatLng): boolean {
     if (!this.selected || !this.selected.geom) return false;
     const lat = parseFloat(this.selected.geom.split(";")[1]);
@@ -257,25 +180,6 @@ export default class FullAddressAutoComplete extends Vue {
     return e.lat === lat && e.lng === lon;
   }
 
-  async locateMe(): Promise<void> {
-    this.gettingLocation = true;
-    try {
-      this.gettingLocation = false;
-      this.location = await FullAddressAutoComplete.getLocation();
-      this.mapDefaultZoom = 12;
-      this.reverseGeoCode(
-        new LatLng(
-          this.location.coords.latitude,
-          this.location.coords.longitude
-        ),
-        12
-      );
-    } catch (e) {
-      this.gettingLocation = false;
-      this.gettingLocationError = e.message;
-    }
-  }
-
   get actualLabel(): string {
     return this.label || (this.$t("Find an address") as string);
   }
@@ -285,24 +189,6 @@ export default class FullAddressAutoComplete extends Vue {
     return window.isSecureContext;
   }
 
-  // eslint-disable-next-line no-undef
-  static async getLocation(): Promise<GeolocationPosition> {
-    return new Promise((resolve, reject) => {
-      if (!("geolocation" in navigator)) {
-        reject(new Error("Geolocation is not available."));
-      }
-
-      navigator.geolocation.getCurrentPosition(
-        (pos) => {
-          resolve(pos);
-        },
-        (err) => {
-          reject(err);
-        }
-      );
-    });
-  }
-
   @Watch("queryText")
   resetAddressOnEmptyField(queryText: string): void {
     if (queryText === "" && this.selected?.id) {
diff --git a/js/src/mixins/AddressAutoCompleteMixin.ts b/js/src/mixins/AddressAutoCompleteMixin.ts
new file mode 100644
index 000000000..67797a280
--- /dev/null
+++ b/js/src/mixins/AddressAutoCompleteMixin.ts
@@ -0,0 +1,188 @@
+import { mixins } from "vue-class-component";
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import { LatLng } from "leaflet";
+import { Address, IAddress } from "../types/address.model";
+import { ADDRESS, REVERSE_GEOCODE } from "../graphql/address";
+import { CONFIG } from "../graphql/config";
+import { IConfig } from "../types/config.model";
+import debounce from "lodash/debounce";
+import { DebouncedFunc } from "lodash";
+
+@Component({
+  components: {
+    "map-leaflet": () =>
+      import(/* webpackChunkName: "map" */ "@/components/Map.vue"),
+  },
+  apollo: {
+    config: CONFIG,
+  },
+})
+export default class AddressAutoCompleteMixin extends mixins(Vue) {
+  @Prop({ required: true }) value!: IAddress;
+  gettingLocationError: string | null = null;
+
+  gettingLocation = false;
+
+  mapDefaultZoom = 15;
+
+  addressData: IAddress[] = [];
+
+  selected: IAddress = new Address();
+
+  queryText: string = (this.value && new Address(this.value).fullName) || "";
+
+  config!: IConfig;
+
+  isFetching = false;
+
+  fetchAsyncData!: DebouncedFunc<(query: string) => Promise<void>>;
+
+  // eslint-disable-next-line no-undef
+  protected location!: GeolocationPosition;
+
+  // We put this in data because of issues like
+  // https://github.com/vuejs/vue-class-component/issues/263
+  data(): Record<string, unknown> {
+    return {
+      fetchAsyncData: debounce(this.asyncData, 200),
+    };
+  }
+
+  @Watch("config")
+  watchConfig(config: IConfig): void {
+    if (!config.geocoding.autocomplete) {
+      // If autocomplete is disabled, we put a larger debounce value
+      // so that we don't request with incomplete address
+      this.fetchAsyncData = debounce(this.asyncData, 2000);
+    }
+  }
+
+  async asyncData(query: string): Promise<void> {
+    if (!query.length) {
+      this.addressData = [];
+      this.selected = new Address();
+      return;
+    }
+
+    if (query.length < 3) {
+      this.addressData = [];
+      return;
+    }
+
+    this.isFetching = true;
+    const result = await this.$apollo.query({
+      query: ADDRESS,
+      fetchPolicy: "network-only",
+      variables: {
+        query,
+        locale: this.$i18n.locale,
+      },
+    });
+
+    this.addressData = result.data.searchAddress.map(
+      (address: IAddress) => new Address(address)
+    );
+    this.isFetching = false;
+  }
+
+  async locateMe(): Promise<void> {
+    this.gettingLocation = true;
+    this.gettingLocationError = null;
+    try {
+      this.location = await this.getLocation();
+      this.mapDefaultZoom = 12;
+      this.reverseGeoCode(
+        new LatLng(
+          this.location.coords.latitude,
+          this.location.coords.longitude
+        ),
+        12
+      );
+    } catch (e: any) {
+      this.gettingLocationError = e.message;
+    }
+    this.gettingLocation = false;
+  }
+
+  async reverseGeoCode(e: LatLng, zoom: number): Promise<void> {
+    // If the position has been updated through autocomplete selection, no need to geocode it!
+    if (this.checkCurrentPosition(e)) return;
+    const result = await this.$apollo.query({
+      query: REVERSE_GEOCODE,
+      variables: {
+        latitude: e.lat,
+        longitude: e.lng,
+        zoom,
+        locale: this.$i18n.locale,
+      },
+    });
+
+    this.addressData = result.data.reverseGeocode.map(
+      (address: IAddress) => new Address(address)
+    );
+    if (this.addressData.length > 0) {
+      const defaultAddress = new Address(this.addressData[0]);
+      this.selected = defaultAddress;
+      this.$emit("input", this.selected);
+      this.queryText = `${defaultAddress.poiInfos.name} ${defaultAddress.poiInfos.alternativeName}`;
+    }
+  }
+
+  checkCurrentPosition(e: LatLng): boolean {
+    if (!this.selected || !this.selected.geom) return false;
+    const lat = parseFloat(this.selected.geom.split(";")[1]);
+    const lon = parseFloat(this.selected.geom.split(";")[0]);
+
+    return e.lat === lat && e.lng === lon;
+  }
+
+  // eslint-disable-next-line no-undef
+  async getLocation(): Promise<GeolocationPosition> {
+    let errorMessage = this.$t("Failed to get location.");
+    return new Promise((resolve, reject) => {
+      if (!("geolocation" in navigator)) {
+        reject(new Error(errorMessage as string));
+      }
+
+      navigator.geolocation.getCurrentPosition(
+        (pos) => {
+          resolve(pos);
+        },
+        (err) => {
+          switch (err.code) {
+            // eslint-disable-next-line no-undef
+            case GeolocationPositionError.PERMISSION_DENIED:
+              errorMessage = this.$t("The geolocation prompt was denied.");
+              break;
+            // eslint-disable-next-line no-undef
+            case GeolocationPositionError.POSITION_UNAVAILABLE:
+              errorMessage = this.$t("Your position was not available.");
+              break;
+            // eslint-disable-next-line no-undef
+            case GeolocationPositionError.TIMEOUT:
+              errorMessage = this.$t("Geolocation was not determined in time.");
+              break;
+            default:
+              errorMessage = err.message;
+          }
+          reject(new Error(errorMessage as string));
+        }
+      );
+    });
+  }
+
+  get fieldErrors(): Array<Record<string, boolean>> {
+    const errors = [];
+    if (this.gettingLocationError) {
+      errors.push({
+        [this.gettingLocationError]: true,
+      });
+    }
+    return errors;
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  get isSecureContext(): boolean {
+    return window.isSecureContext;
+  }
+}

From c2c3014c2b42b4c793d204dba91d5e1434bbb30b Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:41:27 +0200
Subject: [PATCH 04/13] Show a default text for contact in default terms text
 when no contact is filled

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 lib/mobilizon/config.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mobilizon/config.ex b/lib/mobilizon/config.ex
index de384eb3c..4b7496902 100644
--- a/lib/mobilizon/config.ex
+++ b/lib/mobilizon/config.ex
@@ -382,7 +382,7 @@ defmodule Mobilizon.Config do
 
     cond do
       is_nil(contact) ->
-        nil
+        "<b>Contact information not filled</b>"
 
       String.contains?(contact, "@") ->
         "<a href=\"mailto:#{contact}\">#{contact}</a>"

From c198b2158797761cddea38b513f33e44a2616368 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:42:21 +0200
Subject: [PATCH 05/13] Revert text color from error messages

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/variables.scss b/js/src/variables.scss
index f402b5bf8..02942a8c1 100644
--- a/js/src/variables.scss
+++ b/js/src/variables.scss
@@ -54,7 +54,7 @@ $success-invert: findColorInvert($success);
 $info: #36bcd4;
 $info-invert: findColorInvert($info);
 $danger: #ff2e54;
-$danger-invert: #000;
+$danger-invert: findColorInvert($danger);
 $link: $primary;
 $link-invert: $primary-invert;
 $text: $violet-1;

From 3564b69db828466b75cf79245aecea683b248a02 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:43:16 +0200
Subject: [PATCH 06/13] Only show locatecontrol button in leaflet map when we
 can do geolocation

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/Map.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/js/src/components/Map.vue b/js/src/components/Map.vue
index 439129252..819fb8685 100644
--- a/js/src/components/Map.vue
+++ b/js/src/components/Map.vue
@@ -19,7 +19,10 @@
         :zoomInTitle="$t('Zoom in')"
         :zoomOutTitle="$t('Zoom out')"
       ></l-control-zoom>
-      <v-locatecontrol :options="{ icon: 'mdi mdi-map-marker' }" />
+      <v-locatecontrol
+        v-if="canDoGeoLocation"
+        :options="{ icon: 'mdi mdi-map-marker' }"
+      />
       <l-marker
         :lat-lng="[lat, lon]"
         @add="openPopup"
@@ -152,6 +155,10 @@ export default class Map extends Vue {
       (this.$t("© The OpenStreetMap Contributors") as string)
     );
   }
+
+  get canDoGeoLocation(): boolean {
+    return window.isSecureContext;
+  }
 }
 </script>
 <style lang="scss" scoped>

From d36f1d4b5e9f5f108cff881ba1cde6042095025d Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:45:21 +0200
Subject: [PATCH 07/13] Refactor notification view to disable push column when
 push is not currently possible

Closes #821

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/types/current-user.model.ts      |  4 +-
 js/src/views/Settings/Notifications.vue | 99 ++++++++++++++-----------
 2 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/js/src/types/current-user.model.ts b/js/src/types/current-user.model.ts
index 5af6b016f..ca752b068 100644
--- a/js/src/types/current-user.model.ts
+++ b/js/src/types/current-user.model.ts
@@ -29,9 +29,11 @@ export interface IUserSettings {
   location?: IUserPreferredLocation;
 }
 
+export type IActivitySettingMethod = "email" | "push";
+
 export interface IActivitySetting {
   key: string;
-  method: string;
+  method: IActivitySettingMethod;
   enabled: boolean;
 }
 
diff --git a/js/src/views/Settings/Notifications.vue b/js/src/views/Settings/Notifications.vue
index 805e8bc85..1ce766670 100644
--- a/js/src/views/Settings/Notifications.vue
+++ b/js/src/views/Settings/Notifications.vue
@@ -66,14 +66,14 @@
               <th v-for="(method, key) in notificationMethods" :key="key">
                 {{ method }}
               </th>
-              <th></th>
+              <th>{{ $t("Description") }}</th>
             </tr>
             <tr v-for="subType in notificationType.subtypes" :key="subType.id">
               <td v-for="(method, key) in notificationMethods" :key="key">
                 <b-checkbox
-                  :value="notificationValues[subType.id][key]"
+                  :value="notificationValues[subType.id][key].enabled"
                   @input="(e) => updateNotificationValue(subType.id, key, e)"
-                  :disabled="notificationValues[subType.id].disabled"
+                  :disabled="notificationValues[subType.id][key].disabled"
                 />
               </td>
               <td>
@@ -291,7 +291,7 @@ import {
   USER_NOTIFICATIONS,
   UPDATE_ACTIVITY_SETTING,
 } from "../../graphql/user";
-import { IUser } from "../../types/current-user.model";
+import { IActivitySettingMethod, IUser } from "../../types/current-user.model";
 import RouteName from "../../router/name";
 import { IFeedToken } from "@/types/feedtoken.model";
 import { CREATE_FEED_TOKEN, DELETE_FEED_TOKEN } from "@/graphql/feed_tokens";
@@ -367,70 +367,68 @@ export default class Notifications extends Vue {
 
   defaultNotificationValues = {
     participation_event_updated: {
-      email: true,
-      push: true,
-      disabled: true,
+      email: { enabled: true, disabled: true },
+      push: { enabled: true, disabled: true },
     },
     participation_event_comment: {
-      email: true,
-      push: true,
+      email: { enabled: true, disabled: false },
+      push: { enabled: true, disabled: false },
     },
     event_new_pending_participation: {
-      email: true,
-      push: true,
+      email: { enabled: true, disabled: false },
+      push: { enabled: true, disabled: false },
     },
     event_new_participation: {
-      email: false,
-      push: false,
+      email: { enabled: false, disabled: false },
+      push: { enabled: false, disabled: false },
     },
     event_created: {
-      email: false,
-      push: false,
+      email: { enabled: false, disabled: false },
+      push: { enabled: false, disabled: false },
     },
     event_updated: {
-      email: false,
-      push: false,
+      email: { enabled: false, disabled: false },
+      push: { enabled: false, disabled: false },
     },
     discussion_updated: {
-      email: false,
-      push: false,
+      email: { enabled: false, disabled: false },
+      push: { enabled: false, disabled: false },
     },
     post_published: {
-      email: false,
-      push: false,
+      email: { enabled: false, disabled: false },
+      push: { enabled: false, disabled: false },
     },
     post_updated: {
-      email: false,
-      push: false,
+      email: { enabled: false, disabled: false },
+      push: { enabled: false, disabled: false },
     },
     resource_updated: {
-      email: false,
-      push: false,
+      email: { enabled: false, disabled: false },
+      push: { enabled: false, disabled: false },
     },
     member_request: {
-      email: true,
-      push: true,
+      email: { enabled: true, disabled: false },
+      push: { enabled: true, disabled: false },
     },
     member_updated: {
-      email: false,
-      push: false,
+      email: { enabled: false, disabled: false },
+      push: { enabled: false, disabled: false },
     },
     user_email_password_updated: {
-      email: true,
-      push: false,
-      disabled: true,
+      email: { enabled: true, disabled: true },
+      push: { enabled: false, disabled: true },
     },
     event_comment_mention: {
-      email: true,
-      push: true,
+      email: { enabled: true, disabled: false },
+      push: { enabled: true, disabled: false },
     },
     discussion_mention: {
-      email: true,
-      push: false,
+      email: { enabled: true, disabled: false },
+      push: { enabled: false, disabled: false },
     },
     event_new_comment: {
-      email: true,
-      push: false,
+      email: { enabled: true, disabled: false },
+      push: { enabled: false, disabled: false },
     },
   };
 
@@ -542,17 +540,34 @@ export default class Notifications extends Vue {
     },
   ];
 
-  get userNotificationValues(): Record<string, Record<string, boolean>> {
+  get userNotificationValues(): Record<
+    string,
+    Record<IActivitySettingMethod, { enabled: boolean; disabled: boolean }>
+  > {
     return this.loggedUser.activitySettings.reduce((acc, activitySetting) => {
       acc[activitySetting.key] = acc[activitySetting.key] || {};
       acc[activitySetting.key][activitySetting.method] =
+        acc[activitySetting.key][activitySetting.method] || {};
+      acc[activitySetting.key][activitySetting.method].enabled =
         activitySetting.enabled;
       return acc;
-    }, {} as Record<string, Record<string, boolean>>);
+    }, {} as Record<string, Record<IActivitySettingMethod, { enabled: boolean; disabled: boolean }>>);
   }
 
-  get notificationValues(): Record<string, Record<string, boolean>> {
-    return merge(this.defaultNotificationValues, this.userNotificationValues);
+  get notificationValues(): Record<
+    string,
+    Record<IActivitySettingMethod, { enabled: boolean; disabled: boolean }>
+  > {
+    const values = merge(
+      this.defaultNotificationValues,
+      this.userNotificationValues
+    );
+    for (const value in values) {
+      if (!this.canShowWebPush) {
+        values[value].push.disabled = true;
+      }
+    }
+    return values;
   }
 
   async mounted(): Promise<void> {

From 291a788438ac6e352bcb6687ea96c6664fb4b023 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:52:34 +0200
Subject: [PATCH 08/13] Various accessibility improvements

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/Editor.vue                  |  16 ++
 js/src/components/Event/EventListViewCard.vue |   2 +-
 js/src/components/Event/EventMetadataItem.vue |   1 +
 js/src/components/Event/EventMetadataList.vue |   8 +-
 .../Event/OrganizerPickerWrapper.vue          |   4 +-
 js/src/components/Event/TagInput.vue          |  13 +-
 js/src/components/Footer.vue                  |   1 +
 js/src/components/Group/GroupMemberCard.vue   |   4 +-
 js/src/components/Post/PostElementItem.vue    |  10 +-
 js/src/views/About.vue                        |   8 +-
 .../views/Account/children/EditIdentity.vue   |  36 ++--
 js/src/views/Admin/GroupProfiles.vue          |  13 +-
 js/src/views/Admin/Profiles.vue               |  13 +-
 js/src/views/Admin/Settings.vue               | 149 +++++++------
 js/src/views/Admin/Users.vue                  |   4 +-
 js/src/views/Event/Edit.vue                   | 199 +++++++++++-------
 js/src/views/Group/Create.vue                 |  18 +-
 js/src/views/Group/GroupFollowers.vue         |   2 +-
 js/src/views/Group/GroupMembers.vue           |  14 +-
 js/src/views/Group/GroupSettings.vue          |   4 +-
 js/src/views/Home.vue                         |  12 +-
 js/src/views/Moderation/Logs.vue              |   1 +
 js/src/views/Posts/Edit.vue                   |  66 +++---
 js/src/views/Resources/ResourceFolder.vue     |  31 ++-
 js/src/views/Settings/Notifications.vue       |  13 +-
 js/src/views/Settings/Preferences.vue         |  21 +-
 js/tests/unit/specs/boot/routes.spec.ts       |   4 +-
 .../PostElementItem.spec.ts.snap              |  12 +-
 28 files changed, 437 insertions(+), 242 deletions(-)

diff --git a/js/src/components/Editor.vue b/js/src/components/Editor.vue
index 3e6491b76..a287cd987 100644
--- a/js/src/components/Editor.vue
+++ b/js/src/components/Editor.vue
@@ -16,6 +16,7 @@
           :class="{ 'is-active': editor.isActive('bold') }"
           @click="editor.chain().focus().toggleBold().run()"
           type="button"
+          :title="$t('Bold')"
         >
           <b-icon icon="format-bold" />
         </button>
@@ -25,6 +26,7 @@
           :class="{ 'is-active': editor.isActive('italic') }"
           @click="editor.chain().focus().toggleItalic().run()"
           type="button"
+          :title="$t('Italic')"
         >
           <b-icon icon="format-italic" />
         </button>
@@ -34,6 +36,7 @@
           :class="{ 'is-active': editor.isActive('underline') }"
           @click="editor.chain().focus().toggleUnderline().run()"
           type="button"
+          :title="$t('Underline')"
         >
           <b-icon icon="format-underline" />
         </button>
@@ -44,6 +47,7 @@
           :class="{ 'is-active': editor.isActive('heading', { level: 1 }) }"
           @click="editor.chain().focus().toggleHeading({ level: 1 }).run()"
           type="button"
+          :title="$t('Heading Level 1')"
         >
           <b-icon icon="format-header-1" />
         </button>
@@ -54,6 +58,7 @@
           :class="{ 'is-active': editor.isActive('heading', { level: 2 }) }"
           @click="editor.chain().focus().toggleHeading({ level: 2 }).run()"
           type="button"
+          :title="$t('Heading Level 2')"
         >
           <b-icon icon="format-header-2" />
         </button>
@@ -64,6 +69,7 @@
           :class="{ 'is-active': editor.isActive('heading', { level: 3 }) }"
           @click="editor.chain().focus().toggleHeading({ level: 3 }).run()"
           type="button"
+          :title="$t('Heading Level 3')"
         >
           <b-icon icon="format-header-3" />
         </button>
@@ -73,6 +79,7 @@
           @click="showLinkMenu()"
           :class="{ 'is-active': editor.isActive('link') }"
           type="button"
+          :title="$t('Add link')"
         >
           <b-icon icon="link" />
         </button>
@@ -82,6 +89,7 @@
           class="menubar__button"
           @click="editor.chain().focus().unsetLink().run()"
           type="button"
+          :title="$t('Remove link')"
         >
           <b-icon icon="link-off" />
         </button>
@@ -91,6 +99,7 @@
           v-if="!isBasicMode"
           @click="showImagePrompt()"
           type="button"
+          :title="$t('Add picture')"
         >
           <b-icon icon="image" />
         </button>
@@ -101,6 +110,7 @@
           :class="{ 'is-active': editor.isActive('bulletList') }"
           @click="editor.chain().focus().toggleBulletList().run()"
           type="button"
+          :title="$t('Bullet list')"
         >
           <b-icon icon="format-list-bulleted" />
         </button>
@@ -111,6 +121,7 @@
           :class="{ 'is-active': editor.isActive('orderedList') }"
           @click="editor.chain().focus().toggleOrderedList().run()"
           type="button"
+          :title="$t('Ordered list')"
         >
           <b-icon icon="format-list-numbered" />
         </button>
@@ -121,6 +132,7 @@
           :class="{ 'is-active': editor.isActive('blockquote') }"
           @click="editor.chain().focus().toggleBlockquote().run()"
           type="button"
+          :title="$t('Quote')"
         >
           <b-icon icon="format-quote-close" />
         </button>
@@ -130,6 +142,7 @@
           class="menubar__button"
           @click="editor.chain().focus().undo().run()"
           type="button"
+          :title="$t('Undo')"
         >
           <b-icon icon="undo" />
         </button>
@@ -139,6 +152,7 @@
           class="menubar__button"
           @click="editor.chain().focus().redo().run()"
           type="button"
+          :title="$t('Redo')"
         >
           <b-icon icon="redo" />
         </button>
@@ -155,6 +169,7 @@
           :class="{ 'is-active': editor.isActive('bold') }"
           @click="editor.chain().focus().toggleBold().run()"
           type="button"
+          :title="$t('Bold')"
         >
           <b-icon icon="format-bold" />
           <span class="visually-hidden">{{ $t("Bold") }}</span>
@@ -165,6 +180,7 @@
           :class="{ 'is-active': editor.isActive('italic') }"
           @click="editor.chain().focus().toggleItalic().run()"
           type="button"
+          :title="$t('Italic')"
         >
           <b-icon icon="format-italic" />
           <span class="visually-hidden">{{ $t("Italic") }}</span>
diff --git a/js/src/components/Event/EventListViewCard.vue b/js/src/components/Event/EventListViewCard.vue
index a8c4f6fee..3042f4fc5 100644
--- a/js/src/components/Event/EventListViewCard.vue
+++ b/js/src/components/Event/EventListViewCard.vue
@@ -12,7 +12,7 @@
             <h2 class="title">{{ event.title }}</h2>
           </router-link>
         </div>
-        <div class="participation-actor has-text-grey">
+        <div class="participation-actor has-text-grey-dark">
           <span v-if="event.physicalAddress && event.physicalAddress.locality">
             {{ event.physicalAddress.locality }}
           </span>
diff --git a/js/src/components/Event/EventMetadataItem.vue b/js/src/components/Event/EventMetadataItem.vue
index 9a950b860..332b1276a 100644
--- a/js/src/components/Event/EventMetadataItem.vue
+++ b/js/src/components/Event/EventMetadataItem.vue
@@ -9,6 +9,7 @@
           :src="`/img/${metadataItem.icon.substring(8)}_monochrome.svg`"
           width="24"
           height="24"
+          alt=""
         />
 
         <b-icon v-else-if="metadataItem.icon" :icon="metadataItem.icon" />
diff --git a/js/src/components/Event/EventMetadataList.vue b/js/src/components/Event/EventMetadataList.vue
index b6b863e77..9868cbedd 100644
--- a/js/src/components/Event/EventMetadataList.vue
+++ b/js/src/components/Event/EventMetadataList.vue
@@ -9,7 +9,11 @@
         />
       </div>
     </div>
-    <b-field grouped :label="$t('Find or add an element')">
+    <b-field
+      grouped
+      :label="$t('Find or add an element')"
+      label-for="event-metadata-autocomplete"
+    >
       <b-autocomplete
         expanded
         v-model="search"
@@ -19,6 +23,7 @@
         group-options="items"
         open-on-focus
         :placeholder="$t('e.g. Accessibility, Twitch, PeerTube')"
+        id="event-metadata-autocomplete"
         @select="(option) => addElement(option)"
       >
         <template slot-scope="props">
@@ -32,6 +37,7 @@
                 :src="`/img/${props.option.icon.substring(8)}_monochrome.svg`"
                 width="24"
                 height="24"
+                alt=""
               />
               <b-icon v-else-if="props.option.icon" :icon="props.option.icon" />
               <b-icon v-else icon="help-circle" />
diff --git a/js/src/components/Event/OrganizerPickerWrapper.vue b/js/src/components/Event/OrganizerPickerWrapper.vue
index ce763cc2e..77b36a79e 100644
--- a/js/src/components/Event/OrganizerPickerWrapper.vue
+++ b/js/src/components/Event/OrganizerPickerWrapper.vue
@@ -12,14 +12,14 @@
             <img
               class="image is-rounded"
               :src="selectedActor.avatar.url"
-              :alt="selectedActor.avatar.alt"
+              :alt="selectedActor.avatar.alt || ''"
             />
           </figure>
           <b-icon v-else size="is-large" icon="account-circle" />
         </div>
         <div class="media-content" v-if="selectedActor.name">
           <p class="is-4">{{ selectedActor.name }}</p>
-          <p class="is-6 has-text-grey">
+          <p class="is-6 has-text-grey-dark">
             {{ `@${selectedActor.preferredUsername}` }}
           </p>
         </div>
diff --git a/js/src/components/Event/TagInput.vue b/js/src/components/Event/TagInput.vue
index 6e11e2608..fcca0be4c 100644
--- a/js/src/components/Event/TagInput.vue
+++ b/js/src/components/Event/TagInput.vue
@@ -1,5 +1,5 @@
 <template>
-  <b-field>
+  <b-field :label-for="id">
     <template slot="label">
       {{ $t("Add some tags") }}
       <b-tooltip
@@ -22,6 +22,7 @@
       maxtags="10"
       :placeholder="$t('Eg: Stockholm, Dance, Chess…')"
       @typing="getFilteredTags"
+      :id="id"
     >
     </b-taginput>
   </b-field>
@@ -59,6 +60,16 @@ export default class TagInput extends Vue {
 
   filteredTags: ITag[] = [];
 
+  private static componentId = 0;
+
+  created(): void {
+    TagInput.componentId += 1;
+  }
+
+  get id(): string {
+    return `tag-input-${TagInput.componentId}`;
+  }
+
   getFilteredTags(text: string): void {
     this.filteredTags = differenceBy(this.data, this.value, "id").filter(
       (option) =>
diff --git a/js/src/components/Footer.vue b/js/src/components/Footer.vue
index 29415d963..b64546566 100644
--- a/js/src/components/Footer.vue
+++ b/js/src/components/Footer.vue
@@ -20,6 +20,7 @@
     <ul>
       <li>
         <b-select
+          :aria-label="$t('Language')"
           v-if="$i18n"
           v-model="locale"
           :placeholder="$t('Select a language')"
diff --git a/js/src/components/Group/GroupMemberCard.vue b/js/src/components/Group/GroupMemberCard.vue
index 1bc330e84..bf63e0670 100644
--- a/js/src/components/Group/GroupMemberCard.vue
+++ b/js/src/components/Group/GroupMemberCard.vue
@@ -24,8 +24,8 @@
                 },
               }"
             >
-              <h3>{{ member.parent.name }}</h3>
-              <p class="is-6 has-text-grey">
+              <h2>{{ member.parent.name }}</h2>
+              <p class="is-6 has-text-grey-dark">
                 <span v-if="member.parent.domain">{{
                   `@${member.parent.preferredUsername}@${member.parent.domain}`
                 }}</span>
diff --git a/js/src/components/Post/PostElementItem.vue b/js/src/components/Post/PostElementItem.vue
index 27e526487..602713d23 100644
--- a/js/src/components/Post/PostElementItem.vue
+++ b/js/src/components/Post/PostElementItem.vue
@@ -22,13 +22,13 @@
                 post.visibility === PostVisibility.PUBLIC &&
                 isCurrentActorMember
               "
-              class="has-text-grey"
+              class="has-text-grey-dark"
             >
               <b-icon icon="earth" size="is-small" />{{ $t("Public") }}</small
             >
             <small
               v-else-if="post.visibility === PostVisibility.UNLISTED"
-              class="has-text-grey"
+              class="has-text-grey-dark"
             >
               <b-icon icon="link" size="is-small" />{{
                 $t("Accessible through link")
@@ -36,7 +36,7 @@
             >
             <small
               v-else-if="post.visibility === PostVisibility.PRIVATE"
-              class="has-text-grey"
+              class="has-text-grey-dark"
             >
               <b-icon icon="lock" size="is-small" />{{
                 $t("Accessible only to members", {
@@ -44,13 +44,13 @@
                 })
               }}</small
             >
-            <small class="has-text-grey">{{
+            <small class="has-text-grey-dark">{{
               $options.filters.formatDateTimeString(
                 new Date(post.insertedAt),
                 false
               )
             }}</small>
-            <small class="has-text-grey" v-if="isCurrentActorMember">{{
+            <small class="has-text-grey-dark" v-if="isCurrentActorMember">{{
               $t("Created by {username}", {
                 username: `@${usernameWithDomain(post.author)}`,
               })
diff --git a/js/src/views/About.vue b/js/src/views/About.vue
index 1f9f42416..ac2d6e21e 100644
--- a/js/src/views/About.vue
+++ b/js/src/views/About.vue
@@ -31,7 +31,7 @@
                 $t("About this instance")
               }}</router-link>
             </p>
-            <p class="menu-label">
+            <p class="menu-label has-text-grey-dark">
               {{ $t("Legal") }}
             </p>
             <ul class="menu-list">
@@ -64,8 +64,10 @@
       </div>
     </main>
 
-    <!-- We hide the "Find an instance button until https://joinmobilizon.org gets a instance picker -->
-    <div class="hero register is-primary is-medium">
+    <div
+      class="hero register is-primary is-medium"
+      v-if="!currentUser || !currentUser.id"
+    >
       <div class="hero-body">
         <div class="container has-text-centered">
           <div class="columns">
diff --git a/js/src/views/Account/children/EditIdentity.vue b/js/src/views/Account/children/EditIdentity.vue
index 4d4b6bcea..5d4e5f5e7 100644
--- a/js/src/views/Account/children/EditIdentity.vue
+++ b/js/src/views/Account/children/EditIdentity.vue
@@ -36,12 +36,17 @@
         class="picture-upload"
       />
 
-      <b-field horizontal :label="$t('Display name')">
+      <b-field
+        horizontal
+        :label="$t('Display name')"
+        label-for="identity-display-name"
+      >
         <b-input
           aria-required="true"
           required
           v-model="identity.name"
           @input="autoUpdateUsername($event)"
+          id="identity-display-name"
         />
       </b-field>
 
@@ -50,6 +55,7 @@
         custom-class="username-field"
         expanded
         :label="$t('Username')"
+        label-for="identity-username"
         :message="message"
       >
         <b-field expanded>
@@ -60,6 +66,7 @@
             :disabled="isUpdate"
             :use-html5-validation="!isUpdate"
             pattern="[a-z0-9_]+"
+            id="identity-username"
           />
 
           <p class="control">
@@ -68,11 +75,16 @@
         </b-field>
       </b-field>
 
-      <b-field horizontal :label="$t('Description')">
+      <b-field
+        horizontal
+        :label="$t('Description')"
+        label-for="identity-summary"
+      >
         <b-input
           type="textarea"
           aria-required="false"
           v-model="identity.summary"
+          id="identity-summary"
         />
       </b-field>
 
@@ -94,11 +106,15 @@
         </div>
       </b-field>
 
-      <div class="delete-identity" v-if="isUpdate">
-        <span @click="openDeleteIdentityConfirmation()">{{
-          $t("Delete this identity")
-        }}</span>
-      </div>
+      <b-field class="delete-identity">
+        <b-button
+          v-if="isUpdate"
+          @click="openDeleteIdentityConfirmation()"
+          type="is-text"
+        >
+          {{ $t("Delete this identity") }}
+        </b-button>
+      </b-field>
 
       <section v-if="isUpdate">
         <div class="setting-title">
@@ -194,12 +210,6 @@ h1 {
   margin: 30px 0;
 }
 
-.delete-identity {
-  text-decoration: underline;
-  cursor: pointer;
-  margin-top: 15px;
-}
-
 .username-field + .field {
   margin-bottom: 0;
 }
diff --git a/js/src/views/Admin/GroupProfiles.vue b/js/src/views/Admin/GroupProfiles.vue
index 3005cd486..d913ca5aa 100644
--- a/js/src/views/Admin/GroupProfiles.vue
+++ b/js/src/views/Admin/GroupProfiles.vue
@@ -41,10 +41,10 @@
         >
           <template #searchable="props">
             <b-input
+              :aria-label="$t('Filter')"
               v-model="props.filters.preferredUsername"
-              placeholder="Search..."
+              :placeholder="$t('Filter')"
               icon="magnify"
-              size="is-small"
             />
           </template>
           <template v-slot:default="props">
@@ -58,7 +58,10 @@
               <article class="media">
                 <figure class="media-left" v-if="props.row.avatar">
                   <p class="image is-48x48">
-                    <img :src="props.row.avatar.url" />
+                    <img
+                      :src="props.row.avatar.url"
+                      :alt="props.row.avatar.alt || ''"
+                    />
                   </p>
                 </figure>
                 <div class="media-content">
@@ -76,10 +79,10 @@
         <b-table-column field="domain" :label="$t('Domain')" searchable>
           <template #searchable="props">
             <b-input
+              :aria-label="$t('Filter')"
               v-model="props.filters.domain"
-              placeholder="Search..."
+              :placeholder="$t('Filter')"
               icon="magnify"
-              size="is-small"
             />
           </template>
           <template v-slot:default="props">
diff --git a/js/src/views/Admin/Profiles.vue b/js/src/views/Admin/Profiles.vue
index edde5d05b..1a61483fb 100644
--- a/js/src/views/Admin/Profiles.vue
+++ b/js/src/views/Admin/Profiles.vue
@@ -42,9 +42,9 @@
           <template #searchable="props">
             <b-input
               v-model="props.filters.preferredUsername"
-              placeholder="Search..."
+              :aria-label="$t('Filter')"
+              :placeholder="$t('Filter')"
               icon="magnify"
-              size="is-small"
             />
           </template>
           <template v-slot:default="props">
@@ -58,7 +58,10 @@
               <article class="media">
                 <figure class="media-left" v-if="props.row.avatar">
                   <p class="image is-48x48">
-                    <img :src="props.row.avatar.url" />
+                    <img
+                      :src="props.row.avatar.url"
+                      :alt="props.row.avatar.alt || ''"
+                    />
                   </p>
                 </figure>
                 <div class="media-content">
@@ -77,9 +80,9 @@
           <template #searchable="props">
             <b-input
               v-model="props.filters.domain"
-              placeholder="Search..."
+              :aria-label="$t('Filter')"
+              :placeholder="$t('Filter')"
               icon="magnify"
-              size="is-small"
             />
           </template>
           <template v-slot:default="props">
diff --git a/js/src/views/Admin/Settings.vue b/js/src/views/Admin/Settings.vue
index 714dbb5d9..55964c43b 100644
--- a/js/src/views/Admin/Settings.vue
+++ b/js/src/views/Admin/Settings.vue
@@ -16,11 +16,11 @@
     </nav>
     <section v-if="adminSettings">
       <form @submit.prevent="updateSettings">
-        <b-field :label="$t('Instance Name')">
-          <b-input v-model="adminSettings.instanceName" />
+        <b-field :label="$t('Instance Name')" label-for="instance-name">
+          <b-input v-model="adminSettings.instanceName" id="instance-name" />
         </b-field>
         <div class="field">
-          <label class="label has-help">{{
+          <label class="label has-help" for="instance-description">{{
             $t("Instance Short Description")
           }}</label>
           <small>
@@ -34,10 +34,13 @@
             type="textarea"
             v-model="adminSettings.instanceDescription"
             rows="2"
+            id="instance-name"
           />
         </div>
         <div class="field">
-          <label class="label has-help">{{ $t("Instance Slogan") }}</label>
+          <label class="label has-help" for="instance-slogan">{{
+            $t("Instance Slogan")
+          }}</label>
           <small>
             {{
               $t(
@@ -48,14 +51,17 @@
           <b-input
             v-model="adminSettings.instanceSlogan"
             :placeholder="$t('Gather ⋅ Organize ⋅ Mobilize')"
+            id="instance-slogan"
           />
         </div>
         <div class="field">
-          <label class="label has-help">{{ $t("Contact") }}</label>
+          <label class="label has-help" for="instance-contact">{{
+            $t("Contact")
+          }}</label>
           <small>
             {{ $t("Can be an email or a link, or just plain text.") }}
           </small>
-          <b-input v-model="adminSettings.contact" />
+          <b-input v-model="adminSettings.contact" id="instance-contact" />
         </div>
         <b-field :label="$t('Allow registrations')">
           <b-switch v-model="adminSettings.registrationsOpen">
@@ -66,7 +72,9 @@
           </b-switch>
         </b-field>
         <div class="field">
-          <label class="label has-help">{{ $t("Instance languages") }}</label>
+          <label class="label has-help" for="instance-languages">{{
+            $t("Instance languages")
+          }}</label>
           <small>
             {{ $t("Main languages you/your moderators speak") }}
           </small>
@@ -79,12 +87,13 @@
             icon="label"
             :placeholder="$t('Select languages')"
             @typing="getFilteredLanguages"
+            id="instance-languages"
           >
             <template slot="empty">{{ $t("No languages found") }}</template>
           </b-taginput>
         </div>
         <div class="field">
-          <label class="label has-help">{{
+          <label class="label has-help" for="instance-long-description">{{
             $t("Instance Long Description")
           }}</label>
           <small>
@@ -98,10 +107,13 @@
             type="textarea"
             v-model="adminSettings.instanceLongDescription"
             rows="4"
+            id="instance-long-description"
           />
         </div>
         <div class="field">
-          <label class="label has-help">{{ $t("Instance Rules") }}</label>
+          <label class="label has-help" for="instance-rules">{{
+            $t("Instance Rules")
+          }}</label>
           <small>
             {{
               $t(
@@ -109,35 +121,44 @@
               )
             }}
           </small>
-          <b-input type="textarea" v-model="adminSettings.instanceRules" />
+          <b-input
+            type="textarea"
+            v-model="adminSettings.instanceRules"
+            id="instance-rules"
+          />
         </div>
         <b-field :label="$t('Instance Terms Source')">
           <div class="columns">
             <div class="column is-one-third-desktop">
-              <b-field>
-                <b-radio
-                  v-model="adminSettings.instanceTermsType"
-                  name="instanceTermsType"
-                  :native-value="InstanceTermsType.DEFAULT"
-                  >{{ $t("Default Mobilizon terms") }}</b-radio
-                >
-              </b-field>
-              <b-field>
-                <b-radio
-                  v-model="adminSettings.instanceTermsType"
-                  name="instanceTermsType"
-                  :native-value="InstanceTermsType.URL"
-                  >{{ $t("Custom URL") }}</b-radio
-                >
-              </b-field>
-              <b-field>
-                <b-radio
-                  v-model="adminSettings.instanceTermsType"
-                  name="instanceTermsType"
-                  :native-value="InstanceTermsType.CUSTOM"
-                  >{{ $t("Custom text") }}</b-radio
-                >
-              </b-field>
+              <fieldset>
+                <legend>
+                  {{ $t("Choose the source of the instance's Terms") }}
+                </legend>
+                <b-field>
+                  <b-radio
+                    v-model="adminSettings.instanceTermsType"
+                    name="instanceTermsType"
+                    :native-value="InstanceTermsType.DEFAULT"
+                    >{{ $t("Default Mobilizon terms") }}</b-radio
+                  >
+                </b-field>
+                <b-field>
+                  <b-radio
+                    v-model="adminSettings.instanceTermsType"
+                    name="instanceTermsType"
+                    :native-value="InstanceTermsType.URL"
+                    >{{ $t("Custom URL") }}</b-radio
+                  >
+                </b-field>
+                <b-field>
+                  <b-radio
+                    v-model="adminSettings.instanceTermsType"
+                    name="instanceTermsType"
+                    :native-value="InstanceTermsType.CUSTOM"
+                    >{{ $t("Custom text") }}</b-radio
+                  >
+                </b-field>
+              </fieldset>
             </div>
             <div class="column">
               <div
@@ -215,30 +236,35 @@
         <b-field :label="$t('Instance Privacy Policy Source')">
           <div class="columns">
             <div class="column is-one-third-desktop">
-              <b-field>
-                <b-radio
-                  v-model="adminSettings.instancePrivacyPolicyType"
-                  name="instancePrivacyType"
-                  :native-value="InstancePrivacyType.DEFAULT"
-                  >{{ $t("Default Mobilizon privacy policy") }}</b-radio
-                >
-              </b-field>
-              <b-field>
-                <b-radio
-                  v-model="adminSettings.instancePrivacyPolicyType"
-                  name="instancePrivacyType"
-                  :native-value="InstancePrivacyType.URL"
-                  >{{ $t("Custom URL") }}</b-radio
-                >
-              </b-field>
-              <b-field>
-                <b-radio
-                  v-model="adminSettings.instancePrivacyPolicyType"
-                  name="instancePrivacyType"
-                  :native-value="InstancePrivacyType.CUSTOM"
-                  >{{ $t("Custom text") }}</b-radio
-                >
-              </b-field>
+              <fieldset>
+                <legend>
+                  {{ $t("Choose the source of the instance's Privacy Policy") }}
+                </legend>
+                <b-field>
+                  <b-radio
+                    v-model="adminSettings.instancePrivacyPolicyType"
+                    name="instancePrivacyType"
+                    :native-value="InstancePrivacyType.DEFAULT"
+                    >{{ $t("Default Mobilizon privacy policy") }}</b-radio
+                  >
+                </b-field>
+                <b-field>
+                  <b-radio
+                    v-model="adminSettings.instancePrivacyPolicyType"
+                    name="instancePrivacyType"
+                    :native-value="InstancePrivacyType.URL"
+                    >{{ $t("Custom URL") }}</b-radio
+                  >
+                </b-field>
+                <b-field>
+                  <b-radio
+                    v-model="adminSettings.instancePrivacyPolicyType"
+                    name="instancePrivacyType"
+                    :native-value="InstancePrivacyType.CUSTOM"
+                    >{{ $t("Custom text") }}</b-radio
+                  >
+                </b-field>
+              </fieldset>
             </div>
             <div class="column">
               <div
@@ -430,13 +456,6 @@ export default class Settings extends Vue {
 }
 </script>
 <style lang="scss" scoped>
-.notification a {
-  color: $primary !important;
-  text-decoration: underline !important;
-  text-decoration-color: #fea72b !important;
-  text-decoration-thickness: 2px !important;
-}
-
 label.label.has-help {
   margin-bottom: 0;
 }
diff --git a/js/src/views/Admin/Users.vue b/js/src/views/Admin/Users.vue
index 8f4de705b..2350bbe6e 100644
--- a/js/src/views/Admin/Users.vue
+++ b/js/src/views/Admin/Users.vue
@@ -41,9 +41,9 @@
           <template #searchable="props">
             <b-input
               v-model="props.filters.email"
-              :placeholder="$t('Search…')"
+              :aria-label="$t('Filter')"
+              :placeholder="$t('Filter')"
               icon="magnify"
-              size="is-small"
             />
           </template>
           <template v-slot:default="props">
diff --git a/js/src/views/Event/Edit.vue b/js/src/views/Event/Edit.vue
index d8602039c..8c0f53b7b 100644
--- a/js/src/views/Event/Edit.vue
+++ b/js/src/views/Event/Edit.vue
@@ -18,6 +18,7 @@
 
         <b-field
           :label="$t('Title')"
+          label-for="title"
           :type="checkTitleLength[0]"
           :message="checkTitleLength[1]"
         >
@@ -26,12 +27,18 @@
             aria-required="true"
             required
             v-model="event.title"
+            id="title"
           />
         </b-field>
 
         <tag-input v-model="event.tags" :data="tags" path="title" />
 
-        <b-field horizontal :label="$t('Starts on…')" class="begins-on-field">
+        <b-field
+          horizontal
+          :label="$t('Starts on…')"
+          class="begins-on-field"
+          label-for="begins-on-field"
+        >
           <b-datetimepicker
             class="datepicker starts-on"
             :placeholder="$t('Type or select a date…')"
@@ -40,11 +47,16 @@
             v-model="event.beginsOn"
             horizontal-time-picker
             editable
+            :datepicker="{
+              id: 'begins-on-field',
+              'aria-next-label': $t('Next month'),
+              'aria-previous-label': $t('Previous month'),
+            }"
           >
           </b-datetimepicker>
         </b-field>
 
-        <b-field horizontal :label="$t('Ends on…')">
+        <b-field horizontal :label="$t('Ends on…')" label-for="ends-on-field">
           <b-datetimepicker
             class="datepicker ends-on"
             :placeholder="$t('Type or select a date…')"
@@ -54,6 +66,11 @@
             horizontal-time-picker
             :min-datetime="event.beginsOn"
             editable
+            :datepicker="{
+              id: 'ends-on-field',
+              'aria-next-label': $t('Next month'),
+              'aria-previous-label': $t('Previous month'),
+            }"
           >
           </b-datetimepicker>
         </b-field>
@@ -70,12 +87,13 @@
           <editor v-model="event.description" />
         </div>
 
-        <b-field :label="$t('Website / URL')">
+        <b-field :label="$t('Website / URL')" label-for="website-url">
           <b-input
             icon="link"
             type="url"
             v-model="event.onlineAddress"
             placeholder="URL"
+            id="website-url"
           />
         </b-field>
 
@@ -132,22 +150,31 @@
         </p>
         <event-metadata-list v-model="event.metadata" />
         <subtitle>{{ $t("Who can view this event and participate") }}</subtitle>
-        <div class="field">
-          <b-radio
-            v-model="event.visibility"
-            name="eventVisibility"
-            :native-value="EventVisibility.PUBLIC"
-            >{{ $t("Visible everywhere on the web (public)") }}</b-radio
-          >
-        </div>
-        <div class="field">
-          <b-radio
-            v-model="event.visibility"
-            name="eventVisibility"
-            :native-value="EventVisibility.UNLISTED"
-            >{{ $t("Only accessible through link (private)") }}</b-radio
-          >
-        </div>
+        <fieldset>
+          <legend>
+            {{
+              $t(
+                "When the event is private, you'll need to share the link around."
+              )
+            }}
+          </legend>
+          <div class="field">
+            <b-radio
+              v-model="event.visibility"
+              name="eventVisibility"
+              :native-value="EventVisibility.PUBLIC"
+              >{{ $t("Visible everywhere on the web (public)") }}</b-radio
+            >
+          </div>
+          <div class="field">
+            <b-radio
+              v-model="event.visibility"
+              name="eventVisibility"
+              :native-value="EventVisibility.UNLISTED"
+              >{{ $t("Only accessible through link (private)") }}</b-radio
+            >
+          </div>
+        </fieldset>
         <!-- <div class="field">
           <b-radio v-model="event.visibility"
                    name="eventVisibility"
@@ -196,11 +223,14 @@
         </div>
 
         <div class="box" v-if="limitedPlaces">
-          <b-field :label="$t('Number of places')">
+          <b-field :label="$t('Number of places')" label-for="number-of-places">
             <b-numberinput
               controls-position="compact"
+              :aria-minus-label="$t('Decrease')"
+              :aria-plus-label="$t('Increase')"
               min="1"
               v-model="eventOptions.maximumAttendeeCapacity"
+              id="number-of-places"
             />
           </b-field>
           <!--
@@ -219,63 +249,75 @@
 
         <subtitle>{{ $t("Public comment moderation") }}</subtitle>
 
-        <div class="field">
-          <b-radio
-            v-model="eventOptions.commentModeration"
-            name="commentModeration"
-            :native-value="CommentModeration.ALLOW_ALL"
-            >{{ $t("Allow all comments from users with accounts") }}</b-radio
-          >
-        </div>
+        <fieldset>
+          <legend>{{ $t("Who can post a comment?") }}</legend>
+          <div class="field">
+            <b-radio
+              v-model="eventOptions.commentModeration"
+              name="commentModeration"
+              :native-value="CommentModeration.ALLOW_ALL"
+              >{{ $t("Allow all comments from users with accounts") }}</b-radio
+            >
+          </div>
 
-        <!--          <div class="field">-->
-        <!--            <b-radio v-model="eventOptions.commentModeration"-->
-        <!--                     name="commentModeration"-->
-        <!--                     :native-value="CommentModeration.MODERATED">-->
-        <!--              {{ $t('Moderated comments (shown after approval)') }}-->
-        <!--            </b-radio>-->
-        <!--          </div>-->
+          <!--          <div class="field">-->
+          <!--            <b-radio v-model="eventOptions.commentModeration"-->
+          <!--                     name="commentModeration"-->
+          <!--                     :native-value="CommentModeration.MODERATED">-->
+          <!--              {{ $t('Moderated comments (shown after approval)') }}-->
+          <!--            </b-radio>-->
+          <!--          </div>-->
 
-        <div class="field">
-          <b-radio
-            v-model="eventOptions.commentModeration"
-            name="commentModeration"
-            :native-value="CommentModeration.CLOSED"
-            >{{ $t("Close comments for all (except for admins)") }}</b-radio
-          >
-        </div>
+          <div class="field">
+            <b-radio
+              v-model="eventOptions.commentModeration"
+              name="commentModeration"
+              :native-value="CommentModeration.CLOSED"
+              >{{ $t("Close comments for all (except for admins)") }}</b-radio
+            >
+          </div>
+        </fieldset>
 
         <subtitle>{{ $t("Status") }}</subtitle>
 
-        <b-field class="event__status__field">
-          <b-radio-button
-            v-model="event.status"
-            name="status"
-            type="is-warning"
-            :native-value="EventStatus.TENTATIVE"
-          >
-            <b-icon icon="calendar-question" />
-            {{ $t("Tentative: Will be confirmed later") }}
-          </b-radio-button>
-          <b-radio-button
-            v-model="event.status"
-            name="status"
-            type="is-success"
-            :native-value="EventStatus.CONFIRMED"
-          >
-            <b-icon icon="calendar-check" />
-            {{ $t("Confirmed: Will happen") }}
-          </b-radio-button>
-          <b-radio-button
-            v-model="event.status"
-            name="status"
-            type="is-danger"
-            :native-value="EventStatus.CANCELLED"
-          >
-            <b-icon icon="calendar-remove" />
-            {{ $t("Cancelled: Won't happen") }}
-          </b-radio-button>
-        </b-field>
+        <fieldset>
+          <legend>
+            {{
+              $t(
+                "Does the event needs to be confirmed later or is it cancelled?"
+              )
+            }}
+          </legend>
+          <b-field class="event__status__field">
+            <b-radio-button
+              v-model="event.status"
+              name="status"
+              type="is-warning"
+              :native-value="EventStatus.TENTATIVE"
+            >
+              <b-icon icon="calendar-question" />
+              {{ $t("Tentative: Will be confirmed later") }}
+            </b-radio-button>
+            <b-radio-button
+              v-model="event.status"
+              name="status"
+              type="is-success"
+              :native-value="EventStatus.CONFIRMED"
+            >
+              <b-icon icon="calendar-check" />
+              {{ $t("Confirmed: Will happen") }}
+            </b-radio-button>
+            <b-radio-button
+              v-model="event.status"
+              name="status"
+              type="is-danger"
+              :native-value="EventStatus.CANCELLED"
+            >
+              <b-icon icon="calendar-remove" />
+              {{ $t("Cancelled: Won't happen") }}
+            </b-radio-button>
+          </b-field>
+        </fieldset>
       </form>
     </div>
     <div class="container section" v-else>
@@ -370,6 +412,16 @@
 <style lang="scss" scoped>
 main section > .container {
   background: $white;
+
+  form {
+    h2 {
+      margin: 15px 0 7.5px;
+    }
+
+    legend {
+      margin-bottom: 0.75rem;
+    }
+  }
 }
 
 .save__navbar {
@@ -412,6 +464,9 @@ h2.subtitle {
 section {
   & > .container {
     padding: 2rem 1.5rem;
+    @media screen and (max-width: 768px) {
+      padding: 2rem 0.5rem;
+    }
   }
 
   .begins-on-field {
diff --git a/js/src/views/Group/Create.vue b/js/src/views/Group/Create.vue
index 871b19de0..ca8863431 100644
--- a/js/src/views/Group/Create.vue
+++ b/js/src/views/Group/Create.vue
@@ -7,12 +7,19 @@
     </b-message>
 
     <form @submit.prevent="createGroup">
-      <b-field :label="$t('Group display name')">
-        <b-input aria-required="true" required v-model="group.name" />
+      <b-field :label="$t('Group display name')" label-for="group-display-name">
+        <b-input
+          aria-required="true"
+          required
+          v-model="group.name"
+          id="group-display-name"
+        />
       </b-field>
 
       <div class="field">
-        <label class="label">{{ $t("Federated Group Name") }}</label>
+        <label class="label" for="group-preferred-username">{{
+          $t("Federated Group Name")
+        }}</label>
         <div class="field-body">
           <b-field
             :message="
@@ -28,6 +35,7 @@
               expanded
               v-model="group.preferredUsername"
               pattern="[a-z0-9_]+"
+              id="group-preferred-username"
               :useHtml5Validation="true"
               :validation-message="
                 group.preferredUsername
@@ -52,8 +60,8 @@
         />
       </div>
 
-      <b-field :label="$t('Description')">
-        <b-input v-model="group.summary" type="textarea" />
+      <b-field :label="$t('Description')" label-for="group-summary">
+        <b-input v-model="group.summary" type="textarea" id="group-summary" />
       </b-field>
 
       <div>
diff --git a/js/src/views/Group/GroupFollowers.vue b/js/src/views/Group/GroupFollowers.vue
index 13a44f469..8fedbfb61 100644
--- a/js/src/views/Group/GroupFollowers.vue
+++ b/js/src/views/Group/GroupFollowers.vue
@@ -87,7 +87,7 @@
                   props.row.actor.name
                 }}</span
                 ><br />
-                <span class="is-size-7 has-text-grey"
+                <span class="is-size-7 has-text-grey-dark"
                   >@{{ usernameWithDomain(props.row.actor) }}</span
                 >
               </div>
diff --git a/js/src/views/Group/GroupMembers.vue b/js/src/views/Group/GroupMembers.vue
index e9e85a613..d4d2697f9 100644
--- a/js/src/views/Group/GroupMembers.vue
+++ b/js/src/views/Group/GroupMembers.vue
@@ -39,6 +39,7 @@
         <b-field
           :label="$t('Invite a new member')"
           custom-class="add-relay"
+          label-for="new-member-field"
           horizontal
         >
           <b-field
@@ -50,6 +51,7 @@
           >
             <p class="control">
               <b-input
+                id="new-member-field"
                 v-model="newMemberUsername"
                 :placeholder="$t('Ex: someone@mobilizon.org')"
               />
@@ -63,8 +65,12 @@
         </b-field>
       </form>
       <h1>{{ $t("Group Members") }} ({{ group.members.total }})</h1>
-      <b-field :label="$t('Status')" horizontal>
-        <b-select v-model="roles">
+      <b-field
+        :label="$t('Status')"
+        horizontal
+        label-for="group-members-status-filter"
+      >
+        <b-select v-model="roles" id="group-members-status-filter">
           <option value="">
             {{ $t("Everything") }}
           </option>
@@ -122,7 +128,7 @@
               <img
                 class="is-rounded"
                 :src="props.row.actor.avatar.url"
-                alt=""
+                :alt="props.row.actor.avatar.alt || ''"
               />
             </figure>
             <b-icon
@@ -137,7 +143,7 @@
                   props.row.actor.name
                 }}</span
                 ><br />
-                <span class="is-size-7 has-text-grey"
+                <span class="is-size-7 has-text-grey-dark"
                   >@{{ usernameWithDomain(props.row.actor) }}</span
                 >
               </div>
diff --git a/js/src/views/Group/GroupSettings.vue b/js/src/views/Group/GroupSettings.vue
index 462cbeaf8..6ea4e7be3 100644
--- a/js/src/views/Group/GroupSettings.vue
+++ b/js/src/views/Group/GroupSettings.vue
@@ -37,8 +37,8 @@
       v-if="group && isCurrentActorAGroupAdmin"
     >
       <form @submit.prevent="updateGroup">
-        <b-field :label="$t('Group name')">
-          <b-input v-model="editableGroup.name" />
+        <b-field :label="$t('Group name')" label-for="group-settings-name">
+          <b-input v-model="editableGroup.name" id="group-settings-name" />
         </b-field>
         <b-field :label="$t('Group short description')">
           <editor mode="basic" v-model="editableGroup.summary" :maxSize="500"
diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue
index cb359ef52..fd60ac694 100644
--- a/js/src/views/Home.vue
+++ b/js/src/views/Home.vue
@@ -278,13 +278,11 @@
               }
             )
           }}
-          <router-link :to="{ name: RouteName.PREFERENCES }">
-            <b-icon
-              class="clickable"
-              icon="pencil"
-              :title="$t('Change')"
-              size="is-small"
-            />
+          <router-link
+            :to="{ name: RouteName.PREFERENCES }"
+            :title="$t('Change')"
+          >
+            <b-icon class="clickable" icon="pencil" size="is-small" />
           </router-link>
           <b-loading :active.sync="$apollo.loading" />
         </p>
diff --git a/js/src/views/Moderation/Logs.vue b/js/src/views/Moderation/Logs.vue
index fb07b1240..3cda6cd1d 100644
--- a/js/src/views/Moderation/Logs.vue
+++ b/js/src/views/Moderation/Logs.vue
@@ -21,6 +21,7 @@
             <img
               class="image"
               :src="log.actor.avatar.url"
+              :alt="log.actor.avatar.alt || ''"
               v-if="log.actor.avatar"
             />
             <i18n
diff --git a/js/src/views/Posts/Edit.vue b/js/src/views/Posts/Edit.vue
index cb2531e45..f624148aa 100644
--- a/js/src/views/Posts/Edit.vue
+++ b/js/src/views/Posts/Edit.vue
@@ -54,6 +54,7 @@
 
         <b-field
           :label="$t('Title')"
+          label-for="post-title"
           :type="errors.title ? 'is-danger' : null"
           :message="errors.title"
         >
@@ -62,6 +63,7 @@
             aria-required="true"
             required
             v-model="editablePost.title"
+            id="post-title"
           />
         </b-field>
 
@@ -73,30 +75,39 @@
           <editor v-model="editablePost.body" />
         </div>
         <subtitle>{{ $t("Who can view this post") }}</subtitle>
-        <div class="field">
-          <b-radio
-            v-model="editablePost.visibility"
-            name="postVisibility"
-            :native-value="PostVisibility.PUBLIC"
-            >{{ $t("Visible everywhere on the web") }}</b-radio
-          >
-        </div>
-        <div class="field">
-          <b-radio
-            v-model="editablePost.visibility"
-            name="postVisibility"
-            :native-value="PostVisibility.UNLISTED"
-            >{{ $t("Only accessible through link") }}</b-radio
-          >
-        </div>
-        <div class="field">
-          <b-radio
-            v-model="editablePost.visibility"
-            name="postVisibility"
-            :native-value="PostVisibility.PRIVATE"
-            >{{ $t("Only accessible to members of the group") }}</b-radio
-          >
-        </div>
+        <fieldset>
+          <legend>
+            {{
+              $t(
+                "When the post is private, you'll need to share the link around."
+              )
+            }}
+          </legend>
+          <div class="field">
+            <b-radio
+              v-model="editablePost.visibility"
+              name="postVisibility"
+              :native-value="PostVisibility.PUBLIC"
+              >{{ $t("Visible everywhere on the web") }}</b-radio
+            >
+          </div>
+          <div class="field">
+            <b-radio
+              v-model="editablePost.visibility"
+              name="postVisibility"
+              :native-value="PostVisibility.UNLISTED"
+              >{{ $t("Only accessible through link") }}</b-radio
+            >
+          </div>
+          <div class="field">
+            <b-radio
+              v-model="editablePost.visibility"
+              name="postVisibility"
+              :native-value="PostVisibility.PRIVATE"
+              >{{ $t("Only accessible to members of the group") }}</b-radio
+            >
+          </div>
+        </fieldset>
       </div>
       <nav class="navbar">
         <div class="container">
@@ -414,6 +425,13 @@ form {
       }
     }
   }
+  h2 {
+    margin: 15px 0 7.5px;
+  }
+
+  legend {
+    margin-bottom: 0.75rem;
+  }
 }
 
 .breadcrumb li.is-active > span {
diff --git a/js/src/views/Resources/ResourceFolder.vue b/js/src/views/Resources/ResourceFolder.vue
index a5889b11e..e38bbacff 100644
--- a/js/src/views/Resources/ResourceFolder.vue
+++ b/js/src/views/Resources/ResourceFolder.vue
@@ -187,8 +187,12 @@
       <div class="modal-card">
         <section class="modal-card-body">
           <form @submit.prevent="createResource">
-            <b-field :label="$t('Title')">
-              <b-input aria-required="true" v-model="newResource.title" />
+            <b-field :label="$t('Title')" label-for="new-resource-title">
+              <b-input
+                aria-required="true"
+                v-model="newResource.title"
+                id="new-resource-title"
+              />
             </b-field>
 
             <b-button native-type="submit">{{
@@ -202,6 +206,7 @@
       :active.sync="createLinkResourceModal"
       has-modal-card
       class="link-resource-modal"
+      aria-modal
     >
       <div class="modal-card">
         <section class="modal-card-body">
@@ -209,8 +214,9 @@
             {{ modalError }}
           </b-message>
           <form @submit.prevent="createResource">
-            <b-field :label="$t('URL')">
+            <b-field :label="$t('URL')" label-for="new-resource-url">
               <b-input
+                id="new-resource-url"
                 type="url"
                 required
                 v-model="newResource.resourceUrl"
@@ -222,12 +228,23 @@
               <resource-item :resource="newResource" :preview="true" />
             </div>
 
-            <b-field :label="$t('Title')">
-              <b-input aria-required="true" v-model="newResource.title" />
+            <b-field :label="$t('Title')" label-for="new-resource-link-title">
+              <b-input
+                aria-required="true"
+                v-model="newResource.title"
+                id="new-resource-link-title"
+              />
             </b-field>
 
-            <b-field :label="$t('Text')">
-              <b-input type="textarea" v-model="newResource.summary" />
+            <b-field
+              :label="$t('Description')"
+              label-for="new-resource-summary"
+            >
+              <b-input
+                type="textarea"
+                v-model="newResource.summary"
+                id="new-resource-summary"
+              />
             </b-field>
 
             <b-button native-type="submit">{{
diff --git a/js/src/views/Settings/Notifications.vue b/js/src/views/Settings/Notifications.vue
index 1ce766670..adb60576c 100644
--- a/js/src/views/Settings/Notifications.vue
+++ b/js/src/views/Settings/Notifications.vue
@@ -86,6 +86,7 @@
 
       <b-field
         :label="$t('Send notification e-mails')"
+        label-for="groupNotifications"
         :message="
           $t(
             'Announcements and mentions notifications are always sent straight away.'
@@ -95,6 +96,7 @@
         <b-select
           v-model="groupNotifications"
           @input="updateSetting({ groupNotifications })"
+          id="groupNotifications"
         >
           <option
             v-for="(value, key) in groupNotificationsValues"
@@ -186,9 +188,13 @@
         <h2>{{ $t("Organizer notifications") }}</h2>
       </div>
       <div class="field is-primary">
-        <strong>{{
-          $t("Notifications for manually approved participations to an event")
-        }}</strong>
+        <label
+          class="has-text-weight-bold"
+          for="notificationPendingParticipation"
+          >{{
+            $t("Notifications for manually approved participations to an event")
+          }}</label
+        >
         <p>
           {{
             $t(
@@ -198,6 +204,7 @@
         </p>
         <b-select
           v-model="notificationPendingParticipation"
+          id="notificationPendingParticipation"
           @input="updateSetting({ notificationPendingParticipation })"
         >
           <option
diff --git a/js/src/views/Settings/Preferences.vue b/js/src/views/Settings/Preferences.vue
index e9f1a0d94..521ed247a 100644
--- a/js/src/views/Settings/Preferences.vue
+++ b/js/src/views/Settings/Preferences.vue
@@ -15,22 +15,28 @@
       </ul>
     </nav>
     <div>
-      <b-field :label="$t('Language')">
+      <b-field :label="$t('Language')" label-for="setting-language">
         <b-select
           :loading="!config || !loggedUser"
           v-model="locale"
           :placeholder="$t('Select a language')"
+          id="setting-language"
         >
           <option v-for="(language, lang) in langs" :value="lang" :key="lang">
             {{ language }}
           </option>
         </b-select>
       </b-field>
-      <b-field :label="$t('Timezone')" v-if="selectedTimezone">
+      <b-field
+        :label="$t('Timezone')"
+        v-if="selectedTimezone"
+        label-for="setting-timezone"
+      >
         <b-select
           :placeholder="$t('Select a timezone')"
           :loading="!config || !loggedUser"
           v-model="selectedTimezone"
+          id="setting-timezone"
         >
           <optgroup
             :label="group"
@@ -57,19 +63,25 @@
       }}</b-message>
       <hr />
       <b-field grouped>
-        <b-field :label="$t('City or region')" expanded>
+        <b-field
+          :label="$t('City or region')"
+          expanded
+          label-for="setting-city"
+        >
           <address-auto-complete
             v-if="loggedUser && loggedUser.settings"
             :type="AddressSearchType.ADMINISTRATIVE"
             :doGeoLocation="false"
             v-model="address"
+            id="setting-city"
           >
           </address-auto-complete>
         </b-field>
-        <b-field :label="$t('Radius')">
+        <b-field :label="$t('Radius')" label-for="setting-radius">
           <b-select
             :placeholder="$t('Select a radius')"
             v-model="locationRange"
+            id="setting-radius"
           >
             <option
               v-for="index in [1, 5, 10, 25, 50, 100]"
@@ -85,6 +97,7 @@
           @click="resetArea"
           class="reset-area"
           icon-left="close"
+          :aria-label="$t('Reset')"
         />
       </b-field>
       <p>
diff --git a/js/tests/unit/specs/boot/routes.spec.ts b/js/tests/unit/specs/boot/routes.spec.ts
index bed0a1093..14d771ff2 100644
--- a/js/tests/unit/specs/boot/routes.spec.ts
+++ b/js/tests/unit/specs/boot/routes.spec.ts
@@ -3,6 +3,7 @@ import { routes } from "@/router";
 import App from "@/App.vue";
 import VueRouter from "vue-router";
 import Buefy from "buefy";
+import flushPromises from "flush-promises";
 
 const localVue = createLocalVue();
 config.mocks.$t = (key: string): string => key;
@@ -36,8 +37,7 @@ describe("routing", () => {
     });
 
     router.push("/about");
-    await wrapper.vm.$nextTick();
-    await wrapper.vm.$nextTick();
+    await flushPromises();
     expect(wrapper.vm.$route.path).toBe("/about/instance");
     expect(wrapper.html()).toContain(
       '<a href="/about/instance" aria-current="page"'
diff --git a/js/tests/unit/specs/components/Post/__snapshots__/PostElementItem.spec.ts.snap b/js/tests/unit/specs/components/Post/__snapshots__/PostElementItem.spec.ts.snap
index 1b1e73b7e..a8d299b71 100644
--- a/js/tests/unit/specs/components/Post/__snapshots__/PostElementItem.spec.ts.snap
+++ b/js/tests/unit/specs/components/Post/__snapshots__/PostElementItem.spec.ts.snap
@@ -9,7 +9,7 @@ exports[`PostElementItem renders post with basic informations 1`] = `
         <p class="post-minimalist-title">My Blog Post</p>
         <div class="metadata">
           <!---->
-          <!----> <small class="has-text-grey">December 2, 2020</small>
+          <!----> <small class="has-text-grey-dark">December 2, 2020</small>
           <!---->
         </div>
       </div>
@@ -26,7 +26,7 @@ exports[`PostElementItem shows the author if actor is a group member 1`] = `
       <div class="media-content">
         <p class="post-minimalist-title">My Blog Post</p>
         <div class="metadata">
-          <!----> <small class="has-text-grey"><span class="icon is-small"><i class="mdi mdi-earth"></i></span>Public</small> <small class="has-text-grey">December 2, 2020</small> <small class="has-text-grey">Created by {username}</small>
+          <!----> <small class="has-text-grey-dark"><span class="icon is-small"><i class="mdi mdi-earth"></i></span>Public</small> <small class="has-text-grey-dark">December 2, 2020</small> <small class="has-text-grey-dark">Created by {username}</small>
         </div>
       </div>
     </div>
@@ -43,7 +43,7 @@ exports[`PostElementItem shows the draft tag if post is a draft 1`] = `
         <p class="post-minimalist-title">My Blog Post</p>
         <div class="metadata"><span class="tag is-warning is-small"><span class="">Draft</span>
           <!----></span>
-          <!----> <small class="has-text-grey">December 2, 2020</small>
+          <!----> <small class="has-text-grey-dark">December 2, 2020</small>
           <!---->
         </div>
       </div>
@@ -60,7 +60,7 @@ exports[`PostElementItem tells if the post is accessible only through link 1`] =
       <div class="media-content">
         <p class="post-minimalist-title">My Blog Post</p>
         <div class="metadata">
-          <!----> <small class="has-text-grey"><span class="icon is-small"><i class="mdi mdi-link"></i></span>Accessible through link</small> <small class="has-text-grey">December 2, 2020</small>
+          <!----> <small class="has-text-grey-dark"><span class="icon is-small"><i class="mdi mdi-link"></i></span>Accessible through link</small> <small class="has-text-grey-dark">December 2, 2020</small>
           <!---->
         </div>
       </div>
@@ -77,7 +77,7 @@ exports[`PostElementItem tells if the post is accessible only to members 1`] = `
       <div class="media-content">
         <p class="post-minimalist-title">My Blog Post</p>
         <div class="metadata">
-          <!----> <small class="has-text-grey"><span class="icon is-small"><i class="mdi mdi-lock"></i></span>Accessible only to members</small> <small class="has-text-grey">December 2, 2020</small>
+          <!----> <small class="has-text-grey-dark"><span class="icon is-small"><i class="mdi mdi-lock"></i></span>Accessible only to members</small> <small class="has-text-grey-dark">December 2, 2020</small>
           <!---->
         </div>
       </div>
@@ -94,7 +94,7 @@ exports[`PostElementItem tells if the post is public when the actor is a group m
       <div class="media-content">
         <p class="post-minimalist-title">My Blog Post</p>
         <div class="metadata">
-          <!----> <small class="has-text-grey"><span class="icon is-small"><i class="mdi mdi-earth"></i></span>Public</small> <small class="has-text-grey">December 2, 2020</small> <small class="has-text-grey">Created by {username}</small>
+          <!----> <small class="has-text-grey-dark"><span class="icon is-small"><i class="mdi mdi-earth"></i></span>Public</small> <small class="has-text-grey-dark">December 2, 2020</small> <small class="has-text-grey-dark">Created by {username}</small>
         </div>
       </div>
     </div>

From 9c7a4f007991c2ad28f484acac8d35d79cf7784e Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:52:56 +0200
Subject: [PATCH 09/13] Refactor TagInput.vue

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/Event/TagInput.vue | 33 +++++++++++++---------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/js/src/components/Event/TagInput.vue b/js/src/components/Event/TagInput.vue
index fcca0be4c..6537e50b8 100644
--- a/js/src/components/Event/TagInput.vue
+++ b/js/src/components/Event/TagInput.vue
@@ -33,24 +33,7 @@ import get from "lodash/get";
 import differenceBy from "lodash/differenceBy";
 import { ITag } from "../../types/tag.model";
 
-@Component({
-  computed: {
-    tagsStrings: {
-      get() {
-        return this.$props.value.map((tag: ITag) => tag.title);
-      },
-      set(tagStrings) {
-        const tagEntities = tagStrings.map((tag: string | ITag) => {
-          if (typeof tag !== "string") {
-            return tag;
-          }
-          return { title: tag, slug: tag } as ITag;
-        });
-        this.$emit("input", tagEntities);
-      },
-    },
-  },
-})
+@Component
 export default class TagInput extends Vue {
   @Prop({ required: false, default: () => [] }) data!: ITag[];
 
@@ -79,5 +62,19 @@ export default class TagInput extends Vue {
           .indexOf(text.toLowerCase()) >= 0
     );
   }
+
+  get tagsStrings(): string[] {
+    return (this.value || []).map((tag: ITag) => tag.title);
+  }
+
+  set tagsStrings(tagsStrings: string[]) {
+    const tagEntities = tagsStrings.map((tag: string | ITag) => {
+      if (typeof tag !== "string") {
+        return tag;
+      }
+      return { title: tag, slug: tag } as ITag;
+    });
+    this.$emit("input", tagEntities);
+  }
 }
 </script>

From 68065a611a9e21b1a5f424e4d036460884e032da Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:54:26 +0200
Subject: [PATCH 10/13] Cleanup getting instance's languages in AboutInstance

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/views/About.vue               | 8 +++++---
 js/src/views/About/AboutInstance.vue | 7 -------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/js/src/views/About.vue b/js/src/views/About.vue
index ac2d6e21e..ce838171c 100644
--- a/js/src/views/About.vue
+++ b/js/src/views/About.vue
@@ -103,12 +103,13 @@ import { Component, Vue } from "vue-property-decorator";
 import { CONFIG } from "@/graphql/config";
 import { IConfig } from "@/types/config.model";
 import RouteName from "../router/name";
+import { CURRENT_USER_CLIENT } from "@/graphql/user";
+import { ICurrentUser } from "@/types/current-user.model";
 
 @Component({
   apollo: {
-    config: {
-      query: CONFIG,
-    },
+    config: CONFIG,
+    currentUser: CURRENT_USER_CLIENT,
   },
   metaInfo() {
     return {
@@ -122,6 +123,7 @@ import RouteName from "../router/name";
 })
 export default class About extends Vue {
   config!: IConfig;
+  currentUser!: ICurrentUser;
 
   RouteName = RouteName;
 }
diff --git a/js/src/views/About/AboutInstance.vue b/js/src/views/About/AboutInstance.vue
index 7bf25f7e4..07591e325 100644
--- a/js/src/views/About/AboutInstance.vue
+++ b/js/src/views/About/AboutInstance.vue
@@ -114,7 +114,6 @@ import { ABOUT } from "../../graphql/config";
 import { STATISTICS } from "../../graphql/statistics";
 import { IConfig } from "../../types/config.model";
 import { IStatistics } from "../../types/statistics.model";
-import langs from "../../i18n/langs.json";
 
 @Component({
   apollo: {
@@ -159,12 +158,6 @@ export default class AboutInstance extends Vue {
     }
     return "";
   }
-
-  // eslint-disable-next-line class-methods-use-this
-  getLanguageNameForCode(code: string): string {
-    const languageMaps = langs as Record<string, any>;
-    return languageMaps[code];
-  }
 }
 </script>
 

From d81c479aa6804c5a5c28a8c3e13eaf98fb2c3673 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:54:59 +0200
Subject: [PATCH 11/13] Show actual language instead of language code in Users
 admin view

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/views/Admin/Users.vue | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/js/src/views/Admin/Users.vue b/js/src/views/Admin/Users.vue
index 2350bbe6e..4f7a7ca3b 100644
--- a/js/src/views/Admin/Users.vue
+++ b/js/src/views/Admin/Users.vue
@@ -78,7 +78,7 @@
           :centered="true"
           v-slot="props"
         >
-          {{ props.row.locale }}
+          {{ getLanguageNameForCode(props.row.locale) }}
         </b-table-column>
 
         <template #detail="props">
@@ -114,6 +114,9 @@ import { Component, Vue } from "vue-property-decorator";
 import { LIST_USERS } from "../../graphql/user";
 import RouteName from "../../router/name";
 import VueRouter from "vue-router";
+import { LANGUAGES_CODES } from "@/graphql/admin";
+import { IUser } from "@/types/current-user.model";
+import { Paginate } from "@/types/paginate";
 const { isNavigationFailure, NavigationFailureType } = VueRouter;
 
 const USERS_PER_PAGE = 10;
@@ -131,6 +134,17 @@ const USERS_PER_PAGE = 10;
         };
       },
     },
+    languages: {
+      query: LANGUAGES_CODES,
+      variables() {
+        return {
+          codes: this.languagesCodes,
+        };
+      },
+      skip() {
+        return this.languagesCodes.length < 1;
+      },
+    },
   },
   metaInfo() {
     return {
@@ -143,6 +157,9 @@ export default class Users extends Vue {
 
   RouteName = RouteName;
 
+  users!: Paginate<IUser>;
+  languages!: Array<{ code: string; name: string }>;
+
   get page(): number {
     return parseInt((this.$route.query.page as string) || "1", 10);
   }
@@ -159,6 +176,18 @@ export default class Users extends Vue {
     this.pushRouter({ email });
   }
 
+  get languagesCodes(): string[] {
+    return (this.users?.elements || []).map((user: IUser) => user.locale);
+  }
+
+  getLanguageNameForCode(code: string): string {
+    return (
+      (this.languages || []).find(({ code: languageCode }) => {
+        return languageCode === code;
+      })?.name || code
+    );
+  }
+
   async onPageChange(page: number): Promise<void> {
     this.page = page;
     await this.$apollo.queries.users.fetchMore({

From b1ab0dabbe480e2982927e4f26ddfb5915c42021 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:55:25 +0200
Subject: [PATCH 12/13] Discussions views improvements

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/views/Discussions/Create.vue     | 59 +++++++++++++++++++++++--
 js/src/views/Discussions/Discussion.vue | 58 +++++++++++++++---------
 2 files changed, 91 insertions(+), 26 deletions(-)

diff --git a/js/src/views/Discussions/Create.vue b/js/src/views/Discussions/Create.vue
index a5ae11bf0..f2a0bbc71 100644
--- a/js/src/views/Discussions/Create.vue
+++ b/js/src/views/Discussions/Create.vue
@@ -1,14 +1,57 @@
 <template>
   <section class="section container">
-    <h1>{{ $t("Create a discussion") }}</h1>
+    <nav class="breadcrumb" aria-label="breadcrumbs">
+      <ul v-if="group">
+        <li>
+          <router-link :to="{ name: RouteName.MY_GROUPS }">{{
+            $t("My groups")
+          }}</router-link>
+        </li>
+        <li>
+          <router-link
+            :to="{
+              name: RouteName.GROUP,
+              params: { preferredUsername: usernameWithDomain(group) },
+            }"
+            >{{ group.name }}</router-link
+          >
+        </li>
+        <li>
+          <router-link
+            :to="{
+              name: RouteName.DISCUSSION_LIST,
+              params: { preferredUsername: usernameWithDomain(group) },
+            }"
+            >{{ $t("Discussions") }}</router-link
+          >
+        </li>
+        <li class="is-active">
+          <router-link
+            :to="{
+              name: RouteName.CREATE_DISCUSSION,
+              params: { preferredUsername: usernameWithDomain(group) },
+            }"
+            >{{ $t("Create") }}</router-link
+          >
+        </li>
+      </ul>
+      <b-skeleton v-else-if="$apollo.loading" :animated="animated"></b-skeleton>
+    </nav>
+    <h1 class="title">{{ $t("Create a discussion") }}</h1>
 
     <form @submit.prevent="createDiscussion">
       <b-field
         :label="$t('Title')"
+        label-for="discussion-title"
         :message="errors.title"
         :type="errors.title ? 'is-danger' : undefined"
       >
-        <b-input aria-required="true" required v-model="discussion.title" />
+        <b-input
+          aria-required="true"
+          required
+          v-model="discussion.title"
+          id="discussion-title"
+        />
       </b-field>
 
       <b-field :label="$t('Text')">
@@ -24,7 +67,7 @@
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
-import { IGroup, IPerson } from "@/types/actor";
+import { IGroup, IPerson, usernameWithDomain } from "@/types/actor";
 import { CURRENT_ACTOR_CLIENT } from "@/graphql/actor";
 import { FETCH_GROUP } from "@/graphql/group";
 import { CREATE_DISCUSSION } from "@/graphql/discussion";
@@ -66,6 +109,10 @@ export default class CreateDiscussion extends Vue {
 
   errors = { title: "" };
 
+  RouteName = RouteName;
+
+  usernameWithDomain = usernameWithDomain;
+
   async createDiscussion(): Promise<void> {
     this.errors = { title: "" };
     try {
@@ -100,7 +147,11 @@ export default class CreateDiscussion extends Vue {
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
+.container.section {
+  background: $white;
+}
+
 .markdown-render h1 {
   font-size: 2em;
 }
diff --git a/js/src/views/Discussions/Discussion.vue b/js/src/views/Discussions/Discussion.vue
index aa4999b6e..411bcebdb 100644
--- a/js/src/views/Discussions/Discussion.vue
+++ b/js/src/views/Discussions/Discussion.vue
@@ -46,23 +46,27 @@
     </b-message>
     <section>
       <div class="discussion-title">
-        <h2 class="title" v-if="discussion.title && !editTitleMode">
+        <h1 class="title" v-if="discussion.title && !editTitleMode">
           {{ discussion.title }}
-          <span
-            v-if="
-              currentActor.id === discussion.creator.id ||
-              isCurrentActorAGroupModerator
-            "
-            @click="
-              () => {
-                newTitle = discussion.title;
-                editTitleMode = true;
-              }
-            "
-          >
-            <b-icon icon="pencil" />
-          </span>
-        </h2>
+        </h1>
+        <b-button
+          icon-right="pencil"
+          size="is-small"
+          :title="$t('Update discussion title')"
+          v-if="
+            discussion.creator &&
+            !editTitleMode &&
+            (currentActor.id === discussion.creator.id ||
+              isCurrentActorAGroupModerator)
+          "
+          @click="
+            () => {
+              newTitle = discussion.title;
+              editTitleMode = true;
+            }
+          "
+        >
+        </b-button>
         <b-skeleton
           v-else-if="!editTitleMode && $apollo.loading"
           height="50px"
@@ -73,12 +77,19 @@
           @submit.prevent="updateDiscussion"
           class="title-edit"
         >
-          <b-input :value="discussion.title" v-model="newTitle" />
+          <b-field :label="$t('Title')" label-for="discussion-title">
+            <b-input
+              :value="discussion.title"
+              v-model="newTitle"
+              id="discussion-title"
+            />
+          </b-field>
           <div class="buttons">
             <b-button
               type="is-primary"
               native-type="submit"
               icon-right="check"
+              :title="$t('Update discussion title')"
             />
             <b-button
               @click="
@@ -88,6 +99,7 @@
                 }
               "
               icon-right="close"
+              :title="$t('Cancel discussion title edition')"
             />
             <b-button
               @click="openDeleteDiscussionConfirmation"
@@ -489,15 +501,17 @@ div.container.section {
   padding: 1rem 5% 4rem;
 
   div.discussion-title {
-    margin-bottom: 0.75rem;
+    margin-bottom: 1.75rem;
+    display: flex;
+    align-items: center;
 
-    h2.title {
-      span {
-        cursor: pointer;
-      }
+    h1.title {
+      margin-bottom: 0;
+      margin-right: 10px;
     }
 
     form.title-edit {
+      flex: 1;
       div.control {
         margin-bottom: 0.75rem;
       }

From 39238c4b8a780e7092a04aed639646a720ff5e8d Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 7 Sep 2021 17:55:43 +0200
Subject: [PATCH 13/13] Translation updates

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/i18n/en_US.json | 32 +++++++++++++++++++++++++++++++-
 js/src/i18n/fr_FR.json | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json
index 8c8e2d0d9..7c9b6809f 100644
--- a/js/src/i18n/en_US.json
+++ b/js/src/i18n/en_US.json
@@ -1142,5 +1142,35 @@
   "The Big Blue Button video teleconference URL": "The Big Blue Button video teleconference URL",
   "Etherpad notes": "Etherpad notes",
   "The URL of a pad where notes are being taken collaboratively": "The URL of a pad where notes are being taken collaboratively",
-  "https://mensuel.framapad.org/p/some-secret-token": "https://mensuel.framapad.org/p/some-secret-token"
+  "https://mensuel.framapad.org/p/some-secret-token": "https://mensuel.framapad.org/p/some-secret-token",
+  "Failed to get location.": "Failed to get location.",
+  "The geolocation prompt was denied.": "The geolocation prompt was denied.",
+  "Your position was not available.": "Your position was not available.",
+  "Geolocation was not determined in time.": "Geolocation was not determined in time.",
+  "Underline": "Underline",
+  "Heading Level 1": "Heading Level 1",
+  "Heading Level 2": "Heading Level 2",
+  "Heading Level 3": "Heading Level 3",
+  "Add link": "Add link",
+  "Remove link": "Remove link",
+  "Add picture": "Add picture",
+  "Bullet list": "Bullet list",
+  "Ordered list": "Ordered list",
+  "Quote": "Quote",
+  "Undo": "Undo",
+  "Redo": "Redo",
+  "Clear address field": "Clear address field",
+  "Filter": "Filter",
+  "Choose the source of the instance's Terms": "Choose the source of the instance's Terms",
+  "Choose the source of the instance's Privacy Policy": "Choose the source of the instance's Privacy Policy",
+  "Update discussion title": "Update discussion title",
+  "Cancel discussion title edition": "Cancel discussion title edition",
+  "Previous month": "Previous month",
+  "When the event is private, you'll need to share the link around.": "When the event is private, you'll need to share the link around.",
+  "Decrease": "Decrease",
+  "Increase": "Increase",
+  "Who can post a comment?": "Who can post a comment?",
+  "Does the event needs to be confirmed later or is it cancelled?": "Does the event needs to be confirmed later or is it cancelled?",
+  "When the post is private, you'll need to share the link around.": "When the post is private, you'll need to share the link around.",
+  "Reset": "Reset"
 }
diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json
index eb9646eba..6e38050d4 100644
--- a/js/src/i18n/fr_FR.json
+++ b/js/src/i18n/fr_FR.json
@@ -1233,5 +1233,35 @@
   "The Big Blue Button video teleconference URL": "L'URL de visio-conférence Big Blue Button",
   "Etherpad notes": "Notes sur Etherpad",
   "The URL of a pad where notes are being taken collaboratively": "L'URL d'un pad où les notes sont prises collaborativement",
-  "https://mensuel.framapad.org/p/some-secret-token": "https://mensuel.framapad.org/p/un-jeton-secret"
+  "https://mensuel.framapad.org/p/some-secret-token": "https://mensuel.framapad.org/p/un-jeton-secret",
+  "Failed to get location.": "Impossible de récupérer la localisation.",
+  "The geolocation prompt was denied.": "La demande de localisation a été refusée.",
+  "Your position was not available.": "Votre position n'était pas disponible.",
+  "Geolocation was not determined in time.": "La localisation n'a pas été déterminée à temps.",
+  "Underline": "Souligné",
+  "Heading Level 1": "Titre de niveau 1",
+  "Heading Level 2": "Titre de niveau 2",
+  "Heading Level 3": "Titre de niveau 3",
+  "Add link": "Ajouter un lien",
+  "Remove link": "Enlever un lien",
+  "Add picture": "Ajouter une image",
+  "Bullet list": "Liste à puce",
+  "Ordered list": "Liste ordonnée",
+  "Quote": "Citation",
+  "Undo": "Annuler",
+  "Redo": "Refaire",
+  "Clear address field": "Vider le champ addresse",
+  "Filter": "Filtrer",
+  "Choose the source of the instance's Terms": "Choisissez la source des conditions d'utilisation de l'instance",
+  "Choose the source of the instance's Privacy Policy": "Choisissez la source de la politique de confidentialité de l'instance",
+  "Update discussion title": "Mettre à jour le titre de la discussion",
+  "Cancel discussion title edition": "Annuler la mise à jour du titre de la discussion",
+  "Previous month": "Mois précédent",
+  "When the event is private, you'll need to share the link around.": "Lorsque l'événement est privé, vous aurez besoin de partager le lien.",
+  "Decrease": "Augmenter",
+  "Increase": "Baisser",
+  "Who can post a comment?": "Who can post a comment?",
+  "Does the event needs to be confirmed later or is it cancelled?": "Est-ce que l'événement doit être confirmé plus tard ou bien est-il annulé ?",
+  "When the post is private, you'll need to share the link around.": "Lorsque le billet est privé, vous aurez besoin de partager le lien.",
+  "Reset": "Remettre à zéro"
 }