Merge remote-tracking branch 'origin/master' into issue589_private_comments

src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss

@@ -187,6 +187,10 @@ div.vertical-menu {
          background-color: tint-color($chill-yellow, 20%)
       }
    }
+   a.list-group-item-header {
+      text-transform: uppercase;
+      font-weight: bold;
+   }
 }
 
 footer.footer {
@@ -210,6 +214,20 @@ footer.footer {
    }
 }
 
+/*
+ *    ADMIN STYLES
+ */
+
+ div.admin {
+   flex-direction: row-reverse;
+   div.vertical-menu {
+      font-size: 0.9em;
+      .list-group-item {
+         padding: 0.3rem 0.7rem;
+      }
+   }
+ }
+
 /*
  *    GENERIC MAIN STYLES
  *    miscellaneous
@@ -217,7 +235,7 @@ footer.footer {
 
 /// titles
 h1, h2,
-.h1, .h2  {
+.h1, .h2 {
    font-weight: $headings-font-weight + 100;
 }
 

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue

@@ -1,7 +1,7 @@
 <template>
    <h4 class="h3">{{ $t('fill_an_address') }}</h4>
    <div class="row my-3">
-      <div class="col-lg-6">
+      <div class="col-lg-6" v-if="!isNoAddress">
          <div class="form-floating my-1">
             <input class="form-control"
             type="text"
@@ -35,8 +35,8 @@
             <label for="flat">{{ $t('flat') }}</label>
          </div>
       </div>
-      <div class="col-lg-6">
-         <div class="form-floating my-1">
+      <div :class="isNoAddress ? 'col-lg-12' : 'col-lg-6'">
+         <div class="form-floating my-1" v-if="!isNoAddress">
             <input class="form-control"
             type="text"
             name="buildingName"
@@ -54,7 +54,7 @@
             v-model="extra"/>
             <label for="extra">{{ $t('extra') }}</label>
          </div>
-         <div class="form-floating my-1">
+         <div class="form-floating my-1" v-if="!isNoAddress">
             <input class="form-control"
             type="text"
             name="distribution"
@@ -70,7 +70,7 @@
 <script>
 export default {
    name: "AddressMore",
-   props: ['entity'],
+   props: ['entity', 'isNoAddress'],
    computed: {
       floor: {
          set(value) {

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue

@@ -75,8 +75,9 @@
          </div>
       </div>
 
-      <address-more v-if="!isNoAddress"
-         v-bind:entity="entity">
+      <address-more
+         v-bind:entity="entity"
+         v-bind:isNoAddress="isNoAddress">
       </address-more>
 
       <action-buttons v-if="insideModal === false"

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue

@@ -210,10 +210,10 @@ export default {
          let
             type = this.type,
             data = {} ;
-
          switch (type) {
             case 'person':
                data = this.$refs.castPerson.$data.person;
+               console.log('person data are', data);
                break;
 
             case 'thirdparty':
@@ -238,7 +238,7 @@ export default {
                      if (typeof data.civility !== 'undefined' && null !== data.civility) {
                         data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
                      }
-                     if (typeof data.civility !== 'undefined' && null !== data.profession) {
+                     if (typeof data.profession !== 'undefined' && null !== data.profession) {
                         data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
                      }
                      // console.log('onthefly data', data);