diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index bb98596a0..20ce571ac 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -265,6 +265,25 @@ table.table-bordered { } } +/// display definition list +// with dt and dd on same line + +dl.definition-inline { + dd { + display: inline; + margin: 0; + &:after{ + display: block; + content: ''; + } + } + dt{ + display: inline-block; + min-width: 200px; + } +} + + /// when there is no data .custom_field_no_data, .chill-no-data-statement { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue index a97fb9da6..740d1e111 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue @@ -520,9 +520,13 @@ div#workEditor { } } - div.item-title { + .item-title { font-weight: bold; } + .item-details { + margin: 1em 2em; + font-size: 85%; + } ul.list-evaluations, ul.list-objectives, @@ -555,6 +559,10 @@ div#workEditor { &#persons { margin-top: 1.5em; } + + ul.record_actions { + margin-bottom: 0; + } } div#errors { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue index 455dc2adb..b9f470716 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue @@ -5,7 +5,41 @@ {{ e.evaluation.title.fr }}
- voit l'évaluation +
+ +
+ {{ $t('startDate') }} :
+
+ {{ e.startDate.datetime }}
+ +
+ {{ $t('endDate') }} :
+
+ {{ e.endDate.datetime }}
+ +
+ {{ $t('maxDate') }} :
+
+ {{ e.maxDate.datetime }}
+ +
+ {{ $t('warningInterval') }} :
+
+ {{ e.warningInterval }}
+ +
+ {{ $t('documents') }} :
+
+ {{ e.documents.length }}
+ +
+
+
+ {{ $t('comment') }} :
+
+ {{ e.comment }}
+ +
- +