fix delete links in documents

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_delete_form.html.twig

@@ -1,5 +0,0 @@
-<form method="post" action="{{ path('accompanying_course_document_delete', {'id': document.id, 'course': course.id}) }}" onsubmit="return confirm('Are you sure you want to delete this item?');">
-	<input type="hidden" name="_method" value="DELETE">
-	<input type="hidden" name="_token" value="{{ csrf_token('delete' ~ document.id) }}">
-	<button class="btn btn-delete">{{ 'Delete' | trans }}</button>
-</form>

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/delete.html.twig

@@ -0,0 +1,43 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = '' %}
+
+{% block title %}{{ 'Delete document ?' }}{% endblock %}
+
+{% block docdescription %}
+    <dl class="chill_view_data">
+        <dt>{{ 'Title'|trans }}</dt>
+        <dd>{{ document.title }}</dd>
+
+        {% if document.scope is not null %}
+            <dt>{{ 'Scope' | trans }}</dt>
+            <dd>{{ document.scope.name | localize_translatable_string }}</dd>
+        {% endif %}
+
+        <dt>{{ 'Category'|trans }}</dt>
+        <dd>{{ document.category.name|localize_translatable_string }}</dd>
+
+        <dt>{{ 'Description' | trans }}</dt>
+        <dd>
+            {% if document.description is empty %}
+                <span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
+            {% else %}
+                <blockquote class="chill-user-quote">
+                    {{ document.description|chill_markdown_to_html }}
+                </blockquote>
+            {% endif %}
+        </dd>
+    </dl>
+{% endblock %}
+
+{% block content %}
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
+    {
+        'title'             : 'Delete document ?'|trans,
+        'display_content'   : block('docdescription'),
+        'confirm_question'  : 'Are you sure you want to remove this document ?'|trans,
+        'cancel_route'      : 'accompanying_course_document_index',
+        'cancel_parameters' : {'course' : accompanyingCourse.id, 'id': document.id},
+        'form'              : delete_form
+    } ) }}
+{% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig

@@ -25,8 +25,13 @@
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>
-		<li class="edit">
-			<button class="btn btn-edit">{{ 'Edit'|trans }}</button>
+        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_accompanying_course_document_delete', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+            </li>
+        {% endif %}
+        <li class="edit">
+            <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
 		</li>
 	</ul>
 

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig

@@ -49,12 +49,9 @@
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
-        <li>
-            {{ m.download_button(document.object, document.title) }}
-        </li>
-        {% if chill_document_is_editable(document.object) %}
-            <li>
-                {{ document.object|chill_document_edit_button }}
+        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_accompanying_course_document_delete', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-delete"></a>
             </li>
         {% endif %}
         {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
@@ -63,6 +60,14 @@
                    class="btn btn-edit" title="{{ 'Edit attributes' | trans }}"></a>
             </li>
         {% endif %}
+        <li>
+            {{ m.download_button(document.object, document.title) }}
+        </li>
+        {% if chill_document_is_editable(document.object) %}
+            <li>
+                {{ document.object|chill_document_edit_button }}
+            </li>
+        {% endif %}
         {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %}
         {% if workflows_frame is not empty %}
             <li>

src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig

@@ -44,6 +44,16 @@
         </div>
         <ul class="item-col record_actions flex-shrink-1">
             {% if document.course is defined %}
+                {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE', document) %}
+                    <li class="delete">
+                        <a href="{{ chill_return_path_or('chill_docstore_accompanying_course_document_delete', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+                    </li>
+                {% endif %}
+                {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+                    <li>
+                        <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
+                    </li>
+                {% endif %}
                 {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
                     <li>
                         {{ m.download_button(document.object, document.title) }}
@@ -52,15 +62,20 @@
                         <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
                     </li>
                 {% endif %}
-                {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
-                    <li>
-                        <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
-                    </li>
-                {% endif %}
                 <li>
                     {{ chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) }}
                 </li>
             {% else %}
+                {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
+                    <li class="delete">
+                        <a href="{{ chill_return_path_or('chill_docstore_person_document_delete', {'person': person.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+                    </li>
+                {% endif %}
+                {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
+                    <li>
+                        <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
+                    </li>
+                {% endif %}
                 {% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
                     <li>
                         {{ m.download_button(document.object, document.title) }}
@@ -69,13 +84,8 @@
                         <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
                     </li>
                 {% endif %}
-                {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
-                    <li>
-                        <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
-                    </li>
-                {% endif %}
             {% endif %}
         </ul>
-        
+
     </div>
 </div>

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig

@@ -0,0 +1,43 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = '' %}
+
+{% block title %}{{ 'Delete document ?' }}{% endblock %}
+
+{% block docdescription %}
+    <dl class="chill_view_data">
+        <dt>{{ 'Title'|trans }}</dt>
+        <dd>{{ document.title }}</dd>
+
+        {% if document.scope is not null %}
+            <dt>{{ 'Scope' | trans }}</dt>
+            <dd>{{ document.scope.name | localize_translatable_string }}</dd>
+        {% endif %}
+
+        <dt>{{ 'Category'|trans }}</dt>
+        <dd>{{ document.category.name|localize_translatable_string }}</dd>
+
+        <dt>{{ 'Description' | trans }}</dt>
+        <dd>
+            {% if document.description is empty %}
+                <span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
+            {% else %}
+                <blockquote class="chill-user-quote">
+                    {{ document.description|chill_markdown_to_html }}
+                </blockquote>
+            {% endif %}
+        </dd>
+    </dl>
+{% endblock %}
+
+{% block personcontent %}
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
+    {
+        'title'             : 'Delete document ?'|trans,
+        'display_content'   : block('docdescription'),
+        'confirm_question'  : 'Are you sure you want to remove this document ?'|trans,
+        'cancel_route'      : 'person_document_index',
+        'cancel_parameters' : {'person' : person.id, 'id': document.id},
+        'form'              : delete_form
+    } ) }}
+{% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig

@@ -36,20 +36,20 @@
     {{ form_row(form.description) }}
     {{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
+            <a href="{{ chill_return_path_or('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
+        {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_person_document_delete', {'person': person.id, 'id': document.id}) }}" class="btn btn-delete"></a>
+            </li>
+        {% endif %}
         <li class="edit">
             <button class="btn btn-edit">{{ 'Edit'|trans }}</button>
         </li>
-        {# {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
-            <li class="delete">
-                {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }}
-            </li>
-        {% endif %} #}
     </ul>
 
     {{ form_end(form) }}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig

@@ -40,9 +40,9 @@
 	{{ form_row(form.description) }}
 	{{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}
 
-	<ul class="record_actions">
+	<ul class="record_actions sticky-form-buttons">
 		<li class="cancel">
-			<a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
+			<a href="{{ chill_return_path_or('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
 				{{ 'Back to the list' | trans }}
 			</a>
 		</li>

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig

@@ -64,13 +64,9 @@
             </a>
         </li>
 
-        <li>
-            {{ m.download_button(document.object, document.title) }}
-        </li>
-
-        {% if chill_document_is_editable(document.object) %}
-            <li>
-                {{ document.object|chill_document_edit_button }}
+        {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
+            <li class="delete">
+                <a href="{{ chill_return_path_or('chill_docstore_person_document_delete', {'person': person.id, 'id': document.id}) }}" class="btn btn-delete"></a>
             </li>
         {% endif %}
 
@@ -82,5 +78,15 @@
             </li>
         {% endif %}
 
-    {# {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }} #}
+        <li>
+            {{ m.download_button(document.object, document.title) }}
+        </li>
+
+        {% if chill_document_is_editable(document.object) %}
+            <li>
+                {{ document.object|chill_document_edit_button }}
+            </li>
+        {% endif %}
+
+        {# {{ include('ChillDocStoreBundle:PersonDocument:_delete_form.html.twig') }} #}
 {% endblock %}