Merge branch 'develop' into redmine-issues/11087

public/config/config.json

@@ -5,7 +5,7 @@
     "VUE_APP_LOCALE":"fr-FR",
     "VUE_APP_APPLICATION_NAME":"GéoContrib",
     "VUE_APP_APPLICATION_ABSTRACT":"Application de saisie d'informations géographiques contributive",
-    "VUE_APP_LOGO_PATH":"@/assets/img/logo-neogeo-circle.png",
+    "VUE_APP_LOGO_PATH":"/geocontrib/img/logo-neogeo-circle.png",
     "VUE_APP_DJANGO_BASE":"http://localhost:8010",
     "VUE_APP_DJANGO_API_BASE":"http://localhost:8010/api/",
     "DEFAULT_BASE_MAP":{

public/img/icons/safari-pinned-tab.svg

-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.00251 14.9297L0 1.07422H6.14651L8.00251 4.27503L9.84583 1.07422H16L8.00251 14.9297Z" fill="black"/>
-</svg>

src/App.vue

@@ -4,10 +4,7 @@
       <div class="menu container">
         <div class="ui inverted icon menu">
           <router-link to="/" class="header item">
-            <img
-              class="ui mini right spaced image"
-              src="@/assets/img/logo-neogeo-circle.png"
-            />
+            <img class="ui mini right spaced image" :src="logo" />
             <span class="desktop">
               {{ APPLICATION_NAME }}
             </span>
@@ -202,16 +199,19 @@ export default {
       "loader",
     ]),
     ...mapGetters(["project"]),
-    APPLICATION_NAME: function () {
+    APPLICATION_NAME() {
       return this.configuration.VUE_APP_APPLICATION_NAME;
     },
     PACKAGE_VERSION: () => process.env.PACKAGE_VERSION || "0",
-    userFullname: function () {
+    logo() {
+      return this.configuration.VUE_APP_LOGO_PATH;
+    },
+    userFullname() {
       if (this.user.first_name || this.user.last_name)
         return this.user.first_name + " " + this.user.last_name;
       return null;
     },
-    isAdmin: function () {
+    isAdmin() {
       return this.USER_LEVEL_PROJECTS &&
         this.USER_LEVEL_PROJECTS[this.project.slug] === "Administrateur projet"
         ? true

src/views/Index.vue

 <template>
   <div class="fourteen wide column">
-    <img
-      class="ui centered small image"
-      src="@/assets/img/logo-neogeo-circle.png"
-    />
+    <img class="ui centered small image" :src="logo" />
     <!-- :src="LOGO_PATH" -->
     <h2 class="ui center aligned icon header">
       <div class="content">
@@ -110,17 +107,21 @@ import { mapState } from "vuex";
 
 export default {
   name: "Index",
+
   computed: {
     ...mapState(["projects", "user", "USER_LEVEL_PROJECTS"]),
-    APPLICATION_NAME: function () {
+    APPLICATION_NAME() {
       return this.$store.state.configuration.VUE_APP_APPLICATION_NAME;
     },
-    APPLICATION_ABSTRACT: function () {
+    APPLICATION_ABSTRACT() {
       return this.$store.state.configuration.VUE_APP_APPLICATION_ABSTRACT;
     },
-    DJANGO_BASE_URL: function () {
+    DJANGO_BASE_URL() {
       return this.$store.state.configuration.VUE_APP_DJANGO_BASE;
     },
+    logo() {
+      return this.$store.state.configuration.VUE_APP_LOGO_PATH;
+    },
   },
 
   methods: {