From ef42227e6c93519cad42b75dc34d4009bcfb6526 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 2 Feb 2022 15:13:48 +0100 Subject: [PATCH] data-doc-title is a not required props --- .../views/AccompanyingCourseDocument/show.html.twig | 11 +++++------ .../views/Button/wopi_edit_document.html.twig | 8 ++------ .../public/vuejs/_components/OpenWopiLink.vue | 6 +++--- .../Resources/views/Workflow/index.html.twig | 1 - 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig index 3c1fe9dd7..73749dc29 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig @@ -50,16 +50,15 @@
  • {{ m.download_button(document.object, document.title) }}
  • - {% if chill_document_is_editable(document.object) %} -
  • {{ document.object|chill_document_edit_button }}
  • - {% endif %} {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
  • - - {{ 'Edit' | trans }} - +
  • {% endif %} + {% if chill_document_is_editable(document.object) %} +
  • {{ document.object|chill_document_edit_button }}
  • + {% endif %} {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %} {% if workflows_frame is not empty %}
  • diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig index 8a739061c..1bd895a0f 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig @@ -1,15 +1,11 @@ {% set button = { - 'changeIcon': 'fa-unlock', + 'changeIcon': 'fa-magic', + 'changeClass': 'btn-primary' } %}{# - 'changeClass': 'btn-update' 'noText': false - data-doc-title="{{ document.title|e('html_attr') }}" - {{ dump() }} - #} diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue index 75fb18de5..81a30f120 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OpenWopiLink.vue @@ -20,7 +20,7 @@