From d3d16347441739ea60fb4d5be87e58cfe4feb3bb Mon Sep 17 00:00:00 2001 From: Rayvented Date: Tue, 21 Nov 2023 09:28:45 +0100 Subject: [PATCH] Style VVT new form --- assets/styles/tailmater.css | 6 +- src/Controller/VvtController.php | 1 + templates/vvt/__form.html.twig | 465 ++++++++----------------------- templates/vvt/new.html.twig | 17 +- 4 files changed, 121 insertions(+), 368 deletions(-) diff --git a/assets/styles/tailmater.css b/assets/styles/tailmater.css index 9cf1f2dc..1a9ad69a 100644 --- a/assets/styles/tailmater.css +++ b/assets/styles/tailmater.css @@ -1097,14 +1097,14 @@ trix-toolbar .trix-button-group.trix-button-group--file-tools { @apply hidden; } -trix-editor ol, trix-editor ul, .editor-output ol, .editor-output ul { +trix-editor ol, trix-editor ul, .editor-output ol, .editor-output ul, ul.initial, ol.initial { margin-left: 25px; } -trix-editor ul, .editor-output ul { +trix-editor ul, .editor-output ul, ul.initial { list-style: disc; } -trix-editor ol, .editor-output ol { +trix-editor ol, .editor-output ol, ol.initial { list-style: decimal; } \ No newline at end of file diff --git a/src/Controller/VvtController.php b/src/Controller/VvtController.php index 8508cfdc..3655eeb6 100644 --- a/src/Controller/VvtController.php +++ b/src/Controller/VvtController.php @@ -86,6 +86,7 @@ public function addVvt( 'vvt' => $vvt, 'activ' => $vvt->getActiv(), 'CTA' => false, + 'urlBack' => $this->generateUrl('vvt'), ]); } diff --git a/templates/vvt/__form.html.twig b/templates/vvt/__form.html.twig index 563d1715..d52d6a98 100644 --- a/templates/vvt/__form.html.twig +++ b/templates/vvt/__form.html.twig @@ -1,359 +1,114 @@ {% trans_default_domain 'vvt' %} -{{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} - -
-

{% trans %}dataForProcessing{% endtrans %}

- -
- {% if activNummer %} -
-
- {{ form_label(form.nummer) }} -
-
- {{ form_widget(form.nummer) }} -
-
- {% endif %} - -
-
- {{ form_label(form.name) }} -
-
- {{ form_widget(form.name) }} -
-
-
-
- {{ form_label(form.auftragsverarbeitung) }} - {{ form_help(form.auftragsverarbeitung) }} -
-
- {{ form_widget(form.auftragsverarbeitung) }} -
- -
-
-
- {{ form_label(form.status) }} - {{ form_help(form.status) }} -
-
- {{ form_widget(form.status) }} -
-
-
-
- {{ form_label(form.abteilung) }} - {{ form_help(form.abteilung) }} -
-
- {{ form_widget(form.abteilung) }} -
-
-
-
- {{ form_label(form.produkt) }} -
-
- {{ form_widget(form.produkt) }} - {{ form_help(form.produkt) }} -
-
-
-
- {{ form_label(form.userContract) }} - {{ form_help(form.userContract) }} -
-
- {{ form_widget(form.userContract) }} -
-
-
-
- {{ form_label(form.verantwortlich) }} - -
-
- {{ form_widget(form.verantwortlich) }} -
-
-
-
- {{ form_label(form.grundlage) }} -
-
- {{ form_widget(form.grundlage) }} -
-
-
-
- {{ form_label(form.zweck) }} - {{ form_help(form.zweck) }} -
-
- {{ form_widget(form.zweck) }} -
-
-
-
- {{ form_label(form.speicherung) }} - {{ form_help(form.speicherung) }} -
-
- {{ form_widget(form.speicherung) }} -
-
-
-
- {{ form_label(form.loeschfrist) }} - {{ form_help(form.loeschfrist) }} -
-
- {{ form_widget(form.loeschfrist) }} -
-
-
-
- -
-

{% trans %}collectedData{% endtrans %}

-
-
-
- {{ form_label(form.personengruppen) }} -
-
- {{ form_widget(form.personengruppen) }} -
- -
-
-
- {{ form_label(form.kategorien) }} - {{ form_help(form.kategorien) }} -
-
- {{ form_widget(form.kategorien) }} -
-
- -
-
- -
-

{% trans %}orderProcessing{% endtrans %}

- -
-
-
- {{ form_label(form.jointControl) }} - {{ form_help(form.jointControl) }} -
-
- {{ form_widget(form.jointControl) }} -
- -
-
-
- {{ form_label(form.weitergabe) }} - {{ form_help(form.weitergabe) }} -
-
- {{ form_widget(form.weitergabe) }} -
-
- -
+{{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }} -
- {{ form_label(form.datenweitergaben) }} -
-
- {{ form_widget(form.datenweitergaben) }} -
-
- {% if vvt.datenweitergaben is defined and vvt.datenweitergaben is not null %} - {% trans %}associatedDataTransfer{% endtrans %}
-
    - {% for d in vvt.datenweitergaben %} - {% if d.activ == 1 %} - {% if d.art == 1 %} -
  • {{ d.gegenstand }} -
    • - {% endif %} - {% endif %} - {% endfor %} -
- {% trans %}associatedOrderProcessing{% endtrans %}
-
    - {% for d in vvt.datenweitergaben %} - {% if d.activ == 1 %} - {% if d.art == 2 %} -
  • {{ d.gegenstand }} -
    • - {% endif %} - {% endif %} - {% endfor %} -
+
+ {% trans %}dataForProcessing{% endtrans %} + {% if activNummer %} + {{ form_row(form.nummer) }} + {% endif %} + {{ form_row(form.name) }} + {{ form_row(form.auftragsverarbeitung) }} + {{ form_row(form.status) }} + {{ form_row(form.abteilung) }} + {{ form_row(form.produkt) }} + {{ form_row(form.userContract) }} + {{ form_row(form.verantwortlich) }} + {{ form_row(form.grundlage) }} + {{ form_row(form.zweck) }} + {{ form_row(form.speicherung) }} + {{ form_row(form.loeschfrist) }} +
+ +
+ {% trans %}collectedData{% endtrans %} + {{ form_row(form.personengruppen) }} + {{ form_row(form.kategorien) }} +
+ +
+ {% trans %}orderProcessing{% endtrans %} + {{ form_row(form.jointControl) }} + {{ form_row(form.weitergabe) }} + {{ form_row(form.datenweitergaben) }} + + {% if vvt.datenweitergaben is defined and vvt.datenweitergaben is not null %} +

{% trans %}associatedDataTransfer{% endtrans %}

+
    + {% for d in vvt.datenweitergaben %} + {% if d.activ == 1 %} + {% if d.art == 1 %} +
  • + {{ d.gegenstand }} +
    • + {% endif %} {% endif %} -
-
-
-
- {{ form_label(form.eu) }} - {{ form_help(form.eu) }} -
-
- {{ form_widget(form.eu) }} -
-
- -
-
- -
-

{% trans %}technicalOrganizationalActions{% endtrans %}

- -
-
-
- {{ form_label(form.software) }} - {{ form_help(form.software) }} -
-
- {{ form_widget(form.software) }} -
-
-
-
- {{ form_label(form.tomLink) }} - {{ form_help(form.tomLink) }} -
-
- {{ form_widget(form.tomLink) }} -
-
-
-
- {{ form_label(form.tom) }} - {{ form_help(form.tom) }} -
-
- {{ form_widget(form.tom) }} -
-
- -
-
- -
-

{% trans %}riskAssessment{% endtrans %}

- -
-
-
- {{ form_label(form.risiko) }} - {{ form_help(form.risiko) }} -
-
- {{ form_widget(form.risiko) }} -
-
- - -
-
- {{ form_label(form.beurteilungEintritt) }} - {{ form_help(form.beurteilungEintritt) }} -
-
- {{ form_widget(form.beurteilungEintritt) }} -

-

    -
  • - {% trans %}probability.highest{% endtrans %} -
    • -
  • - {% trans %}probability.high{% endtrans %} -
    • -
  • - {% trans %}probability.low{% endtrans %} -
    • -
  • - {% trans %}probability.lowest{% endtrans %} -
    • -
-

-
-
-
-
- {{ form_label(form.beurteilungSchaden) }} - {{ form_help(form.beurteilungSchaden) }} -
-
- {{ form_widget(form.beurteilungSchaden) }} -
- {% trans %}riskAssessmentDisclaimer{% endtrans %} -
- -
-
-
- -
- - -
-

{% trans %}dutyToInform{% endtrans %}

- -
-
-
- {{ form_label(form.source) }} - {{ form_help(form.source) }} -
-
- {{ form_widget(form.source) }} -
-
-
-
- {{ form_label(form.informationspflicht) }} - {{ form_help(form.informationspflicht) }} -
-
- {{ form_widget(form.informationspflicht) }} -
-
-
-
- {{ form_label(form.dsb) }} - {{ form_help(form.dsb) }} -
-
- {{ form_widget(form.dsb) }} -
-
-
-
-

- {% trans %}processing.disclaimer{% endtrans %} -

-
-
- {% for p in vvt.policies | filter(p => p.activ) %} - {{ p.title }} - {% endfor %} -
-
-
- {{ form_widget(form.save) }} -
-
-
-{{ form_end(form) }} + {% endfor %} + +
+

{% trans %}associatedOrderProcessing{% endtrans %}

+ +
+ {% endif %} + + {{ form_row(form.eu) }} + + +
+ {% trans %}technicalOrganizationalActions{% endtrans %} + {{ form_row(form.software) }} + {{ form_row(form.tomLink) }} + {{ form_row(form.tom) }} +
+ +
+ {% trans %}riskAssessment{% endtrans %} + {{ form_row(form.risiko) }} + {{ form_row(form.beurteilungEintritt) }} + + {{ form_row(form.beurteilungSchaden) }} +

+ {% trans %}riskAssessmentDisclaimer{% endtrans %} +

+
+ +
+ {% trans %}dutyToInform{% endtrans %} + {{ form_row(form.source) }} + {{ form_row(form.informationspflicht) }} + {{ form_row(form.dsb) }} + +

+ {% trans %}processing.disclaimer{% endtrans %} +

+ + {% for p in vvt.policies | filter(p => p.activ) %} + {{ p.title }} + {% endfor %} +
+ +{{ form_row(form.save, {row_attr: {class: 'form-buttons'}}) }} +{{ form_end(form) }} \ No newline at end of file diff --git a/templates/vvt/new.html.twig b/templates/vvt/new.html.twig index 653fac6f..c079351e 100644 --- a/templates/vvt/new.html.twig +++ b/templates/vvt/new.html.twig @@ -1,21 +1,18 @@ {% extends 'base.html.twig' %} {% trans_default_domain 'vvt' %} -{% block CTA %}{% endblock %} +{% block title %} + {{ title }} {% if not activNummer %} + {% trans from 'general' %}id{% endtrans %}: {{ vvt.nummer }}{% endif %} +{% endblock %} + {% block body %} -

- {{ title }} {% if not activNummer %} - {% trans from 'general' %}id{% endtrans %}: {{ vvt.nummer }}{% endif %} -

{{ include('vvt/__form.html.twig') }} -

{% trans from 'general' %}createdAt{% endtrans %}: {{ vvt.user.email }}

+

{% trans from 'general' %}createdAt{% endtrans %}: {{ vvt.user.email }}

{% if vvt.previous %}

{% trans from 'general' %}history{% endtrans %}

{{ include('vvt/__history.html.twig', {'p':vvt.previous}) }}
{% endif %} -{% endblock %} - -{% block javascript %} -{% endblock %} +{% endblock %} \ No newline at end of file