From 1c36caba597931d485b274cf9b96821f9f3794a6 Mon Sep 17 00:00:00 2001 From: Rayvented Date: Fri, 24 Nov 2023 14:41:19 +0100 Subject: [PATCH] Some smaller design updates --- assets/controllers/appUi_controller.js | 14 +++++++++++ assets/styles/colors.css | 24 +++++++++++++++++++ assets/styles/dataTablesApp.css | 2 +- assets/styles/tailmater.css | 2 +- src/Form/Type/AbteilungType.php | 2 +- src/Form/Type/AssignType.php | 2 +- src/Form/Type/AuditTomType.php | 2 +- src/Form/Type/ClientRequesCommentType.php | 2 +- .../Type/ClientRequestInternalNoteType.php | 2 +- src/Form/Type/ClientRequestType.php | 2 +- src/Form/Type/ClientRequestViewType.php | 2 +- src/Form/Type/DatenweitergabeType.php | 2 +- src/Form/Type/DsbType.php | 2 +- src/Form/Type/FormsType.php | 2 +- src/Form/Type/KontaktType.php | 2 +- src/Form/Type/KursAnmeldungType.php | 2 +- src/Form/Type/KursType.php | 2 +- src/Form/Type/NewType.php | 2 +- src/Form/Type/PolicyType.php | 2 +- src/Form/Type/ProduktType.php | 2 +- .../Question/DynamicQuestionType.php | 2 +- src/Form/Type/Questionnaire/QuestionType.php | 2 +- src/Form/Type/ReportExportType.php | 2 +- src/Form/Type/ReportType.php | 2 +- src/Form/Type/SettingsType.php | 2 +- src/Form/Type/SoftwareConfigType.php | 2 +- src/Form/Type/SoftwareType.php | 2 +- src/Form/Type/TasksType.php | 2 +- src/Form/Type/TeamType.php | 2 +- src/Form/Type/TomType.php | 2 +- src/Form/Type/UploadTyp.php | 2 +- src/Form/Type/VVTType.php | 2 +- src/Form/Type/VorfallType.php | 2 +- src/Form/Type/VvtDsfaType.php | 2 +- templates/base.html.twig | 5 ++++ templates/base/__approveBtn.html.twig | 2 +- templates/base/__disableBtn.html.twig | 4 +--- templates/bericht/index.html.twig | 4 ++-- templates/kurs/__indexTable.html.twig | 8 +++---- .../questionnaire/list.html.twig | 2 +- templates/task/edit.html.twig | 8 +++---- templates/team/academy.html.twig | 3 +-- templates/team/custom.html.twig | 12 +++++----- templates/team/dsb.html.twig | 3 +-- translations/dashboard/dashboard.de.yaml | 1 + translations/dashboard/dashboard.en.yaml | 1 + translations/dashboard/dashboard.ev.yaml | 1 + translations/dashboard/dashboard.fr.yaml | 1 + 48 files changed, 100 insertions(+), 57 deletions(-) diff --git a/assets/controllers/appUi_controller.js b/assets/controllers/appUi_controller.js index 9dda23a6..2b05e650 100644 --- a/assets/controllers/appUi_controller.js +++ b/assets/controllers/appUi_controller.js @@ -3,6 +3,20 @@ import { Controller } from '@hotwired/stimulus'; export default class extends Controller { connect() { this.initTabs(); + this.initClickListeners(); + } + + initClickListeners() { + const selectorConfirm = '.text-danger, .btn-danger, .btw-warning, [data-click-confirm]'; + Array.prototype.forEach.call(document.querySelectorAll(selectorConfirm), function (element) { + element.addEventListener('click', function(event) { + if (confirm(window.translations.confirmAction)) { + return true; + } + event.preventDefault(); + return false; + }); + }); } initTabs() { diff --git a/assets/styles/colors.css b/assets/styles/colors.css index e8d330e7..d4a5de5f 100644 --- a/assets/styles/colors.css +++ b/assets/styles/colors.css @@ -102,6 +102,18 @@ @apply card-element bg-datenkategorie-50 text-datenkategorie-800 border-datenkategorie-100; } +.card-akademie { + @apply card-element bg-indigo-50 text-indigo-800 border-indigo-100; +} + +.card-client { + @apply card-element bg-pink-50 text-pink-800 border-pink-100; +} + +.card-customer { + @apply card-element bg-teal-50 text-teal-800 border-teal-100; +} + /* .card links */ .card-vvt a { @@ -150,4 +162,16 @@ .card-datenkategorie a { @apply hover:text-datenkategorie-950 text-datenkategorie-800; +} + +.card-akademie a { + @apply hover:text-indigo-950 text-indigo-800; +} + +.card-client a { + @apply hover:text-pink-950 text-pink-800; +} + +.card-customer a { + @apply hover:text-teal-950 text-teal-800; } \ No newline at end of file diff --git a/assets/styles/dataTablesApp.css b/assets/styles/dataTablesApp.css index 02b5d061..8c0200ed 100644 --- a/assets/styles/dataTablesApp.css +++ b/assets/styles/dataTablesApp.css @@ -94,5 +94,5 @@ table.dataTable > tbody > tr[data-href] > td { } table.dataTable > tbody > tr > td > a { - @apply text-primary-600 hover:underline; + @apply hover:underline; } \ No newline at end of file diff --git a/assets/styles/tailmater.css b/assets/styles/tailmater.css index ab2a6506..0cab5171 100644 --- a/assets/styles/tailmater.css +++ b/assets/styles/tailmater.css @@ -835,7 +835,7 @@ form > fieldset { } form > fieldset > legend { - @apply bg-surface-200 rounded-xl px-3 py-1 text-base; + @apply bg-surface-200 rounded-xl px-3 py-1 text-lg; } form > fieldset .btn-primary { diff --git a/src/Form/Type/AbteilungType.php b/src/Form/Type/AbteilungType.php index 49c9c0ea..1769210e 100644 --- a/src/Form/Type/AbteilungType.php +++ b/src/Form/Type/AbteilungType.php @@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('name', TextType::class, ['label' => 'newDepartment', 'required' => true, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/AssignType.php b/src/Form/Type/AssignType.php index b75e1019..1e607701 100644 --- a/src/Form/Type/AssignType.php +++ b/src/Form/Type/AssignType.php @@ -30,7 +30,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'multiple' => false, 'required' => false ]) - ->add('submit', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-sm'), 'label' => 'assign', 'translation_domain' => 'form']); + ->add('submit', SubmitType::class, ['attr' => array('class' => 'btn btn-sm'), 'label' => 'assign', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/AuditTomType.php b/src/Form/Type/AuditTomType.php index 92ab9407..40d455c6 100644 --- a/src/Form/Type/AuditTomType.php +++ b/src/Form/Type/AuditTomType.php @@ -136,7 +136,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ], ]) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/ClientRequesCommentType.php b/src/Form/Type/ClientRequesCommentType.php index 49e4c175..9cb2cf74 100644 --- a/src/Form/Type/ClientRequesCommentType.php +++ b/src/Form/Type/ClientRequesCommentType.php @@ -21,7 +21,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('comment', TextareaType::class, ['label' => 'message', 'required' => true, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'send', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'send', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/ClientRequestInternalNoteType.php b/src/Form/Type/ClientRequestInternalNoteType.php index e5f370b2..4b2a259a 100644 --- a/src/Form/Type/ClientRequestInternalNoteType.php +++ b/src/Form/Type/ClientRequestInternalNoteType.php @@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('notes', TextareaType::class, ['attr' => ['class' => 'summernote'], 'label' => 'internalComment', 'required' => false, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/ClientRequestType.php b/src/Form/Type/ClientRequestType.php index 160d005d..cb1d4aad 100644 --- a/src/Form/Type/ClientRequestType.php +++ b/src/Form/Type/ClientRequestType.php @@ -55,7 +55,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('birthday', DateType::class, ['label' => 'Geburtstag', 'required' => false, 'translation_domain' => 'form', 'widget' => 'single_text']) ->add('street', TextType::class, ['label' => 'Straße und Hausnummer', 'required' => false, 'translation_domain' => 'form']) ->add('city', TextType::class, ['label' => 'Postleitzahl und Stadt', 'required' => false, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'Speichern', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'Speichern', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/ClientRequestViewType.php b/src/Form/Type/ClientRequestViewType.php index bcbe4926..19bf52b2 100644 --- a/src/Form/Type/ClientRequestViewType.php +++ b/src/Form/Type/ClientRequestViewType.php @@ -24,7 +24,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('password', PasswordType::class, ['label' => 'Zugangspasswort ', 'required' => true, 'translation_domain' => 'form']) ->add('uuid', TextType::class, ['label' => 'Ticket ID ', 'required' => true, 'translation_domain' => 'form']) ->add('email', TextType::class, ['label' => 'Email Adresse', 'required' => true, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'Anzeigen', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'Anzeigen', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/DatenweitergabeType.php b/src/Form/Type/DatenweitergabeType.php index a0063213..63a56ee1 100644 --- a/src/Form/Type/DatenweitergabeType.php +++ b/src/Form/Type/DatenweitergabeType.php @@ -121,7 +121,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'translation_domain' => 'form', 'download_label' => false ]) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block'), 'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block'), 'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/DsbType.php b/src/Form/Type/DsbType.php index 5c46a4f7..ef356137 100644 --- a/src/Form/Type/DsbType.php +++ b/src/Form/Type/DsbType.php @@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('dsb', TextType::class, ['required' => false, 'label' => 'dpoEmail', 'help' => 'dpoEmailHelp', 'translation_domain' => 'form']) - ->add('submit', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'appoint', 'translation_domain' => 'form']); + ->add('submit', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'appoint', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/FormsType.php b/src/Form/Type/FormsType.php index 1c4e4ed4..a25e29f0 100644 --- a/src/Form/Type/FormsType.php +++ b/src/Form/Type/FormsType.php @@ -79,7 +79,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'data-live-search' => 'true' ] ]) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/KontaktType.php b/src/Form/Type/KontaktType.php index 32fab5ed..ea6a0a35 100644 --- a/src/Form/Type/KontaktType.php +++ b/src/Form/Type/KontaktType.php @@ -44,7 +44,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('email', TextType::class, ['label' => 'email', 'required' => false, 'translation_domain' => 'form']) ->add('telefon', TextType::class, ['label' => 'phone', 'required' => false, 'translation_domain' => 'form']) ->add('bemerkung', TextareaType::class, ['label' => 'comment', 'required' => false, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/KursAnmeldungType.php b/src/Form/Type/KursAnmeldungType.php index 248fddff..11faa4d6 100644 --- a/src/Form/Type/KursAnmeldungType.php +++ b/src/Form/Type/KursAnmeldungType.php @@ -53,7 +53,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('invite', CheckboxType::class, ['label' => 'Einladungs-EMail an alle Nutzer senden (Wenn nicht ausgewählt wird die Einladung automatisch am nächsten Tag verschickt)', 'required' => false, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'Kurse zuweisen', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'Kurse zuweisen', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/KursType.php b/src/Form/Type/KursType.php index c1e116c8..c61a458b 100644 --- a/src/Form/Type/KursType.php +++ b/src/Form/Type/KursType.php @@ -91,7 +91,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) [ 'label' => 'save', 'translation_domain' => 'general', - 'attr' => ['class' => 'btn btn-primary'], + 'attr' => ['class' => 'btn'], ], ); } diff --git a/src/Form/Type/NewType.php b/src/Form/Type/NewType.php index 260e6564..770ff4bf 100644 --- a/src/Form/Type/NewType.php +++ b/src/Form/Type/NewType.php @@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('name', TextType::class, ['label' => 'new', 'required' => true, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/PolicyType.php b/src/Form/Type/PolicyType.php index 47d7a523..78f9d23e 100644 --- a/src/Form/Type/PolicyType.php +++ b/src/Form/Type/PolicyType.php @@ -113,7 +113,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'translation_domain' => 'form', 'download_label' => false ]) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/ProduktType.php b/src/Form/Type/ProduktType.php index 9064ed22..1aa00a1a 100644 --- a/src/Form/Type/ProduktType.php +++ b/src/Form/Type/ProduktType.php @@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('name', TextType::class, ['label' => 'Neues Produkt hinzufügen', 'required' => true, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'Speichern', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'Speichern', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/Questionnaire/Question/DynamicQuestionType.php b/src/Form/Type/Questionnaire/Question/DynamicQuestionType.php index 55684eae..86afbc96 100644 --- a/src/Form/Type/Questionnaire/Question/DynamicQuestionType.php +++ b/src/Form/Type/Questionnaire/Question/DynamicQuestionType.php @@ -44,7 +44,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) SubmitType::class, [ 'attr' => [ - 'class' => 'btn btn-primary' + 'class' => 'btn' ], 'label' => 'continue', 'translation_domain' => 'general', diff --git a/src/Form/Type/Questionnaire/QuestionType.php b/src/Form/Type/Questionnaire/QuestionType.php index b94fedb6..6655fe7a 100644 --- a/src/Form/Type/Questionnaire/QuestionType.php +++ b/src/Form/Type/Questionnaire/QuestionType.php @@ -82,7 +82,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void SubmitType::class, [ 'attr' => [ - 'class' => 'btn btn-primary' + 'class' => 'btn' ], 'label' => 'save.word', 'translation_domain' => 'general', diff --git a/src/Form/Type/ReportExportType.php b/src/Form/Type/ReportExportType.php index 5c0ec449..da80301c 100644 --- a/src/Form/Type/ReportExportType.php +++ b/src/Form/Type/ReportExportType.php @@ -27,7 +27,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('bis', DateType::class, ['label' => 'Bis', 'required' => true, 'translation_domain' => 'form', 'widget' => 'single_text']) ->add('user', TextType::class, ['label' => 'Bearbeiter (Email Adresse)', 'required' => false, 'translation_domain' => 'form']) ->add('report', CheckboxType::class, ['label' => 'Nur Aktivitäten für offiziellen Tätigkeitsbericht beinhalten', 'required' => false, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'Export erstellen', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'Export erstellen', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/ReportType.php b/src/Form/Type/ReportType.php index 40f91478..4cc291e0 100644 --- a/src/Form/Type/ReportType.php +++ b/src/Form/Type/ReportType.php @@ -48,7 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('invoice', CheckboxType::class, ['label' => 'billed', 'required' => false, 'translation_domain' => 'form']) ->add('inReport', CheckboxType::class, ['label' => 'showInReport', 'required' => false, 'translation_domain' => 'form']) ->add('onsite', CheckboxType::class, ['label' => 'onSite', 'required' => false, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/SettingsType.php b/src/Form/Type/SettingsType.php index 3f852801..4541d969 100644 --- a/src/Form/Type/SettingsType.php +++ b/src/Form/Type/SettingsType.php @@ -29,7 +29,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('useKeycloakGroups', CheckboxType::class, ['label' => 'useKeycloakGroups', 'help'=> 'useKeycloakGroupsHelp', 'required' => false, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/SoftwareConfigType.php b/src/Form/Type/SoftwareConfigType.php index 9e7fcb3d..cf85ff51 100644 --- a/src/Form/Type/SoftwareConfigType.php +++ b/src/Form/Type/SoftwareConfigType.php @@ -27,7 +27,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('name', TextType::class, ['label' => 'Bezeichnung der Konfiguration', 'required' => true, 'translation_domain' => 'form']) ->add('config', TextareaType::class, ['attr' => ['class' => 'summernote'], 'label' => 'Konfiguration', 'required' => true, 'translation_domain' => 'form']) ->add('activ', CheckboxType::class, ['label' => 'Konfiguration Aktiv', 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'Speichern', 'translation_domain' => 'form']) + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'Speichern', 'translation_domain' => 'form']) ->add('uploadFile', VichImageType::class, [ 'required' => false, 'allow_delete' => true, diff --git a/src/Form/Type/SoftwareType.php b/src/Form/Type/SoftwareType.php index 754752c4..f0592814 100644 --- a/src/Form/Type/SoftwareType.php +++ b/src/Form/Type/SoftwareType.php @@ -92,7 +92,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('archiving', TextareaType::class, ['attr' => ['rows' => 8], 'label' => 'backupPolicy', 'required' => false, 'translation_domain' => 'form', 'help' => 'backupPolicyHelp']) ->add('recovery', TextareaType::class, ['attr' => ['rows' => 8], 'label' => 'emergencyPlan', 'required' => false, 'translation_domain' => 'form', 'help' => 'emergencyPlanHelp']) ->add('permissions', TextareaType::class, ['attr' => ['rows' => 8], 'label' => 'privilegePolicy', 'required' => false, 'translation_domain' => 'form', 'help' => 'privilegePolicyHelp']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/TasksType.php b/src/Form/Type/TasksType.php index fdbdb5d3..84b1d10a 100644 --- a/src/Form/Type/TasksType.php +++ b/src/Form/Type/TasksType.php @@ -56,7 +56,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'data-live-search' => 'true' ], ]) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-block mt-3'), 'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/TeamType.php b/src/Form/Type/TeamType.php index 4e490cda..f10c340b 100644 --- a/src/Form/Type/TeamType.php +++ b/src/Form/Type/TeamType.php @@ -49,7 +49,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('slug', TextType::class, ['label' => 'slug', 'required' => false, 'translation_domain' => 'form', 'help' => 'slugHelp']) ->add('externalLink', TextType::class, ['label' => 'externalLink', 'required' => false, 'translation_domain' => 'form', 'help' => 'externalLinkHelp']) ->add('video', TextType::class, ['label' => 'jitsiLink', 'required' => false, 'translation_domain' => 'form', 'help' => 'jitsiLinkHelp']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/TomType.php b/src/Form/Type/TomType.php index 4252e280..ae91b286 100644 --- a/src/Form/Type/TomType.php +++ b/src/Form/Type/TomType.php @@ -48,7 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('tomWiederherstellbarkeit', TextareaType::class, ['attr' => ['class' => 'summernote', 'rows' => 8],'label' => 'tomRecoverability', 'required' => true, 'translation_domain' => 'form']) ->add('tomAudit', TextareaType::class, ['attr' => ['class' => 'summernote', 'rows' => 8],'label' => 'tomAuditProcedure', 'required' => true, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'save', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'save', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/UploadTyp.php b/src/Form/Type/UploadTyp.php index 276c82cb..24909692 100644 --- a/src/Form/Type/UploadTyp.php +++ b/src/Form/Type/UploadTyp.php @@ -29,7 +29,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'translation_domain' => 'form', 'download_label' => false ]) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'uploadFile', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'uploadFile', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/src/Form/Type/VVTType.php b/src/Form/Type/VVTType.php index 50c34bb3..3c23611c 100644 --- a/src/Form/Type/VVTType.php +++ b/src/Form/Type/VVTType.php @@ -307,7 +307,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ], ]) ->add('save', SubmitType::class, [ - 'attr' => array('class' => 'btn btn-primary btn-block'), + 'attr' => array('class' => 'btn btn-block'), 'label' => 'save', 'translation_domain' => 'form' ]); diff --git a/src/Form/Type/VorfallType.php b/src/Form/Type/VorfallType.php index a155662f..7f89fffb 100644 --- a/src/Form/Type/VorfallType.php +++ b/src/Form/Type/VorfallType.php @@ -33,7 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('auswirkung', TextareaType::class, ['attr' => ['rows' => 8], 'label' => 'incidentConsequences', 'required' => true, 'translation_domain' => 'form']) ->add('massnahmen', TextareaType::class, ['attr' => ['rows' => 8], 'label' => 'incidentMeasures', 'required' => true, 'translation_domain' => 'form']) ->add('datum', DateTimeType::class, ['label' => 'incidentDiscovered', 'required' => true, 'translation_domain' => 'form', 'widget' => 'single_text']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'save', 'translation_domain' => 'form']) + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'), 'label' => 'save', 'translation_domain' => 'form']) ->add('personen', EntityType::class, [ 'choice_label' => 'name', 'class' => VVTPersonen::class, diff --git a/src/Form/Type/VvtDsfaType.php b/src/Form/Type/VvtDsfaType.php index ec0a3ff4..e63d09df 100644 --- a/src/Form/Type/VvtDsfaType.php +++ b/src/Form/Type/VvtDsfaType.php @@ -28,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->add('standpunkt', TextareaType::class, ['attr' => ['class' => 'summernote'], 'label' => 'Standpunkt von weiteren Organen (z.B. Betriebsrat)', 'required' => true, 'translation_domain' => 'form']) ->add('dsb', TextareaType::class, ['attr' => ['class' => 'summernote'], 'label' => 'Standpunkt des Datenschutzbeauftragten', 'required' => false, 'translation_domain' => 'form']) ->add('ergebnis', TextareaType::class, ['attr' => ['class' => 'summernote'], 'label' => 'Ergebnis der Datenschutz-Folgenabschätzung', 'required' => false, 'translation_domain' => 'form']) - ->add('save', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'),'label' => 'Speichern', 'translation_domain' => 'form']); + ->add('save', SubmitType::class, ['attr' => array('class' => 'btn'),'label' => 'Speichern', 'translation_domain' => 'form']); } public function configureOptions(OptionsResolver $resolver) diff --git a/templates/base.html.twig b/templates/base.html.twig index 068f8d60..4c766a79 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -36,6 +36,11 @@
{{ encore_entry_script_tags('app') }} + {% block javascripts %}{% endblock %} \ No newline at end of file diff --git a/templates/base/__approveBtn.html.twig b/templates/base/__approveBtn.html.twig index 4d29c3c9..76791edb 100644 --- a/templates/base/__approveBtn.html.twig +++ b/templates/base/__approveBtn.html.twig @@ -1,7 +1,7 @@ {% trans_default_domain 'base' %} {% if data.team in app.user.adminRoles and not data.activ == 0 %} - {% if data.approved %} diff --git a/templates/base/__disableBtn.html.twig b/templates/base/__disableBtn.html.twig index c937af9b..cec2335e 100644 --- a/templates/base/__disableBtn.html.twig +++ b/templates/base/__disableBtn.html.twig @@ -1,9 +1,7 @@ {% trans_default_domain 'base' %} {% if data.team in app.user.adminRoles and not data.approved and not data.activ == 0 %} - + {% if data.activ == 1 %} {% trans %}delete{% endtrans %} {% else %} diff --git a/templates/bericht/index.html.twig b/templates/bericht/index.html.twig index 0e49805e..4278bb0f 100644 --- a/templates/bericht/index.html.twig +++ b/templates/bericht/index.html.twig @@ -123,14 +123,14 @@
-
+

Kundenanfragen

Alle Anfragen exportieren
-
+

{% trans %}customerRequest.word{% endtrans %}

{{ t.createdAt|date('d.m.Y') }} {% trans from 'general' %}login{% endtrans %} - {% if app.user == t.user %}{% trans from 'general' %}edit{% endtrans %}{% endif %} - {% trans from 'general' %}delete{% endtrans %} + {% if app.user == t.user %} + {% trans from 'general' %}edit{% endtrans %} + {% endif %} + {% trans from 'general' %}delete{% endtrans %} {% endfor %} diff --git a/templates/questionnaire/questionnaire/list.html.twig b/templates/questionnaire/questionnaire/list.html.twig index b5b9cc6a..f70e7211 100644 --- a/templates/questionnaire/questionnaire/list.html.twig +++ b/templates/questionnaire/questionnaire/list.html.twig @@ -18,7 +18,7 @@ {% trans from 'general' %}show{% endtrans %} {% trans from 'general' %}edit{% endtrans %} - {% trans from 'general' %}remove{% endtrans %} + {% trans from 'general' %}remove{% endtrans %} {% endfor %} diff --git a/templates/task/edit.html.twig b/templates/task/edit.html.twig index d32599d9..f249098f 100644 --- a/templates/task/edit.html.twig +++ b/templates/task/edit.html.twig @@ -12,8 +12,9 @@ >{% trans %}task.edit{% endtrans %} {% endif %} {% if task.activ and not task.done %} - {% trans %}finish{% endtrans %} {% endif %} {% if nextAudit is defined %} @@ -24,8 +25,7 @@ {% if not task.assignedUser %} {% endif %} - {% if task.activ == 1 %}{% trans from 'general' %}delete{% endtrans %}{% else %}{% trans from 'general' %}restore{% endtrans %}{% endif %} {% endblock %} diff --git a/templates/team/academy.html.twig b/templates/team/academy.html.twig index 52f9c341..a3a73453 100644 --- a/templates/team/academy.html.twig +++ b/templates/team/academy.html.twig @@ -36,8 +36,7 @@

{{ d.email }}

- + {% trans from 'general' %}remove{% endtrans %}
diff --git a/templates/team/custom.html.twig b/templates/team/custom.html.twig index 9eaf656f..eb0ef000 100644 --- a/templates/team/custom.html.twig +++ b/templates/team/custom.html.twig @@ -25,8 +25,8 @@ data-action="click->appUi#loadContentModal">{{ dd.titleNew }}
- + {% else %} +

{% trans %}noEntry{% endtrans %}

+ {% endif %} {% endfor %} diff --git a/templates/team/dsb.html.twig b/templates/team/dsb.html.twig index ed0c6a78..ed62fa62 100644 --- a/templates/team/dsb.html.twig +++ b/templates/team/dsb.html.twig @@ -20,8 +20,7 @@
+ class="btn btn-danger"> {% trans from 'general' %}remove{% endtrans %}
diff --git a/translations/dashboard/dashboard.de.yaml b/translations/dashboard/dashboard.de.yaml index 3f3993f3..cf3a74fe 100644 --- a/translations/dashboard/dashboard.de.yaml +++ b/translations/dashboard/dashboard.de.yaml @@ -18,6 +18,7 @@ privacyCenter: Datenschutzcenter flowChart: Datenflussplan departments: all: Alle Abteilungen +quickAccess: Schnellzugriff approvedBy: Freigegeben von contact: KONTAKT diff --git a/translations/dashboard/dashboard.en.yaml b/translations/dashboard/dashboard.en.yaml index 9d473c5f..6c986bbb 100644 --- a/translations/dashboard/dashboard.en.yaml +++ b/translations/dashboard/dashboard.en.yaml @@ -18,6 +18,7 @@ privacyCenter: Privacy Center flowChart: Data flow chart departments: all: Alle Abteilungen +quickAccess: Quick access approvedBy: Freigegeben von contact: KONTAKT licenseExpired: LIZENZ ABGELAUFEN diff --git a/translations/dashboard/dashboard.ev.yaml b/translations/dashboard/dashboard.ev.yaml index 04fef8ab..1a24b7cc 100644 --- a/translations/dashboard/dashboard.ev.yaml +++ b/translations/dashboard/dashboard.ev.yaml @@ -18,6 +18,7 @@ privacyCenter: Datenschutzcenter flowChart: Datenflussplan departments: all: Alle Abteilungen +quickAccess: Schnellzugriff approvedBy: Freigegeben von contact: KONTAKT licenseExpired: LIZENZ ABGELAUFEN diff --git a/translations/dashboard/dashboard.fr.yaml b/translations/dashboard/dashboard.fr.yaml index 04fef8ab..1a24b7cc 100644 --- a/translations/dashboard/dashboard.fr.yaml +++ b/translations/dashboard/dashboard.fr.yaml @@ -18,6 +18,7 @@ privacyCenter: Datenschutzcenter flowChart: Datenflussplan departments: all: Alle Abteilungen +quickAccess: Schnellzugriff approvedBy: Freigegeben von contact: KONTAKT licenseExpired: LIZENZ ABGELAUFEN