Merge remote-tracking branch 'origin/master' into calendar/synchro-msgraph

src/Bundle/ChillCalendarBundle/Resources/views/Admin/index.html.twig

@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_calendar', {
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Calendar configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}

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

@@ -44,6 +44,10 @@
     {{ form_row(form.comment) }}
 {% endif %}
 
+{%- if form.privateComment is defined -%}
+    {{ form_row(form.privateComment) }}
+{% endif %}
+
 {%- if form.sendSMS is defined -%}
     {{ form_row(form.sendSMS) }}
 {% endif %}

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

@@ -44,6 +44,10 @@
     {{ form_row(form.comment) }}
 {% endif %}
 
+{%- if form.privateComment is defined -%}
+    {{ form_row(form.privateComment) }}
+{% endif %}
+
 {%- if form.sendSMS is defined -%}
     {{ form_row(form.sendSMS) }}
 {% endif %}
@@ -51,22 +55,22 @@
 <div id="fullCalendar"></div>
 
 <ul class="record_actions sticky-form-buttons">
-  <li class="cancel">
-    <a
-      class="btn btn-cancel"
-      {%- if context == 'person' -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'person_id': person.id } )}}"
-      {%- else -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
-      {%- endif -%}
-      >
-      {{ 'Cancel'|trans|chill_return_path_label }}
-    </a>
-  </li>
-  <li>
-    <button class="btn btn-create" type="submit">
-      {{ 'Create'|trans }}
-    </button>
-  </li>
+    <li class="cancel">
+        <a
+        class="btn btn-cancel"
+        {%- if context == 'person' -%}
+        href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'person_id': person.id } )}}"
+        {%- else -%}
+        href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
+        {%- endif -%}
+        >
+        {{ 'Cancel'|trans|chill_return_path_label }}
+        </a>
+    </li>
+    <li>
+        <button class="btn btn-create" type="submit">
+        {{ 'Create'|trans }}
+        </button>
+    </li>
 </ul>
 {{ form_end(form) }}

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

@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig

@@ -0,0 +1,43 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Name'|trans }}</th>
+            <th>{{ 'canceledBy'|trans }}</th>
+            <th>{{ 'active'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.name|localize_translatable_string }}</td>
+                    <td>{{ entity.canceledBy }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.active -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_calendar_cancel-reason_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/new.html.twig

@@ -0,0 +1,12 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+