some layout for calendar app

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig

@@ -3,6 +3,9 @@
 {{ form_start(form) }}
 {{ form_errors(form) }}
 
+<div id="calendar"></div> {# <=== vue component #}
+
+<div id="mainUser"></div> {# <=== vue component: mainUser #}
 
 <h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
 
@@ -21,6 +24,11 @@
 
 <div id="add-persons"></div>
 
+{%- if form.location is defined -%}
+    {{ form_row(form.location) }}
+    <div id="location"></div>
+{% endif %}
+
 <h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
 
 {%- if form.startDate is defined -%}
@@ -35,10 +43,7 @@
     {{ form_row(form.calendarRange) }}
 {% endif %}
 
-{%- if form.location is defined -%}
-    {{ form_row(form.location) }}
-    <div id="location"></div>
-{% endif %}
+<div id="fullCalendar"></div>
 
 {%- if form.comment is defined -%}
     {{ form_row(form.comment) }}
@@ -56,7 +61,6 @@
     <div id="calendarControls"></div>
 {% endif %}
 
-<div id="fullCalendar"></div>
 
 <ul class="record_actions sticky-form-buttons">
   <li class="cancel">
@@ -65,7 +69,7 @@
       {%- if context == 'user' -%}
       href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'user_id': user.id } )}}"
       {%- elseif context == 'accompanyingCourse' -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
+      href="{{ chill_return_path_or('chill_calendar_calendar_list_by_period', { 'id': accompanyingCourse.id } )}}"
       {%- endif -%}
       >
       {{ 'Cancel'|trans|chill_return_path_label }}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig

@@ -7,7 +7,6 @@
 {% block content %}
 <div class="calendar-edit">
 
-    <div id="calendar"></div> {# <=== vue component #}
     {% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'accompanyingCourse'} %}
 
 </div>