Merge branch 'release/1.1.1'

lang/fr-FR.js

@@ -32,6 +32,7 @@ export default (_context, _locale) => {
     others: 'autres',
     geolocation_error: 'Une erreur s\'est produite lors de la géolocalisation',
     geolocation_not_supported: 'La géolocalisation n\'est pas supportée par votre navigateur',
+    to_mail_us: 'Pour nous écrire',
     show_tel: 'Montrer le numéro de téléphone',
     show_email: 'Montrer l\'adresse e-mail',
     see_national_network: 'Voir le réseau national',

pages/structures/_id.vue

@@ -122,22 +122,26 @@
 
           <table>
             <tr
-              v-if="structure.mapAddress && structure.mapAddress.postalCode !== structure.postalAddress.postalCode && structure.mapAddress.streetAddress !== structure.postalAddress.streetAddress"
+              v-if="structure.mapAddress && (structure.mapAddress.postalCode !== structure.postalAddress.postalCode || structure.mapAddress.streetAddress !== structure.postalAddress.streetAddress)"
             >
-              <td>
+              <td style="vertical-align: top">
                 <font-awesome-icon class="icon" :icon="['fas', 'map-marker-alt']" />
               </td>
-              <td class="mx-2">
+              <td class="mx-2" style="vertical-align: top">
                 <span v-if="structure.mapAddress.streetAddress" style="white-space: pre-line;">{{ structure.mapAddress.streetAddress }}<br></span>
                 <span v-if="structure.mapAddress.postalCode">{{ structure.mapAddress.postalCode }} </span>
                 {{ structure.mapAddress.addressCity }}
               </td>
             </tr>
             <tr v-if="structure.postalAddress">
-              <td>
+              <td style="vertical-align: top">
                 <font-awesome-icon class="icon" :icon="['fas', 'envelope']" />
               </td>
-              <td class="mx-2">
+              <td class="mx-2" style="vertical-align: top">
+                <div style="text-decoration: underline; font-size: 0.9em; margin-bottom: 0.25em;">
+                  {{ $t('to_mail_us') }} :
+                </div>
+                <span>{{ structure.name }}<br></span>
                 <span v-if="structure.postalAddress.streetAddress" style="white-space: pre-line;">{{ structure.postalAddress.streetAddress }}<br></span>
                 <span v-if="structure.postalAddress.postalCode">{{ structure.postalAddress.postalCode }} </span>
                 {{ structure.postalAddress.addressCity }}
@@ -148,9 +152,9 @@
                 <font-awesome-icon class="icon" :icon="['fas', 'phone-alt']" />
               </td>
               <td class="phone">
-                <div v-if="structure.telphone">
-                  <a v-if="showTel" :href="'tel:' + structure.telphone" class="neutral">
-                    {{ formatPhoneNumber(structure.telphone) }}
+                <div v-if="structure.telphone || structure.mobilPhone">
+                  <a v-if="showTel" :href="'tel:' + (structure.telphone || structure.mobilPhone)" class="neutral">
+                    {{ formatPhoneNumber(structure.telphone || structure.mobilPhone) }}
                   </a>
                   <v-btn v-else small @click="showTel = 1">
                     {{ $t('show_tel') }}

pages/structures/index.vue

@@ -303,7 +303,7 @@
         v-if="!parentIsCmf"
         :href="cmfStructuresPageUrl"
         target="_blank"
-        class="my-auto ma-4"
+        class="ma-4"
       >
         <font-awesome-icon :icon="['fas', 'external-link-alt']" class="mr-2" />
         {{ $t('see_national_network') }}

plugins/theming.js

@@ -6,7 +6,7 @@ export default function (context) {
   if (context.query.theme) {
     switch (context.query.theme) {
       case 'blue':
-        context.$vuetify.theme.themes.light.primary = '#0aa5ec'
+        context.$vuetify.theme.themes.light.primary = '#097f9a'
         break
       case 'green':
         context.$vuetify.theme.themes.light.primary = '#04a04c'
@@ -15,7 +15,7 @@ export default function (context) {
         context.$vuetify.theme.themes.light.primary = '#8c8c8c'
         break
       case 'light-blue':
-        // already the default one
+        context.$vuetify.theme.themes.light.primary = '#0aa5ec'
         break
       case 'light-red':
         context.$vuetify.theme.themes.light.primary = '#dd453f'

static/.htaccess

@@ -0,0 +1,6 @@
+<ifModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule (.*) index.html [QSA,L]
+</ifModule>

types/interfaces.d.ts

@@ -30,6 +30,7 @@ interface Structure {
   postalAddress: Address | null,
   addresses: Array<Address>,
   telphone: string | null,
+  mobilPhone: string | null,
   email: string | null,
   facebook: string | null,
   twitter: string | null,