Skip to content

Commit

Permalink
Some smaller design updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Rayvented committed Nov 24, 2023
1 parent 3070cc4 commit 1c36cab
Show file tree
Hide file tree
Showing 48 changed files with 100 additions and 57 deletions.
14 changes: 14 additions & 0 deletions assets/controllers/appUi_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
24 changes: 24 additions & 0 deletions assets/styles/colors.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion assets/styles/dataTablesApp.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion assets/styles/tailmater.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/AbteilungType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/AssignType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/AuditTomType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/ClientRequesCommentType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/ClientRequestInternalNoteType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/ClientRequestType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/ClientRequestViewType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/DatenweitergabeType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/DsbType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/FormsType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/KontaktType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/KursAnmeldungType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/KursType.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
[
'label' => 'save',
'translation_domain' => 'general',
'attr' => ['class' => 'btn btn-primary'],
'attr' => ['class' => 'btn'],
],
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/NewType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/PolicyType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/ProduktType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/Questionnaire/QuestionType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/ReportExportType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/ReportType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/SettingsType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/SoftwareConfigType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/SoftwareType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/TasksType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/TeamType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/TomType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Form/Type/UploadTyp.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading

0 comments on commit 1c36cab

Please sign in to comment.