Bläddra i källkod

Merge branch 'release/1.0' of gitlab.2iopenservice.com:opentalent/site_logiciels into release/1.0

Olivier Massot 1 år sedan
förälder
incheckning
b712dd30e7

+ 1 - 1
components/JoinUs/MissionDetail.vue

@@ -33,7 +33,7 @@
               <v-row>
               <v-row>
                 <div>
                 <div>
                   Type de contrat :
                   Type de contrat :
-                  <b>{{ job.contractType }} </b>
+                  <b>{{ $t(job.contractType) }} </b>
                 </div>
                 </div>
               </v-row>
               </v-row>
 
 

+ 1 - 1
components/JoinUs/Missions.client.vue

@@ -14,7 +14,7 @@
     >
     >
       <div class="title-container">
       <div class="title-container">
         <NuxtLink :to="`/nous-rejoindre/${job.id}`" class="title">
         <NuxtLink :to="`/nous-rejoindre/${job.id}`" class="title">
-          {{ job.title }} - {{ job.contractType }}
+          {{ job.title }} - {{ $t(job.contractType) }}
 
 
           <v-icon v-if="job.featured" class="star fas fa-star" />
           <v-icon v-if="job.featured" class="star fas fa-star" />
         </NuxtLink>
         </NuxtLink>

+ 1 - 0
components/Layout/Navigation/Lg.vue

@@ -79,6 +79,7 @@ defineProps({
 }
 }
 
 
 .navigation-lg {
 .navigation-lg {
+  margin-top: 0 !important;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   background-color: var(--neutral-color);
   background-color: var(--neutral-color);

+ 8 - 7
components/Layout/Navigation/Md.vue

@@ -31,13 +31,12 @@
             class="icon"
             class="icon"
           />
           />
 
 
-          <AgendaLink href="/agenda-culturel">
-            <v-btn
-              icon="fas fa-calendar"
-              aria-label="L'agenda culturel"
-              class="icon"
-            />
-          </AgendaLink>
+          <v-btn
+            :href="runtimeConfig.public.agendaBaseUrl"
+            icon="fas fa-calendar"
+            aria-label="L'agenda culturel"
+            class="icon"
+          />
         </template>
         </template>
       </v-app-bar>
       </v-app-bar>
 
 
@@ -83,6 +82,7 @@ import AgendaLink from '~/components/Common/AgendaLink.vue'
 import type { MainMenuItem } from '~/types/interface'
 import type { MainMenuItem } from '~/types/interface'
 
 
 const { mdAndDown } = useDisplay()
 const { mdAndDown } = useDisplay()
+const runtimeConfig = useRuntimeConfig()
 
 
 const props = defineProps({
 const props = defineProps({
   menu: {
   menu: {
@@ -96,6 +96,7 @@ const toggleMenu = () => {
   isMenuOpen.value = !isMenuOpen.value
   isMenuOpen.value = !isMenuOpen.value
 }
 }
 
 
+
 const activeMenuIndex: Ref<number | null> = ref(null)
 const activeMenuIndex: Ref<number | null> = ref(null)
 
 
 const activeMenu = computed(() =>
 const activeMenu = computed(() =>

+ 3 - 3
components/Layout/UI/TitlePage.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <div :class="'mb-4' + mdAndDown ? ' mt-12' : ''">
+  <div :class="'mb-4' + mdAndDown ? ' mt-8' : ''">
     <h1>
     <h1>
       <slot />
       <slot />
     </h1>
     </h1>
@@ -31,9 +31,9 @@ h1 {
 }
 }
 
 
 h2 {
 h2 {
-  font-size: 1.5rem;
+  font-size: 1.8rem;
   line-height: 2rem;
   line-height: 2rem;
-  letter-spacing: 0.2rem;
+  letter-spacing: 0.4rem;
   margin-left: 1rem;
   margin-left: 1rem;
   margin-right: 1rem;
   margin-right: 1rem;
 }
 }

+ 8 - 0
lang/fr.json

@@ -1,2 +1,10 @@
 {
 {
+  "PERMANENT": "CDI",
+  "FIXED_TERM": "CDD",
+  "HOLDER": "Titulaire",
+  "INTERNSHIP": "Stage",
+  "REPLACEMENT": "Remplacement",
+  "TEMPORARY": "Vacataire",
+  "INTERIM": "Intermittent",
+  "OTHER": "Autre"
 }
 }