diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index e5c4d87e1..7f9b66326 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -24,7 +24,6 @@ import Referrer from './components/Referrer.vue';
import Resources from './components/Resources.vue';
import Comment from './components/Comment.vue';
import Confirm from './components/Confirm.vue';
-//import Test from './components/Test.vue';
export default {
name: 'App',
@@ -50,12 +49,13 @@ export default {
}
div.vue-component {
h2 {
+ margin-left: 0.7em;
position: relative;
&:before {
position: absolute;
- content: "\f1dd";
+ content: "\f192";
font-family: "ForkAwesome";
- color: lightgrey;
+ color: #718596ab;
left: -28px;
top: 4px;
}
@@ -64,12 +64,12 @@ export default {
top: -2em;
}
}
- padding: 1.5em 1em;
+ padding: 0.8em 0em;
margin: 2em 0;
- border: 1px solid lightgrey;
+ border: 1px dotted #718596ab;
border-radius: 5px;
- border-left: 1px dotted lightgrey;
- border-right: 1px dotted lightgrey;
+ border-left: 1px dotted #718596ab;
+ border-right: 1px dotted #718596ab;
/*
position: relative;
&:before {
@@ -85,5 +85,10 @@ export default {
dd {
margin-left: 1em;
}
+ & > div {
+ margin: 1em 3em 0;
+ }
+ table {
+ }
}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
index c44679d34..1a85e4bb7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
@@ -2,9 +2,16 @@
- - {{ $t('course.id') }}
- - {{ accompanyingCourse.id }}
-
+
{{ $t('course.id') }}
+
{{ accompanyingCourse.id }}
+
+
+ - {{ $t('course.closing_date') }}
+ - {{ $d(accompanyingCourse.closingDate.datetime, 'short') }}
+
+ - {{ $t('course.closing_motive') }}
+ - {{ accompanyingCourse.closingMotive.name.fr }}
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index e464ec7cb..c3e83a548 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -92,6 +92,6 @@ export default {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index 2318ab61f..c2143b72a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -13,24 +13,16 @@
{{ $t('confirm.text_active') }}
{{ $t('course.step.active') }}
+
+
+ -
+
+
+
-
- - {{ $t('course.closing_date') }}
- - {{ $d(accompanyingCourse.closingDate.datetime, 'short') }}
-
- - {{ $t('course.closing_motive') }}
- - {{ accompanyingCourse.closingMotive.name.fr }}
-
-
-
- -
-
-
-
-
@@ -83,6 +75,6 @@ export default {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 61abd06bb..9c31c7ef5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -1,8 +1,12 @@
{{ $t('persons_associated.title')}}
-
-
+
+
+
+
+
+
{{ $t('persons_associated.firstname') }} |
@@ -23,14 +27,16 @@
-
-
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index c67ba5c85..6a2c6d5cc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -43,22 +43,28 @@
{{ $t('requestor.location') }}
{{ accompanyingCourse.requestor.address.postcode.name }}
+
+
+ -
+
+
+
+
+
+
-
-
-
-
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index a4da6d88d..d69c3d0ea 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -3,8 +3,11 @@
{{ $t('resources.title')}}
-
-
+
+
+
+
+
{{ $t('resources.text') }} |
@@ -22,14 +25,16 @@
-
-
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
index 2cd1aa6e9..a756727d8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
@@ -2,7 +2,7 @@
{{ $t('social_issue.title') }}
-
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 90ec02bf5..93de282db 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -28,7 +28,7 @@ const appMessages = {
},
persons_associated: {
title: "Usagers concernés",
- counter: "Pas d'usager | 1 usager | {count} usagers",
+ counter: "Il n'y a pas encore d'usager | 1 usager | {count} usagers",
firstname: "Prénom",
lastname: "Nom",
startdate: "Date d'entrée",
@@ -61,7 +61,7 @@ const appMessages = {
},
resources: {
title: "Interlocuteurs privilégiés",
- counter: "Pas d'interlocuteur | 1 interlocuteur | {count} interlocuteurs",
+ counter: "Il n'y a pas encore d'interlocuteur | 1 interlocuteur | {count} interlocuteurs",
text: "Dénomination",
description: "Description",
add_resources: "Ajouter des interlocuteurs",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 18d9043ee..a37f93e7e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -1,7 +1,11 @@
-
+
+ -
+
+
+