From ebad54e989554442bed74426e54a2fc248cf6431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Thu, 12 Nov 2026 15:24:35 +0100 Subject: [PATCH] style: align with the ep-corporate-design skill --- assets/controllers/drawer_controller.js | 35 ++ assets/controllers/mobilenav_controller.js | 16 - assets/controllers/sidebar_menu_controller.js | 30 -- ...tin-italic.woff2 => lato-400-italic.woff2} | Bin ...v24-latin-regular.woff2 => lato-400.woff2} | Bin ...ato-v24-latin-700.woff2 => lato-700.woff2} | Bin ...ato-v24-latin-900.woff2 => lato-900.woff2} | Bin assets/styles/_base.css | 33 -- assets/styles/_components.css | 34 -- assets/styles/app.css | 68 +--- assets/styles/components/button.css | 28 -- assets/styles/components/toast.css | 23 -- assets/styles/components/tooltip.css | 10 +- assets/styles/ep-design.css | 316 ++++++++++++++++++ config/packages/knp_menu.yaml | 2 +- config/packages/twig.yaml | 2 + src/Menu/AdminMenuBuilder.php | 6 +- src/Menu/ManagerMenuBuilder.php | 4 +- src/Menu/TeamerMenuBuilder.php | 6 +- templates/_partials/_alert.html.twig | 25 +- templates/_partials/_brand.html.twig | 2 +- templates/_partials/_flashes.html.twig | 2 +- templates/_partials/_header.html.twig | 23 ++ templates/_partials/_menu.html.twig | 86 ----- templates/_partials/_receipts.html.twig | 2 +- templates/_partials/_season_badge.html.twig | 2 +- templates/_partials/_sidebar_menu.html.twig | 63 ++++ templates/_partials/_tabs.html.twig | 4 +- templates/_partials/_user_menu.html.twig | 6 +- templates/admin/application/index.html.twig | 4 +- .../admin/application/modal_dispose.html.twig | 4 +- .../admin/application/modal_status.html.twig | 2 +- .../detail.html.twig | 10 +- .../index.html.twig | 8 +- .../admin/disposition/modal_delete.html.twig | 2 +- .../admin/feedback/modal_approve.html.twig | 2 +- templates/admin/feedback/provide.html.twig | 2 +- .../admin/system/availability/_form.html.twig | 2 +- .../admin/system/availability/index.html.twig | 2 +- .../admin/system/contact/_form.html.twig | 2 +- .../admin/system/contact/index.html.twig | 2 +- .../admin/system/email_text/_form.html.twig | 6 +- .../system/email_text/_preview.html.twig | 2 +- templates/admin/system/fee/_form.html.twig | 2 +- templates/admin/system/fee/index.html.twig | 2 +- .../admin/system/feedback_set/_form.html.twig | 4 +- .../admin/system/feedback_set/index.html.twig | 2 +- .../admin/system/job_profile/_form.html.twig | 4 +- .../admin/system/job_profile/index.html.twig | 2 +- .../admin/system/training/_form.html.twig | 2 +- .../admin/system/training/index.html.twig | 2 +- templates/admin/system/user/_form.html.twig | 4 +- templates/admin/system/user/edit.html.twig | 2 +- .../teamer/_mailing_filter_summary.html.twig | 2 +- .../admin/teamer/_mailing_preview.html.twig | 2 +- templates/admin/teamer/mailing.html.twig | 6 +- .../admin/teamer/modal_disable_user.html.twig | 2 +- .../admin/teamer/remarks_internal.html.twig | 2 +- templates/admin/teamer/skills.html.twig | 2 +- .../modal_create.html.twig | 2 +- templates/admin/work_month/index.html.twig | 12 +- .../admin/work_month/modal_review.html.twig | 2 +- .../administrative/assignment/_form.html.twig | 4 +- .../assignment/detail.html.twig | 8 +- .../administrative/assignment/index.html.twig | 24 +- .../assignment/timeline.html.twig | 6 +- .../assignment_mailing/compose.html.twig | 8 +- .../availability/index.html.twig | 6 +- .../disposition/modal_call_off.html.twig | 2 +- .../modal_document_upload.html.twig | 2 +- .../modal_special_agreements.html.twig | 2 +- .../document/accepted.html.twig | 2 +- .../administrative/document/index.html.twig | 4 +- .../document/modal_check.html.twig | 2 +- .../document/modal_comment.html.twig | 2 +- .../administrative/feedback/index.html.twig | 8 +- .../administrative/feedback/provide.html.twig | 2 +- .../administrative/profile/index.html.twig | 2 +- .../questionnaire/index.html.twig | 6 +- .../questionnaire/test.html.twig | 2 +- .../test_house_manager.html.twig | 2 +- .../season_assignment/_form.html.twig | 4 +- .../season_assignment/_task_row.html.twig | 4 +- .../season_assignment/detail.html.twig | 6 +- .../season_assignment/index.html.twig | 12 +- .../modal_document_upload.html.twig | 2 +- .../modal_task_deadline.html.twig | 2 +- .../applications_by_destination.html.twig | 4 +- .../feedback_by_destination.html.twig | 4 +- .../statistics/feedback_ratings.html.twig | 4 +- .../feedback_ratings_by_destination.html.twig | 4 +- .../system/destination/_form.html.twig | 4 +- .../system/destination/index.html.twig | 12 +- .../system/document/index.html.twig | 2 +- .../system/document/modal_edit.html.twig | 2 +- .../system/document/modal_replace.html.twig | 2 +- .../system/document/modal_upload.html.twig | 2 +- .../administrative/system/faq/_form.html.twig | 4 +- .../administrative/system/faq/index.html.twig | 2 +- .../system/mailing_template/_form.html.twig | 4 +- .../system/mailing_template/index.html.twig | 2 +- .../administrative/system/news/form.html.twig | 2 +- .../system/news/index.html.twig | 2 +- .../season_task_document/modal_edit.html.twig | 2 +- .../modal_propagate.html.twig | 2 +- .../system/staffing_rule/_form.html.twig | 2 +- .../system/staffing_rule/index.html.twig | 4 +- .../system/staffing_rule/preview.html.twig | 2 +- .../administrative/teamer/_header.html.twig | 6 +- .../driver_license/modal_check.html.twig | 2 +- .../teamer/modal_info.html.twig | 10 +- templates/base.html.twig | 4 +- .../TwigBundle/Exception/error.html.twig | 2 +- .../TwigBundle/Exception/error404.html.twig | 2 +- .../common/modal_application_filter.html.twig | 4 +- ...plication_form_submission_filter.html.twig | 4 +- .../common/modal_assignment_filter.html.twig | 4 +- .../modal_availability_filter.html.twig | 4 +- .../common/modal_destination_filter.html.twig | 4 +- .../common/modal_document_filter.html.twig | 4 +- .../common/modal_feedback_filter.html.twig | 4 +- ...al_questionnaire_response_filter.html.twig | 4 +- .../modal_season_assignment_filter.html.twig | 4 +- .../common/modal_teamer_filter.html.twig | 4 +- .../common/modal_timeline_filter.html.twig | 4 +- .../common/modal_work_month_filter.html.twig | 4 +- templates/components/messagebox.html.twig | 5 +- templates/components/rating_stars.html.twig | 2 +- templates/forms.html.twig | 6 +- .../house_manager/feedback/index.html.twig | 2 +- .../questionnaire/_team.html.twig | 2 +- templates/htmx_confirmation_modal.html.twig | 4 +- templates/layout.html.twig | 83 +++-- templates/maintenance/index.html.twig | 2 +- templates/paginator/sliding.html.twig | 2 +- templates/paginator/sliding_boxes.html.twig | 2 +- templates/questionnaire/_form.html.twig | 4 +- templates/security/login.html.twig | 6 +- templates/security/password_reset.html.twig | 4 +- templates/teamer/application/create.html.twig | 2 +- templates/teamer/application/index.html.twig | 2 +- templates/teamer/assignment/detail.html.twig | 4 +- templates/teamer/assignment/index.html.twig | 12 +- templates/teamer/bookmark/index.html.twig | 4 +- .../teamer/check/driver_license.html.twig | 6 +- .../teamer/check/financial_data.html.twig | 4 +- .../teamer/check/meal_preference.html.twig | 4 +- .../teamer/check/personal_data.html.twig | 4 +- templates/teamer/disposition/_card.html.twig | 2 +- .../teamer/disposition/_season_card.html.twig | 2 +- templates/teamer/disposition/detail.html.twig | 6 +- .../modal_receipt_upload.html.twig | 2 +- .../profile/availability/index.html.twig | 2 +- .../availability/modal_create.html.twig | 2 +- templates/teamer/profile/index.html.twig | 8 +- .../profile/license/modal_add.html.twig | 2 +- .../profile/modal_delete_account.html.twig | 2 +- templates/teamer/profile/skills.html.twig | 4 +- .../teamer/questionnaire/detail.html.twig | 2 +- templates/teamer/season/index.html.twig | 2 +- .../teamer/season/modal_upload.html.twig | 2 +- .../teamer/work_month/modal_upload.html.twig | 2 +- 162 files changed, 768 insertions(+), 640 deletions(-) create mode 100644 assets/controllers/drawer_controller.js delete mode 100644 assets/controllers/mobilenav_controller.js delete mode 100644 assets/controllers/sidebar_menu_controller.js rename assets/fonts/{lato-v24-latin-italic.woff2 => lato-400-italic.woff2} (100%) rename assets/fonts/{lato-v24-latin-regular.woff2 => lato-400.woff2} (100%) rename assets/fonts/{lato-v24-latin-700.woff2 => lato-700.woff2} (100%) rename assets/fonts/{lato-v24-latin-900.woff2 => lato-900.woff2} (100%) delete mode 100644 assets/styles/components/button.css delete mode 100644 assets/styles/components/toast.css create mode 100644 assets/styles/ep-design.css create mode 100644 templates/_partials/_header.html.twig delete mode 100644 templates/_partials/_menu.html.twig create mode 100644 templates/_partials/_sidebar_menu.html.twig diff --git a/assets/controllers/drawer_controller.js b/assets/controllers/drawer_controller.js new file mode 100644 index 0000000..57cc9c2 --- /dev/null +++ b/assets/controllers/drawer_controller.js @@ -0,0 +1,35 @@ +import { Controller } from '@hotwired/stimulus' + +/* + * The sidebar as a drawer on small screens: a modal (target "dialog"), so focus stays inside + * and Escape closes it. A click on the dimmed page beside it closes it too, and so does widening the + * window until the sidebar shows (lg). + */ +export default class extends Controller { + static targets = ['dialog'] + + connect () { + this.wide = window.matchMedia('(min-width: 64rem)') + this.onWide = (event) => event.matches && this.close() + this.wide.addEventListener('change', this.onWide) + } + + disconnect () { + this.wide.removeEventListener('change', this.onWide) + } + + open () { + this.dialogTarget.showModal() + } + + close () { + this.dialogTarget.close() + } + + // a click on the dialog element itself, not on its content, is a click on the backdrop + closeOnBackdrop (event) { + if (event.target === this.dialogTarget) { + this.close() + } + } +} diff --git a/assets/controllers/mobilenav_controller.js b/assets/controllers/mobilenav_controller.js deleted file mode 100644 index 5100bfd..0000000 --- a/assets/controllers/mobilenav_controller.js +++ /dev/null @@ -1,16 +0,0 @@ -import { Controller } from '@hotwired/stimulus' - -export default class extends Controller { - static outlets = [ 'mobilenav' ] - static classes = [ 'closed' ] - - trigger({ params: { mode } }) { - this.mobilenavOutlet.toggle(mode) - } - - toggle(mode) { - // Add animation classes only now to avoid fouc - this.element.classList.add('transition-transform', 'duration-300') - this.element.classList.toggle(this.closedClass, 'close' === mode) - } -} \ No newline at end of file diff --git a/assets/controllers/sidebar_menu_controller.js b/assets/controllers/sidebar_menu_controller.js deleted file mode 100644 index bbc6087..0000000 --- a/assets/controllers/sidebar_menu_controller.js +++ /dev/null @@ -1,30 +0,0 @@ -import { Controller } from '@hotwired/stimulus' - -export default class extends Controller { - - static classes = ['closed', 'iconClosed', 'iconExpanded'] - static targets = ['submenu', 'button', 'icon'] - static values = { expanded: Boolean } - - toggleSubmenu() { - this.expandedValue = !this.expandedValue - } - - expandedValueChanged(expanded) { - this.submenuTarget.classList.toggle(this.closedClass, false === expanded) - if (false === this.hasButtonTarget) { - return - } - this.buttonTarget.setAttribute('aria-expanded', expanded) - if (false === this.hasIconTarget) { - return - } - if (true === expanded) { - this.iconTarget.classList.add(...this.iconExpandedClasses) - this.iconTarget.classList.remove(...this.iconClosedClasses) - } else { - this.iconTarget.classList.add(...this.iconClosedClasses) - this.iconTarget.classList.remove(...this.iconExpandedClasses) - } - } -} \ No newline at end of file diff --git a/assets/fonts/lato-v24-latin-italic.woff2 b/assets/fonts/lato-400-italic.woff2 similarity index 100% rename from assets/fonts/lato-v24-latin-italic.woff2 rename to assets/fonts/lato-400-italic.woff2 diff --git a/assets/fonts/lato-v24-latin-regular.woff2 b/assets/fonts/lato-400.woff2 similarity index 100% rename from assets/fonts/lato-v24-latin-regular.woff2 rename to assets/fonts/lato-400.woff2 diff --git a/assets/fonts/lato-v24-latin-700.woff2 b/assets/fonts/lato-700.woff2 similarity index 100% rename from assets/fonts/lato-v24-latin-700.woff2 rename to assets/fonts/lato-700.woff2 diff --git a/assets/fonts/lato-v24-latin-900.woff2 b/assets/fonts/lato-900.woff2 similarity index 100% rename from assets/fonts/lato-v24-latin-900.woff2 rename to assets/fonts/lato-900.woff2 diff --git a/assets/styles/_base.css b/assets/styles/_base.css index 878768c..2f27eac 100644 --- a/assets/styles/_base.css +++ b/assets/styles/_base.css @@ -1,36 +1,3 @@ -/* lato-regular - latin */ -@font-face { - font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ - font-family: 'Lato'; - font-style: normal; - font-weight: 400; - src: url('../fonts/lato-v24-latin-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ -} -/* lato-italic - latin */ -@font-face { - font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ - font-family: 'Lato'; - font-style: italic; - font-weight: 400; - src: url('../fonts/lato-v24-latin-italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ -} -/* lato-700 - latin */ -@font-face { - font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ - font-family: 'Lato'; - font-style: normal; - font-weight: 700; - src: url('../fonts/lato-v24-latin-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ -} -/* lato-900 - latin */ -@font-face { - font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ - font-family: 'Lato'; - font-style: normal; - font-weight: 900; - src: url('../fonts/lato-v24-latin-900.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ -} - .htmx-indicator{ @apply invisible; } diff --git a/assets/styles/_components.css b/assets/styles/_components.css index 40e7270..f5f842e 100644 --- a/assets/styles/_components.css +++ b/assets/styles/_components.css @@ -1,43 +1,9 @@ @import "./components/badge.css"; @import "./components/autocomplete.css"; -@import "./components/button.css"; @import "./components/datatable.css"; @import "./components/datepicker.css"; -@import "./components/toast.css"; @import "./components/tooltip.css"; @import "./components/timeline.css"; @import "./components/mail-body.css"; @import "./components/questionnaire.css"; -/* the entries of the header's account menu (_partials/_user_menu.html.twig) */ -.user-menu-item { - @apply flex items-center gap-x-3 px-4 py-2 text-ink no-underline hover:bg-page hover:text-brand; -} - -/* white box on the light blue page, as the card of the apps portal (EP/apps frontend/components/ui.ts) */ -.card { - @apply border border-line bg-white; -} - -/* heading of a section or card */ -.section-title { - @apply text-base font-semibold uppercase tracking-wide text-brand; -} - -/* - * A row of tabs (_partials/_tabs.html.twig, the questionnaire list). The row scrolls sideways on - * narrow screens, which makes it a vertical scroll container too, so nothing may stick out below - * it: the base line is an inset shadow the tabs' underline paints over, not a border they would - * have to overlap with a negative margin. - */ -.tabs { - @apply flex overflow-x-auto shadow-[inset_0_-1px_0_var(--color-line)]; -} - -.tab { - @apply shrink-0 whitespace-nowrap border-b-4 border-transparent px-3 py-2 text-sm text-ink hover:text-brand; -} - -.tab--current { - @apply border-brand-bright font-bold text-brand; -} diff --git a/assets/styles/app.css b/assets/styles/app.css index 615bca7..199b12f 100644 --- a/assets/styles/app.css +++ b/assets/styles/app.css @@ -1,4 +1,6 @@ @import "tailwindcss"; +@import "toastify-js/src/toastify.css"; +@import "./ep-design.css"; @import "./_base.css" layer(base); @import "./_components.css" layer(components); @@ -6,66 +8,6 @@ @source inline("rotate-90"); -/* - * Corporate design of the internal E&P tools, as defined by the apps portal (Gitea EP/apps, - * frontend/app/globals.css) and ported to Symfony by epbms: Lato, deep blue as the brand colour, - * magenta only for the main action, square shapes, light blue page. - * Status colours (green, red, amber) always come with text, never alone. - */ -@theme { - --font-sans: Lato, sans-serif; - --font-weight-semibold: 700; - --font-weight-bold: 900; - - /* square everywhere; rounded-full stays round. Plain `rounded` reads --radius. */ - --radius: 0px; - --radius-xs: 0px; - --radius-sm: 0px; - --radius-md: 0px; - --radius-lg: 0px; - --radius-xl: 0px; - --radius-2xl: 0px; - --radius-3xl: 0px; - --radius-4xl: 0px; - - --color-brand: #18527b; /* E&P deep blue, 8.5:1 on white */ - --color-brand-dark: #103c5b; - --color-brand-mid: #165883; - --color-brand-bright: #009fff; /* underlines and focus, never text */ - --color-brand-light: #e3eef8; - - --color-page: #ebf3fa; /* page background */ - --color-line: #d8e3ed; /* borders */ - --color-ink: #27272a; /* text */ - --color-muted: #52525b; /* secondary text, 7.7:1 on white */ - - --color-accent: #c4097c; /* magenta of the main action */ - --color-accent-from: #960167; - --color-accent-to: #fa1a8c; - - /* the colour name the templates were written with, now on the brand colour */ - --color-primary: var(--color-brand); -} - -/* - * Tailwind 3 defaults that Tailwind 4 changed: borders were gray-200 instead of currentColor, - * and buttons had a pointer cursor. - */ -@layer base { - *, - ::after, - ::before, - ::backdrop, - ::file-selector-button { - border-color: var(--color-line, currentcolor); - } - - button:not(:disabled), - [role="button"]:not(:disabled) { - cursor: pointer; - } -} - /* * Thin scrollbars without a track for inner scrolling areas. The page scrollbar takes its * style from , which body * leaves out. Firefox and Chrome/Edge 121+ honour these; @@ -76,10 +18,4 @@ scrollbar-width: thin; scrollbar-color: var(--color-gray-300) transparent; } - - /* visible keyboard focus everywhere (WCAG 2.4.7) */ - :where(a, button, input, select, textarea, summary, [tabindex]):focus-visible { - outline: 3px solid var(--color-brand-bright); - outline-offset: 2px; - } } diff --git a/assets/styles/components/button.css b/assets/styles/components/button.css deleted file mode 100644 index cb3e705..0000000 --- a/assets/styles/components/button.css +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Buttons as in the apps portal (EP/apps frontend/components/ui.ts): square, small bold uppercase. - * The default is filled brand blue; magenta (.btn--cta) only for the one main action of a page. - */ -.btn { - @apply inline-flex space-x-1 justify-center items-center text-xs uppercase tracking-wide font-semibold py-2.5 px-4 no-underline transition-colors; - @apply bg-brand text-white hover:bg-brand-dark disabled:opacity-50 disabled:cursor-not-allowed; -} - -.btn--small { - @apply py-1 px-2; -} - -.btn--secondary { - @apply border border-brand bg-white text-brand hover:bg-brand hover:text-white; -} - -.btn--cta { - background-image: linear-gradient(120deg, var(--color-accent-from), #9e036a 40%, var(--color-accent-to)); -} - -.btn--cta:hover { - background-image: linear-gradient(120deg, #7d0156, #8a035d 40%, #e3107c); -} - -.btn--cta:disabled { - background-image: none; -} diff --git a/assets/styles/components/toast.css b/assets/styles/components/toast.css deleted file mode 100644 index 75e862f..0000000 --- a/assets/styles/components/toast.css +++ /dev/null @@ -1,23 +0,0 @@ -@import "toastify-js/src/toastify.css"; - -.toastify { - @apply max-w-sm border-l-4 px-4 py-3 text-sm shadow-lg; - background: none; -} - -/* in the colours of the alerts, as in epbms */ -.toastify--success { - @apply border-emerald-700 bg-emerald-50 text-emerald-950; -} - -.toastify--warning { - @apply border-red-700 bg-red-50 text-red-950; -} - -.toastify--info { - @apply border-brand bg-brand-light text-ink; -} - -.toastify .toast-close { - @apply ml-3 text-current opacity-60 hover:opacity-100; -} diff --git a/assets/styles/components/tooltip.css b/assets/styles/components/tooltip.css index 0ac76a4..43ad059 100644 --- a/assets/styles/components/tooltip.css +++ b/assets/styles/components/tooltip.css @@ -1,18 +1,18 @@ @import "tippy.js/dist/tippy.css"; .tippy-box { - background-color: var(--color-primary); + background-color: var(--color-brand); } .tippy-box[data-placement^='top'] > .tippy-arrow::before { - border-top-color: var(--color-primary); + border-top-color: var(--color-brand); } .tippy-box[data-placement^='bottom'] > .tippy-arrow::before { - border-bottom-color: var(--color-primary); + border-bottom-color: var(--color-brand); } .tippy-box[data-placement^='left'] > .tippy-arrow::before { - border-left-color: var(--color-primary); + border-left-color: var(--color-brand); } .tippy-box[data-placement^='right'] > .tippy-arrow::before { - border-right-color: var(--color-primary); + border-right-color: var(--color-brand); } diff --git a/assets/styles/ep-design.css b/assets/styles/ep-design.css new file mode 100644 index 0000000..1c8b3a8 --- /dev/null +++ b/assets/styles/ep-design.css @@ -0,0 +1,316 @@ +/* + * E&P corporate design for the internal Symfony tools, taken from the E&P apps template (Gitea EP/apps, + * frontend/app/globals.css, frontend/components/): Lato, deep blue as the brand colour, magenta only + * for the one main action of a page, square shapes, light blue page. + * Status colours (green, red, amber) always come with text, never alone. + * + * Import after Tailwind: @import "tailwindcss"; @import "./ep-design.css"; @plugin "@tailwindcss/forms"; + * The toast styles expect toastify-js (@import "toastify-js/src/toastify.css" before this file). + */ + +/* + * Lato (OFL) ships with the app, so browsers load nothing from Google: 400 (and italic), 700, 900. No 600: + * font-semibold renders as 700, like font-bold; font-black is 900. The weights are not remapped. + */ +@font-face { + font-family: "Lato"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url("../fonts/lato-400.woff2") format("woff2"); +} + +@font-face { + font-family: "Lato"; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url("../fonts/lato-400-italic.woff2") format("woff2"); +} + +@font-face { + font-family: "Lato"; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url("../fonts/lato-700.woff2") format("woff2"); +} + +@font-face { + font-family: "Lato"; + font-style: normal; + font-weight: 900; + font-display: swap; + src: url("../fonts/lato-900.woff2") format("woff2"); +} + +@theme { + --font-sans: "Lato", ui-sans-serif, system-ui, sans-serif; + + /* square everywhere; rounded-full stays round. Plain `rounded` reads --radius. */ + --radius: 0px; + --radius-xs: 0px; + --radius-sm: 0px; + --radius-md: 0px; + --radius-lg: 0px; + --radius-xl: 0px; + --radius-2xl: 0px; + --radius-3xl: 0px; + --radius-4xl: 0px; + + --color-brand: #18527b; /* E&P deep blue, 8.5:1 on white */ + --color-brand-dark: #103c5b; + --color-brand-mid: #165883; + --color-brand-bright: #009fff; /* underlines and focus, never text */ + --color-brand-light: #e3eef8; + + --color-page: #ebf3fa; /* page background */ + --color-line: #d8e3ed; /* borders */ + --color-ink: #27272a; /* text */ + --color-muted: #52525b; /* secondary text, 7.7:1 on white */ + + --color-accent: #c4097c; /* magenta of the main action */ + --color-accent-from: #960167; + --color-accent-to: #fa1a8c; +} + +/* + * Tailwind 3 defaults that Tailwind 4 changed: borders were a light gray instead of currentColor, + * and buttons had a pointer cursor. + */ +@layer base { + *, + ::after, + ::before, + ::backdrop, + ::file-selector-button { + border-color: var(--color-line, currentcolor); + } + + button:not(:disabled), + [role="button"]:not(:disabled) { + cursor: pointer; + } + + /* modals: centred (Preflight resets the browser's margin: auto), the page behind dimmed and blurred */ + dialog:modal { + margin: auto; + max-height: 85vh; + } + + dialog::backdrop { + background: rgb(39 39 42 / 0.35); + backdrop-filter: blur(3px); + } + + /* visible keyboard focus everywhere (WCAG 2.4.7) */ + :where(a, button, input, select, textarea, summary, [tabindex]):focus-visible { + outline: 3px solid var(--color-brand-bright); + outline-offset: 2px; + } +} + +/* + * Components as in the apps template (frontend/components/ui.ts, Field.tsx, Alert.tsx). Magenta + * only for the one main action of a page. + */ +@layer components { + .btn, + .btn-primary, + .btn-secondary { + @apply inline-flex items-center justify-center gap-2 px-4 py-2.5 text-xs font-bold uppercase tracking-wide no-underline transition-colors disabled:cursor-not-allowed; + } + + .btn-primary { + @apply text-white; + background-image: linear-gradient(120deg, var(--color-accent-from), #9e036a 40%, var(--color-accent-to)); + } + + .btn-primary:hover { + background-image: linear-gradient(120deg, #7d0156, #8a035d 40%, #e3107c); + } + + .btn-primary:disabled { + background-image: none; + background-color: #64748b; + } + + .btn-secondary { + @apply border border-brand bg-white text-brand hover:bg-brand hover:text-white; + } + + /* small actions in toolbars and on cards, next to the one main action */ + .btn-tool { + @apply inline-flex items-center gap-1 rounded border border-line bg-white px-2 py-1 text-sm text-ink hover:border-brand hover:text-brand disabled:cursor-default disabled:border-line disabled:text-gray-400; + } + + /* the "⋯" behind which the actions of a card or row wait (menu_controller.js) */ + .btn-more { + @apply inline-flex h-6 w-6 shrink-0 items-center justify-center rounded text-muted hover:bg-page hover:text-brand aria-expanded:bg-page aria-expanded:text-brand; + } + + .menu-panel { + @apply fixed z-40 min-w-48 border border-line bg-white py-1 text-sm shadow-lg; + } + + .menu-item { + @apply block w-full px-3 py-1.5 text-left text-ink no-underline hover:bg-page hover:text-brand focus:bg-page; + } + + .menu-item-danger { + @apply block w-full px-3 py-1.5 text-left text-red-800 hover:bg-page hover:text-red-900 focus:bg-page; + } + + .input { + @apply block w-full border border-slate-500 bg-white px-3 py-2 text-sm text-slate-900 placeholder:text-slate-500 focus:border-brand-bright aria-[invalid=true]:border-red-700 aria-[invalid=true]:ring-1 aria-[invalid=true]:ring-red-700 disabled:bg-slate-100 disabled:text-slate-600; + } + + .field-label { + @apply block text-xs font-bold uppercase tracking-wide text-slate-700; + } + + /* white box on the light blue page */ + .card { + @apply border border-line bg-white; + } + + .section-title { + @apply text-base font-bold uppercase tracking-wide text-brand; + } + + /* a row of tabs; the base line is an inset shadow, so a row that scrolls sideways doesn't scroll vertically too */ + .tabs { + @apply flex overflow-x-auto shadow-[inset_0_-1px_0_var(--color-line)]; + } + + .tab { + @apply shrink-0 whitespace-nowrap border-b-4 border-transparent px-3 py-2 text-sm text-ink no-underline hover:text-brand; + } + + .tab[aria-current], + .tab[aria-selected="true"] { + @apply border-brand-bright font-bold text-brand; + } + + /* the main views as tabs in the header (_partials/_header.html.twig), for apps with few views */ + .header-tab { + @apply flex items-center whitespace-nowrap border-b-4 border-transparent px-3 text-ink no-underline hover:text-brand; + } + + .header-tab[aria-current] { + @apply border-brand-bright font-bold text-brand; + } + + /* + * Sidebar navigation for apps with many views (_partials/_sidebar_menu.html.twig): on the light + * blue page, the current item is a white box. + */ + .sidebar-heading { + @apply px-2 pt-5 pb-1 text-[11px] font-bold uppercase tracking-wide text-muted; + } + + .sidebar-link { + @apply flex w-full items-center gap-x-3 p-2 text-left text-sm leading-6 font-bold text-ink no-underline hover:bg-white/60 hover:text-brand; + } + + .sidebar-sublink { + @apply block py-2 pr-2 pl-10 text-sm leading-6 text-ink no-underline hover:bg-white/60 hover:text-brand; + } + + :is(.sidebar-link, .sidebar-sublink)[aria-current], + .sidebar-link--ancestor { + @apply bg-white text-brand; + } + + .sidebar-group > summary { + @apply list-none; + } + + .sidebar-group > summary::-webkit-details-marker { + display: none; + } + + /* chevron of a group that opens in place */ + .sidebar-group > summary::after { + @apply ml-auto size-2 shrink-0 rotate-45 border-r-2 border-b-2 border-current opacity-60 transition-transform content-['']; + } + + .sidebar-group[open] > summary::after { + @apply -rotate-135; + } + + /* the sidebar as a drawer from the left on small screens (drawer_controller.js) */ + dialog.drawer { + @apply m-0 h-dvh max-h-none w-80 max-w-[calc(100vw-4rem)] bg-page p-0; + } + + /* lists in a card: the outer cells line up with the card's padding */ + .data-table { + @apply w-full; + } + + .data-table thead tr { + @apply border-b-2 border-brand text-left text-[11px] font-bold uppercase tracking-wide text-brand; + } + + .data-table th { + @apply px-2 py-2; + } + + .data-table td { + @apply px-2 py-1.5; + } + + .data-table :is(th, td):first-child { + @apply pl-5; + } + + .data-table :is(th, td):last-child { + @apply pr-5; + } + + .data-table tbody tr { + @apply border-b last:border-b-0; + } + + /* notices (_partials/_alert.html.twig): light, with a coloured bar on the left */ + .notice { + @apply border-l-4 px-4 py-2; + } + + /* toasts (toast_controller.js) in the colours of the notices */ + .toastify { + @apply max-w-sm rounded-none border-l-4 bg-none px-4 py-3 text-sm shadow-lg; + } + + .toastify--success { + @apply border-emerald-700 bg-emerald-50 text-emerald-950; + } + + .toastify--error { + @apply border-red-700 bg-red-50 text-red-950; + } + + .toastify--warning { + @apply border-amber-600 bg-amber-50 text-amber-950; + } + + .toastify--info { + @apply border-brand bg-brand-light text-ink; + } + + .toastify .toast-close { + @apply ml-3 text-current opacity-60 hover:opacity-100; + } +} + +@media (prefers-reduced-motion: reduce) { + *, + *::before, + *::after { + animation-duration: 0.01ms !important; + animation-iteration-count: 1 !important; + transition-duration: 0.01ms !important; + scroll-behavior: auto !important; + } +} diff --git a/config/packages/knp_menu.yaml b/config/packages/knp_menu.yaml index 6ecd9e5..2125e64 100644 --- a/config/packages/knp_menu.yaml +++ b/config/packages/knp_menu.yaml @@ -1,3 +1,3 @@ knp_menu: twig: - template: _partials/_menu.html.twig + template: _partials/_sidebar_menu.html.twig diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index a31888d..50bb6c3 100644 --- a/config/packages/twig.yaml +++ b/config/packages/twig.yaml @@ -1,6 +1,8 @@ twig: default_path: '%kernel.project_dir%/templates' form_themes: ['forms.html.twig'] + globals: + app_name: Team paths: '%kernel.project_dir%/assets/images': images diff --git a/src/Menu/AdminMenuBuilder.php b/src/Menu/AdminMenuBuilder.php index de7f713..86b1b40 100644 --- a/src/Menu/AdminMenuBuilder.php +++ b/src/Menu/AdminMenuBuilder.php @@ -166,7 +166,7 @@ class AdminMenuBuilder extends AbstractMenuBuilder ], ]); - $this->addHeading($menu, 'Feedback & Auswertung'); + $this->addHeading($menu, 'Feedback & Auswertung'); $menu->addChild('Teamer:innen-Feedback', [ 'route' => 'app_administrative_feedback_index', @@ -257,14 +257,14 @@ class AdminMenuBuilder extends AbstractMenuBuilder { $menu = $this->createRootElement(); - $menu->addChild('Stammdaten & Foto', [ + $menu->addChild('Stammdaten & Foto', [ 'route' => 'app_administrative_teamer_profile', 'routeParameters' => $this->getDefaultRouteParameters('uuid'), 'linkAttributes' => [ 'title' => 'Stammdaten & Foto', ], ]); - $menu->addChild('Jobprofile, Skills & Status', [ + $menu->addChild('Jobprofile, Skills & Status', [ 'route' => 'app_admin_teamer_skills', 'routeParameters' => $this->getDefaultRouteParameters('uuid'), 'linkAttributes' => [ diff --git a/src/Menu/ManagerMenuBuilder.php b/src/Menu/ManagerMenuBuilder.php index 5b24fa1..df8619d 100644 --- a/src/Menu/ManagerMenuBuilder.php +++ b/src/Menu/ManagerMenuBuilder.php @@ -117,7 +117,7 @@ class ManagerMenuBuilder extends AbstractMenuBuilder ], ]); - $this->addHeading($menu, 'Feedback & Auswertung'); + $this->addHeading($menu, 'Feedback & Auswertung'); $menu->addChild('Teamer:innen-Feedback', [ 'route' => 'app_administrative_feedback_index', @@ -198,7 +198,7 @@ class ManagerMenuBuilder extends AbstractMenuBuilder { $menu = $this->createRootElement(); - $menu->addChild('Stammdaten & Foto', [ + $menu->addChild('Stammdaten & Foto', [ 'route' => 'app_administrative_teamer_profile', 'routeParameters' => $this->getDefaultRouteParameters('uuid'), 'linkAttributes' => [ diff --git a/src/Menu/TeamerMenuBuilder.php b/src/Menu/TeamerMenuBuilder.php index f472cd1..c5da5ad 100644 --- a/src/Menu/TeamerMenuBuilder.php +++ b/src/Menu/TeamerMenuBuilder.php @@ -70,13 +70,13 @@ class TeamerMenuBuilder extends AbstractMenuBuilder ]); } - $profileMenu->addChild('Stammdaten & Foto', [ + $profileMenu->addChild('Stammdaten & Foto', [ 'route' => 'app_teamer_profile_index', 'linkAttributes' => [ 'title' => 'Stammdaten & Foto', ], ]); - $profileMenu->addChild('Jobprofile & Skills', [ + $profileMenu->addChild('Jobprofile & Skills', [ 'route' => 'app_teamer_profile_skills', 'linkAttributes' => [ 'title' => 'Jobprofile & Skills', @@ -152,7 +152,7 @@ class TeamerMenuBuilder extends AbstractMenuBuilder ], ]); - $infoMenu = $menu->addChild('FAQ & Kontakt', [ + $infoMenu = $menu->addChild('FAQ & Kontakt', [ 'extras' => [ 'icon' => 'info', ], diff --git a/templates/_partials/_alert.html.twig b/templates/_partials/_alert.html.twig index 5652d2b..22595d5 100644 --- a/templates/_partials/_alert.html.twig +++ b/templates/_partials/_alert.html.twig @@ -1,11 +1,16 @@ -{% set type = type|default('info') %} - -{# light with a coloured left bar, as the notices of the apps portal (EP/apps Alert.tsx) #} -
- {{ icon(type == 'success' ? 'check' : 'alert', 'w-5 h-5 shrink-0') }} -
- {% block message %} - {{ message | nl2br }} - {% endblock %} -
+{# + A notice in the style of the apps template's Alert.tsx (ep-corporate-design): `type` is success, + error, warning or info, `message` the text; `embed` it and fill the `message` block for markup. + Errors are announced at once (role="alert"), the others politely. +#} +{% set styles = { + success: ['border-emerald-700 bg-emerald-50 text-emerald-950', 'Erledigt'], + error: ['border-red-700 bg-red-50 text-red-950', 'Fehler'], + warning: ['border-amber-600 bg-amber-50 text-amber-950', 'Achtung'], + info: ['border-brand bg-brand-light text-ink', 'Hinweis'], +} %} +{% set style = styles[type ?? 'info'] %} +
+ {{ style[1] }}: + {%- block message %}{{ message|nl2br }}{% endblock -%}
diff --git a/templates/_partials/_brand.html.twig b/templates/_partials/_brand.html.twig index 58d5cd5..55b3cf0 100644 --- a/templates/_partials/_brand.html.twig +++ b/templates/_partials/_brand.html.twig @@ -1,5 +1,5 @@ {# The E&P logo with the app name beside it, as in the header of the apps portal (EP/apps) and epbms. #} E&P Reisen & Events - Team + {{ app_name }} diff --git a/templates/_partials/_flashes.html.twig b/templates/_partials/_flashes.html.twig index ed4261b..4604b29 100644 --- a/templates/_partials/_flashes.html.twig +++ b/templates/_partials/_flashes.html.twig @@ -1,5 +1,5 @@ {% if app.session.flashBag.peek('error')|length > 0 %} - {% include '_partials/_toast.html.twig' with { level: 'warning', messages: app.flashes('error') } %} + {% include '_partials/_toast.html.twig' with { level: 'error', messages: app.flashes('error') } %} {% endif %} {% if app.session.flashBag.peek('success')|length > 0 %} {% include '_partials/_toast.html.twig' with { level: 'success', messages: app.flashes('success') } %} diff --git a/templates/_partials/_header.html.twig b/templates/_partials/_header.html.twig new file mode 100644 index 0000000..bda3d26 --- /dev/null +++ b/templates/_partials/_header.html.twig @@ -0,0 +1,23 @@ +{# + E&P header as in the apps template: logo, app name behind a thin line, a deep blue bar below. + Embed it and fill its blocks: + - `header_nav`: the main views as `.header-tab` links, for apps with few views (layout_tabs) + - `header_end`: season, user menu, help link and, in the sidebar layout, the menu button + `app_name` and `home_path` come from the embedding template; `header_width` lines the header up with + a centred content column (layout_sidebar), without it the header runs full width (layout_tabs). +#} +
+
+
+ + E&P Reisen & Events + {{ app_name }} + + {% block header_nav %}{% endblock %} +
+ {% block header_end %}{% endblock %} +
+
+
+ +
diff --git a/templates/_partials/_menu.html.twig b/templates/_partials/_menu.html.twig deleted file mode 100644 index 934c618..0000000 --- a/templates/_partials/_menu.html.twig +++ /dev/null @@ -1,86 +0,0 @@ -{% extends 'knp_menu.html.twig' %} - -{% block list %} - {% if item.hasChildren and options.depth is not same as(0) and item.displayChildren %} - {% if item.level == 0 %} -
- -
- {% else %} -
    - {{ block('children') }} -
- {% endif %} - {% endif %} -{% endblock %} - -{% block item %} - {% if item.displayed and item.extras.heading is defined %} - {# the heading of a group of items, see AbstractMenuBuilder::addHeading() #} -
  • {{ item.label|raw }}
  • - {% elseif item.displayed %} -
  • - {%- if item.hasChildren and item.displayChildren %} -
    - {%- endif %} - {%- if item.uri is not empty %} - {{ block('linkElement') }} - {%- else %} - {{ block('spanElement') }} - {%- endif %} - {{ block('list') }} - {%- if item.hasChildren and item.displayChildren %} -
    - {%- endif %} -
  • - {% endif %} -{% endblock %} - -{% block linkElement %} - {% import _self as knp_menu %} - - {{ block('label') }} - -{% endblock %} - -{% block spanElement %} - {% import _self as knp_menu %} - {% if item.hasChildren %} - - {% elseif item.extras.divider is defined %} -
    - {% else %} -
    - {{ block('label') }} -
    - {% endif %} -{% endblock %} - -{% block label -%} - {% if item.extras.icon is defined -%} - {{ icon(item.extras.icon, 'h-5 w-5 shrink-0 ' ~ ((matcher.isCurrent(item) or matcher.isAncestor(item)) ? 'text-brand' : 'text-muted')) -}} - {{ item.label|raw }} - {%- else -%} - {{ item.label|raw }} - {%- endif %} -{%- endblock %} - diff --git a/templates/_partials/_receipts.html.twig b/templates/_partials/_receipts.html.twig index 35f9f06..40e6d28 100644 --- a/templates/_partials/_receipts.html.twig +++ b/templates/_partials/_receipts.html.twig @@ -37,7 +37,7 @@ {% endfor %}
    diff --git a/templates/admin/application/index.html.twig b/templates/admin/application/index.html.twig index bb680c8..f024c4b 100644 --- a/templates/admin/application/index.html.twig +++ b/templates/admin/application/index.html.twig @@ -9,7 +9,7 @@
    -
    diff --git a/templates/admin/application/modal_status.html.twig b/templates/admin/application/modal_status.html.twig index 5726c69..b551b1d 100644 --- a/templates/admin/application/modal_status.html.twig +++ b/templates/admin/application/modal_status.html.twig @@ -9,7 +9,7 @@ {{ form_row(form.comment) }} {{ form_row(form.commentVisible) }} - {{ form_rest(form) }} diff --git a/templates/admin/application_form_submission/detail.html.twig b/templates/admin/application_form_submission/detail.html.twig index 8f26dd0..5c147ee 100644 --- a/templates/admin/application_form_submission/detail.html.twig +++ b/templates/admin/application_form_submission/detail.html.twig @@ -62,14 +62,14 @@ {% if submission.email %}
    - {{ form_widget(callsForm.save, { 'attr': { 'class': 'btn btn--small' } }) }} + {{ form_widget(callsForm.save, { 'attr': { 'class': 'btn-tool' } }) }} {{ form_rest(callsForm) }} {{ form_end(callsForm) }} @@ -109,12 +109,12 @@
    {% if submission.user and submission.user.teamer %} + class="btn-tool"> Teamer:innenprofil öffnen {% elseif submission.email %}
    - {{ form_rest(form) }} diff --git a/templates/admin/feedback/modal_approve.html.twig b/templates/admin/feedback/modal_approve.html.twig index d6f22ce..4feea09 100644 --- a/templates/admin/feedback/modal_approve.html.twig +++ b/templates/admin/feedback/modal_approve.html.twig @@ -8,7 +8,7 @@ {{ form_row(form.comment) }} {{ form_row(form.commentInternal) }} - {{ form_rest(form) }} diff --git a/templates/admin/feedback/provide.html.twig b/templates/admin/feedback/provide.html.twig index 5de51a2..ce376b7 100644 --- a/templates/admin/feedback/provide.html.twig +++ b/templates/admin/feedback/provide.html.twig @@ -44,7 +44,7 @@ {% endif %} {% endblock %} - {{ form_rest(form) }} diff --git a/templates/admin/system/availability/_form.html.twig b/templates/admin/system/availability/_form.html.twig index f30c56d..9700c81 100644 --- a/templates/admin/system/availability/_form.html.twig +++ b/templates/admin/system/availability/_form.html.twig @@ -4,7 +4,7 @@ {{ form_row(form.dateTo) }} {{ form_row(form.description) }} - {{ form_rest(form) }} diff --git a/templates/admin/system/availability/index.html.twig b/templates/admin/system/availability/index.html.twig index 9f98b91..9be56ef 100644 --- a/templates/admin/system/availability/index.html.twig +++ b/templates/admin/system/availability/index.html.twig @@ -75,7 +75,7 @@ {{ form_rest(form) }} diff --git a/templates/admin/system/contact/index.html.twig b/templates/admin/system/contact/index.html.twig index 9d6431f..b3515e5 100644 --- a/templates/admin/system/contact/index.html.twig +++ b/templates/admin/system/contact/index.html.twig @@ -67,7 +67,7 @@ - + Abbrechen {% if emailText.id is not null %} {{ form_rest(form) }} diff --git a/templates/admin/system/fee/index.html.twig b/templates/admin/system/fee/index.html.twig index 5a59157..23a3a79 100644 --- a/templates/admin/system/fee/index.html.twig +++ b/templates/admin/system/fee/index.html.twig @@ -74,7 +74,7 @@ - + Abbrechen diff --git a/templates/admin/system/feedback_set/index.html.twig b/templates/admin/system/feedback_set/index.html.twig index 7e1aa01..0d97df2 100644 --- a/templates/admin/system/feedback_set/index.html.twig +++ b/templates/admin/system/feedback_set/index.html.twig @@ -57,7 +57,7 @@ - + Neu {% endblock %} \ No newline at end of file diff --git a/templates/admin/system/job_profile/_form.html.twig b/templates/admin/system/job_profile/_form.html.twig index 4010af9..8ed8560 100644 --- a/templates/admin/system/job_profile/_form.html.twig +++ b/templates/admin/system/job_profile/_form.html.twig @@ -8,10 +8,10 @@ {{ form_row(form.costUnit) }}
    - - + Abbrechen
    diff --git a/templates/admin/system/job_profile/index.html.twig b/templates/admin/system/job_profile/index.html.twig index 0782a4d..f998415 100644 --- a/templates/admin/system/job_profile/index.html.twig +++ b/templates/admin/system/job_profile/index.html.twig @@ -88,7 +88,7 @@ - + Neu {% endblock %} diff --git a/templates/admin/system/training/_form.html.twig b/templates/admin/system/training/_form.html.twig index cddac5f..c225076 100644 --- a/templates/admin/system/training/_form.html.twig +++ b/templates/admin/system/training/_form.html.twig @@ -2,7 +2,7 @@
    {{ form_row(form.name) }}
    - {{ form_rest(form) }} diff --git a/templates/admin/system/training/index.html.twig b/templates/admin/system/training/index.html.twig index 44c7efa..47618a3 100644 --- a/templates/admin/system/training/index.html.twig +++ b/templates/admin/system/training/index.html.twig @@ -61,7 +61,7 @@ - + Abbrechen diff --git a/templates/admin/system/user/edit.html.twig b/templates/admin/system/user/edit.html.twig index 72507a6..8bcbaa2 100644 --- a/templates/admin/system/user/edit.html.twig +++ b/templates/admin/system/user/edit.html.twig @@ -71,7 +71,7 @@ {{ label }} {% endif %} - {% if hasDraft %} - + Entwurf verwerfen {% endif %} diff --git a/templates/admin/teamer/modal_disable_user.html.twig b/templates/admin/teamer/modal_disable_user.html.twig index 7b43483..1b8b575 100644 --- a/templates/admin/teamer/modal_disable_user.html.twig +++ b/templates/admin/teamer/modal_disable_user.html.twig @@ -11,7 +11,7 @@ {{ form_row(form.disabledReason) }} {{ form_row(form.disabledReasonInternal) }} - {{ form_rest(form) }} diff --git a/templates/admin/teamer/remarks_internal.html.twig b/templates/admin/teamer/remarks_internal.html.twig index 0fc1dc9..1e09f9c 100644 --- a/templates/admin/teamer/remarks_internal.html.twig +++ b/templates/admin/teamer/remarks_internal.html.twig @@ -12,7 +12,7 @@
    {{ form_row(form.remarks) }}
    - {{ form_rest(form) }} diff --git a/templates/admin/teamer/skills.html.twig b/templates/admin/teamer/skills.html.twig index 455bc2b..ee02848 100644 --- a/templates/admin/teamer/skills.html.twig +++ b/templates/admin/teamer/skills.html.twig @@ -23,7 +23,7 @@
    {{ form_row(form.allowOverlappingApplications) }}
    - {{ form_rest(form) }} diff --git a/templates/admin/teamer/training_attendance/modal_create.html.twig b/templates/admin/teamer/training_attendance/modal_create.html.twig index fff202d..299baaa 100644 --- a/templates/admin/teamer/training_attendance/modal_create.html.twig +++ b/templates/admin/teamer/training_attendance/modal_create.html.twig @@ -7,7 +7,7 @@
    {{ form_row(form.date) }}
    - {{ form_rest(form) }} diff --git a/templates/admin/work_month/index.html.twig b/templates/admin/work_month/index.html.twig index a2922c5..5225eaa 100644 --- a/templates/admin/work_month/index.html.twig +++ b/templates/admin/work_month/index.html.twig @@ -9,7 +9,7 @@ - {{ form_rest(form) }} diff --git a/templates/administrative/assignment/_form.html.twig b/templates/administrative/assignment/_form.html.twig index 4f94ab8..7c533cb 100644 --- a/templates/administrative/assignment/_form.html.twig +++ b/templates/administrative/assignment/_form.html.twig @@ -41,10 +41,10 @@ diff --git a/templates/administrative/assignment/detail.html.twig b/templates/administrative/assignment/detail.html.twig index 8977c64..4247912 100644 --- a/templates/administrative/assignment/detail.html.twig +++ b/templates/administrative/assignment/detail.html.twig @@ -27,7 +27,7 @@ {{ status[0] }} {% endif %} {% if is_granted('EDIT', assignment) %} - + {{ icon('edit', 'w-4 h-4 shrink-0') }} bearbeiten @@ -225,7 +225,7 @@ - + Neu {% if filterDto.active %} - + Reset {% endif %} @@ -93,7 +93,7 @@ name="assignments[]" value="{{ assignment.uuid }}" form="assignment-mailing-select" - class="h-4 w-4 rounded-sm text-primary border-gray-300 focus:ring-primary" + class="h-4 w-4 rounded-sm text-brand border-gray-300 focus:ring-brand" title="Für Mail auswählen" aria-label="Einsatz {{ assignment.id }} für Mail auswählen"> @@ -190,7 +190,7 @@ {% endif %} Vorschau Reiseleitungsfeedback @@ -293,7 +293,7 @@ - + Neu {% endblock %} diff --git a/templates/administrative/assignment/timeline.html.twig b/templates/administrative/assignment/timeline.html.twig index f67bc91..3da7e11 100644 --- a/templates/administrative/assignment/timeline.html.twig +++ b/templates/administrative/assignment/timeline.html.twig @@ -39,13 +39,13 @@
    - + Neu {% endblock %} diff --git a/templates/administrative/season_assignment/modal_document_upload.html.twig b/templates/administrative/season_assignment/modal_document_upload.html.twig index 081e77e..d5e6385 100644 --- a/templates/administrative/season_assignment/modal_document_upload.html.twig +++ b/templates/administrative/season_assignment/modal_document_upload.html.twig @@ -18,7 +18,7 @@ 'accepted_files': 'image/jpg,image/jpeg,application/pdf', } %} - {{ form_rest(form) }} diff --git a/templates/administrative/season_assignment/modal_task_deadline.html.twig b/templates/administrative/season_assignment/modal_task_deadline.html.twig index 4a15abc..1935115 100644 --- a/templates/administrative/season_assignment/modal_task_deadline.html.twig +++ b/templates/administrative/season_assignment/modal_task_deadline.html.twig @@ -12,7 +12,7 @@ {{ form_row(form.deadlineOverride2) }} {{ form_row(form.applyToAll) }} - {{ form_rest(form) }} diff --git a/templates/administrative/statistics/applications_by_destination.html.twig b/templates/administrative/statistics/applications_by_destination.html.twig index 87cc9fe..9265883 100644 --- a/templates/administrative/statistics/applications_by_destination.html.twig +++ b/templates/administrative/statistics/applications_by_destination.html.twig @@ -18,8 +18,8 @@ {{ form_row(form.dateTo) }}
    - {{ form_widget(form.apply, { attr: { class: 'btn btn--small' } }) }} - {{ form_widget(form.reset, { attr: { class: 'btn btn--small btn--secondary' } }) }} + {{ form_widget(form.apply, { attr: { class: 'btn-tool' } }) }} + {{ form_widget(form.reset, { attr: { class: 'btn-tool' } }) }}
    {{ form_end(form) }} diff --git a/templates/administrative/statistics/feedback_by_destination.html.twig b/templates/administrative/statistics/feedback_by_destination.html.twig index 92d5e94..17f71e5 100644 --- a/templates/administrative/statistics/feedback_by_destination.html.twig +++ b/templates/administrative/statistics/feedback_by_destination.html.twig @@ -18,8 +18,8 @@ {{ form_row(form.dateTo) }}
    - {{ form_widget(form.apply, { attr: { class: 'btn btn--small' } }) }} - {{ form_widget(form.reset, { attr: { class: 'btn btn--small btn--secondary' } }) }} + {{ form_widget(form.apply, { attr: { class: 'btn-tool' } }) }} + {{ form_widget(form.reset, { attr: { class: 'btn-tool' } }) }}
    {{ form_end(form) }} diff --git a/templates/administrative/statistics/feedback_ratings.html.twig b/templates/administrative/statistics/feedback_ratings.html.twig index 25c271c..60fdd88 100644 --- a/templates/administrative/statistics/feedback_ratings.html.twig +++ b/templates/administrative/statistics/feedback_ratings.html.twig @@ -18,8 +18,8 @@ {{ form_row(form.dateTo) }}
    - {{ form_widget(form.apply, { attr: { class: 'btn btn--small' } }) }} - {{ form_widget(form.reset, { attr: { class: 'btn btn--small btn--secondary' } }) }} + {{ form_widget(form.apply, { attr: { class: 'btn-tool' } }) }} + {{ form_widget(form.reset, { attr: { class: 'btn-tool' } }) }}
    {{ form_end(form) }} diff --git a/templates/administrative/statistics/feedback_ratings_by_destination.html.twig b/templates/administrative/statistics/feedback_ratings_by_destination.html.twig index 01b5d22..74eebd2 100644 --- a/templates/administrative/statistics/feedback_ratings_by_destination.html.twig +++ b/templates/administrative/statistics/feedback_ratings_by_destination.html.twig @@ -18,8 +18,8 @@ {{ form_row(form.dateTo) }}
    - {{ form_widget(form.apply, { attr: { class: 'btn btn--small' } }) }} - {{ form_widget(form.reset, { attr: { class: 'btn btn--small btn--secondary' } }) }} + {{ form_widget(form.apply, { attr: { class: 'btn-tool' } }) }} + {{ form_widget(form.reset, { attr: { class: 'btn-tool' } }) }}
    {{ form_end(form) }} diff --git a/templates/administrative/system/destination/_form.html.twig b/templates/administrative/system/destination/_form.html.twig index 80e3ea3..f2d4824 100644 --- a/templates/administrative/system/destination/_form.html.twig +++ b/templates/administrative/system/destination/_form.html.twig @@ -41,10 +41,10 @@
    - - + Abbrechen
    diff --git a/templates/administrative/system/destination/index.html.twig b/templates/administrative/system/destination/index.html.twig index e234423..3f7a05f 100644 --- a/templates/administrative/system/destination/index.html.twig +++ b/templates/administrative/system/destination/index.html.twig @@ -9,7 +9,7 @@
    - + Neu {% endblock %} \ No newline at end of file diff --git a/templates/administrative/system/document/index.html.twig b/templates/administrative/system/document/index.html.twig index c9b744c..6a74e70 100644 --- a/templates/administrative/system/document/index.html.twig +++ b/templates/administrative/system/document/index.html.twig @@ -102,7 +102,7 @@ {{ form_rest(form) }} diff --git a/templates/administrative/system/document/modal_replace.html.twig b/templates/administrative/system/document/modal_replace.html.twig index c185a9c..a33713d 100644 --- a/templates/administrative/system/document/modal_replace.html.twig +++ b/templates/administrative/system/document/modal_replace.html.twig @@ -13,7 +13,7 @@ 'accepted_files': 'application/pdf', } %} - {{ form_rest(form) }} diff --git a/templates/administrative/system/document/modal_upload.html.twig b/templates/administrative/system/document/modal_upload.html.twig index e192119..075285a 100644 --- a/templates/administrative/system/document/modal_upload.html.twig +++ b/templates/administrative/system/document/modal_upload.html.twig @@ -12,7 +12,7 @@ 'accepted_files': 'application/pdf', } %} - {{ form_rest(form) }} diff --git a/templates/administrative/system/faq/_form.html.twig b/templates/administrative/system/faq/_form.html.twig index 07bbb98..5df11b7 100644 --- a/templates/administrative/system/faq/_form.html.twig +++ b/templates/administrative/system/faq/_form.html.twig @@ -4,10 +4,10 @@ {{ form_row(form.answer) }}
    - - + Abbrechen
    diff --git a/templates/administrative/system/faq/index.html.twig b/templates/administrative/system/faq/index.html.twig index b2c1318..efb4439 100644 --- a/templates/administrative/system/faq/index.html.twig +++ b/templates/administrative/system/faq/index.html.twig @@ -59,7 +59,7 @@ - + Neu {% endblock %} \ No newline at end of file diff --git a/templates/administrative/system/mailing_template/_form.html.twig b/templates/administrative/system/mailing_template/_form.html.twig index ce60f73..c3ab50a 100644 --- a/templates/administrative/system/mailing_template/_form.html.twig +++ b/templates/administrative/system/mailing_template/_form.html.twig @@ -48,10 +48,10 @@
    - - + Abbrechen
    diff --git a/templates/administrative/system/mailing_template/index.html.twig b/templates/administrative/system/mailing_template/index.html.twig index e1c867f..1747c40 100644 --- a/templates/administrative/system/mailing_template/index.html.twig +++ b/templates/administrative/system/mailing_template/index.html.twig @@ -75,7 +75,7 @@ - + Neu {% endblock %} diff --git a/templates/administrative/system/news/form.html.twig b/templates/administrative/system/news/form.html.twig index d3d99bc..54562eb 100644 --- a/templates/administrative/system/news/form.html.twig +++ b/templates/administrative/system/news/form.html.twig @@ -3,7 +3,7 @@ {{ form_row(form.status) }} {{ form_row(form.message) }} - {{ form_rest(form) }} diff --git a/templates/administrative/system/news/index.html.twig b/templates/administrative/system/news/index.html.twig index ae75da2..3bf67f2 100644 --- a/templates/administrative/system/news/index.html.twig +++ b/templates/administrative/system/news/index.html.twig @@ -75,7 +75,7 @@ {{ form_rest(form) }} diff --git a/templates/administrative/system/season_task_document/modal_propagate.html.twig b/templates/administrative/system/season_task_document/modal_propagate.html.twig index 3ac859d..72dc924 100644 --- a/templates/administrative/system/season_task_document/modal_propagate.html.twig +++ b/templates/administrative/system/season_task_document/modal_propagate.html.twig @@ -23,7 +23,7 @@
    -
    diff --git a/templates/administrative/system/staffing_rule/_form.html.twig b/templates/administrative/system/staffing_rule/_form.html.twig index 402480a..ac451b3 100644 --- a/templates/administrative/system/staffing_rule/_form.html.twig +++ b/templates/administrative/system/staffing_rule/_form.html.twig @@ -9,7 +9,7 @@ {{ form_row(form.guiding) }} {{ form_row(form.enabled) }} - {{ form_rest(form) }} diff --git a/templates/administrative/system/staffing_rule/index.html.twig b/templates/administrative/system/staffing_rule/index.html.twig index 9467e14..2cc16ef 100644 --- a/templates/administrative/system/staffing_rule/index.html.twig +++ b/templates/administrative/system/staffing_rule/index.html.twig @@ -9,7 +9,7 @@

    Besetzungsmatrix

    - + Vorschau @@ -80,7 +80,7 @@ {{ form_rest(form) }} diff --git a/templates/administrative/teamer/modal_info.html.twig b/templates/administrative/teamer/modal_info.html.twig index cc852b4..0d0bb67 100644 --- a/templates/administrative/teamer/modal_info.html.twig +++ b/templates/administrative/teamer/modal_info.html.twig @@ -90,10 +90,10 @@
    {% if teamer.photo %} {{ teamer.firstName }} {% else %} -
    +
    {{ icon('user', 'w-32 h-32 text-gray-200') }}
    {% endif %} @@ -101,20 +101,20 @@
      {% if teamer.communication.phone %}
    • - + {{ icon('phone', 'w-4 h-4') }} {{ teamer.communication.phone }}
    • {% endif %}
    • - + {{ icon('mobile', 'w-4 h-4') }} {{ teamer.communication.mobile }}
    • - + {{ icon('at', 'w-4 h-4') }} {{ teamer.communication.email }} diff --git a/templates/base.html.twig b/templates/base.html.twig index e809022..261b29c 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -1,5 +1,5 @@ - + @@ -16,6 +16,8 @@ {% endblock %} + Zum Inhalt springen {% include '_partials/_maintenance_banner.html.twig' %} {% block body %}{% endblock %} {% include '_partials/_flashes.html.twig' %} diff --git a/templates/bundles/TwigBundle/Exception/error.html.twig b/templates/bundles/TwigBundle/Exception/error.html.twig index 40e20dc..8be2d7b 100644 --- a/templates/bundles/TwigBundle/Exception/error.html.twig +++ b/templates/bundles/TwigBundle/Exception/error.html.twig @@ -7,7 +7,7 @@

      Wir haben uns ein paar Notizen dazu gemacht und werden das Problem so schnell wie möglich beseitigen.

      - + nochmal von vorne {% endblock %} diff --git a/templates/bundles/TwigBundle/Exception/error404.html.twig b/templates/bundles/TwigBundle/Exception/error404.html.twig index 44100eb..2581366 100644 --- a/templates/bundles/TwigBundle/Exception/error404.html.twig +++ b/templates/bundles/TwigBundle/Exception/error404.html.twig @@ -7,7 +7,7 @@

      Die von dir aufgerufene Seite können wir leider nicht (mehr) finden.

      - + nochmal von vorne {% endblock %} diff --git a/templates/common/modal_application_filter.html.twig b/templates/common/modal_application_filter.html.twig index 1b97e3b..4e2ade7 100644 --- a/templates/common/modal_application_filter.html.twig +++ b/templates/common/modal_application_filter.html.twig @@ -27,8 +27,8 @@ {{ form_row(filterForm.includePast) }}
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} {{ form_end(filterForm) }} diff --git a/templates/common/modal_application_form_submission_filter.html.twig b/templates/common/modal_application_form_submission_filter.html.twig index 796a27d..b940eac 100644 --- a/templates/common/modal_application_form_submission_filter.html.twig +++ b/templates/common/modal_application_form_submission_filter.html.twig @@ -10,8 +10,8 @@ {{ form_row(filterForm.dateTo) }}
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} {{ form_end(filterForm) }} diff --git a/templates/common/modal_assignment_filter.html.twig b/templates/common/modal_assignment_filter.html.twig index 95ba8cc..d5616d9 100644 --- a/templates/common/modal_assignment_filter.html.twig +++ b/templates/common/modal_assignment_filter.html.twig @@ -30,8 +30,8 @@
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} {{ form_end(filterForm) }} diff --git a/templates/common/modal_availability_filter.html.twig b/templates/common/modal_availability_filter.html.twig index c00a6d8..57c547a 100644 --- a/templates/common/modal_availability_filter.html.twig +++ b/templates/common/modal_availability_filter.html.twig @@ -11,8 +11,8 @@ {{ form_row(filterForm.dateTo) }}
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} {{ form_end(filterForm) }} diff --git a/templates/common/modal_destination_filter.html.twig b/templates/common/modal_destination_filter.html.twig index 3e00b31..486ff32 100644 --- a/templates/common/modal_destination_filter.html.twig +++ b/templates/common/modal_destination_filter.html.twig @@ -8,8 +8,8 @@ {{ form_row(filterForm.hotels) }}
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} {{ form_end(filterForm) }} diff --git a/templates/common/modal_document_filter.html.twig b/templates/common/modal_document_filter.html.twig index bdf846e..d4ef04b 100644 --- a/templates/common/modal_document_filter.html.twig +++ b/templates/common/modal_document_filter.html.twig @@ -14,8 +14,8 @@ {{ form_row(filterForm.dateTo) }}
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} {{ form_end(filterForm) }} diff --git a/templates/common/modal_feedback_filter.html.twig b/templates/common/modal_feedback_filter.html.twig index cdda1c6..1814e08 100644 --- a/templates/common/modal_feedback_filter.html.twig +++ b/templates/common/modal_feedback_filter.html.twig @@ -12,8 +12,8 @@ {{ form_row(filterForm.averageRating) }}
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} {{ form_end(filterForm) }} diff --git a/templates/common/modal_questionnaire_response_filter.html.twig b/templates/common/modal_questionnaire_response_filter.html.twig index 76c82d6..6b86e3a 100644 --- a/templates/common/modal_questionnaire_response_filter.html.twig +++ b/templates/common/modal_questionnaire_response_filter.html.twig @@ -11,8 +11,8 @@ {{ form_row(filterForm.dateTo) }}
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} {{ form_end(filterForm) }} diff --git a/templates/common/modal_season_assignment_filter.html.twig b/templates/common/modal_season_assignment_filter.html.twig index f985725..0e84685 100644 --- a/templates/common/modal_season_assignment_filter.html.twig +++ b/templates/common/modal_season_assignment_filter.html.twig @@ -11,8 +11,8 @@ {{ form_row(filterForm.includeDeleted) }}
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} {{ form_end(filterForm) }} diff --git a/templates/common/modal_teamer_filter.html.twig b/templates/common/modal_teamer_filter.html.twig index c83e881..b184d54 100644 --- a/templates/common/modal_teamer_filter.html.twig +++ b/templates/common/modal_teamer_filter.html.twig @@ -17,8 +17,8 @@ {{ form_row(filterForm.includeDeleted) }}
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} {{ form_end(filterForm) }} diff --git a/templates/common/modal_timeline_filter.html.twig b/templates/common/modal_timeline_filter.html.twig index deb519b..aebac74 100644 --- a/templates/common/modal_timeline_filter.html.twig +++ b/templates/common/modal_timeline_filter.html.twig @@ -13,8 +13,8 @@ {{ form_row(filterForm.hotels) }} {% endif %}
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} diff --git a/templates/common/modal_work_month_filter.html.twig b/templates/common/modal_work_month_filter.html.twig index 8e24f11..0461c32 100644 --- a/templates/common/modal_work_month_filter.html.twig +++ b/templates/common/modal_work_month_filter.html.twig @@ -12,8 +12,8 @@ {{ form_row(filterForm.includeMismatchedOnly) }}
    - {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }} - {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }} + {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn-primary' } }) }} + {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn-secondary' } }) }}
    {{ form_rest(filterForm) }} {{ form_end(filterForm) }} diff --git a/templates/components/messagebox.html.twig b/templates/components/messagebox.html.twig index 33c9880..c1275bd 100644 --- a/templates/components/messagebox.html.twig +++ b/templates/components/messagebox.html.twig @@ -1,4 +1 @@ -
    - {{ icon(type == 'error' ? 'alert' : 'info', 'w-6 h-6 shrink-0') }} - {{ message }} -
    +{% include '_partials/_alert.html.twig' with { type: type, message: message } only %} diff --git a/templates/components/rating_stars.html.twig b/templates/components/rating_stars.html.twig index 3dcd79f..6c935bd 100644 --- a/templates/components/rating_stars.html.twig +++ b/templates/components/rating_stars.html.twig @@ -1,7 +1,7 @@ {% set stars %}
    {% for grade in range(1, 5) %} - {{ icon('star', html_classes('w-4 h-4', { 'text-gray-200': (rating/100)|round < grade, 'text-primary': (rating/100)|round >= grade })) }} + {{ icon('star', html_classes('w-4 h-4', { 'text-gray-200': (rating/100)|round < grade, 'text-brand': (rating/100)|round >= grade })) }} {% endfor %}
    {% endset %} diff --git a/templates/forms.html.twig b/templates/forms.html.twig index 6624392..80b2c42 100644 --- a/templates/forms.html.twig +++ b/templates/forms.html.twig @@ -74,11 +74,11 @@ {%- endblock textarea_widget -%} {%- block checkbox_widget -%} - {%- set attr = attr|merge({'class': (attr.class|default('') ~ ' h-4 w-4 rounded-sm text-primary')|trim }) -%} + {%- set attr = attr|merge({'class': (attr.class|default('') ~ ' h-4 w-4 rounded-sm text-brand')|trim }) -%} {%- if errors|length -%} {%- set attr = attr|merge({'class': attr.class|default('') ~ ' border-red-700 text-red-700 ring-red-700 focus:ring-red-700' }) -%} {% else %} - {%- set attr = attr|merge({'class': attr.class|default('') ~ ' border-gray-300 focus:ring-primary' }) -%} + {%- set attr = attr|merge({'class': attr.class|default('') ~ ' border-gray-300 focus:ring-brand' }) -%} {%- endif -%} {%- if attr.disabled is defined and attr.disabled == true -%} {%- set attr = attr|merge({'class': attr.class|default('') ~ ' cursor-not-allowed' }) -%} @@ -445,7 +445,7 @@ {%- if errors|length -%} {%- set attr = attr|merge({'class': attr.class|default('') ~ ' ring-red-700 placeholder:text-red-700 focus:ring-red-700' }) -%} {% else %} - {%- set attr = attr|merge({'class': attr.class|default('') ~ ' placeholder:text-gray-900 focus:ring-primary' }) -%} + {%- set attr = attr|merge({'class': attr.class|default('') ~ ' placeholder:text-gray-900 focus:ring-brand' }) -%} {%- endif -%} {%- if disabled is defined and disabled == true -%} {%- set attr = attr|merge({'class': attr.class|default('') ~ ' cursor-not-allowed' }) -%} diff --git a/templates/house_manager/feedback/index.html.twig b/templates/house_manager/feedback/index.html.twig index 7a81a0a..854788d 100644 --- a/templates/house_manager/feedback/index.html.twig +++ b/templates/house_manager/feedback/index.html.twig @@ -56,7 +56,7 @@ {{ icon('check', 'w-4 h-4') }} abgeschickt {% else %} - + {{ row.questionnaireStatus == 'draft' ? 'Entwurf fortsetzen' : 'Ausfüllen' }} {% endif %} diff --git a/templates/house_manager/questionnaire/_team.html.twig b/templates/house_manager/questionnaire/_team.html.twig index 0937c0b..cb7bdc3 100644 --- a/templates/house_manager/questionnaire/_team.html.twig +++ b/templates/house_manager/questionnaire/_team.html.twig @@ -27,7 +27,7 @@ nicht nötig {% else %} + class="btn-tool"> {{ icon('feedback', 'w-4 h-4') }} Bewerten diff --git a/templates/htmx_confirmation_modal.html.twig b/templates/htmx_confirmation_modal.html.twig index f3744c6..e193700 100644 --- a/templates/htmx_confirmation_modal.html.twig +++ b/templates/htmx_confirmation_modal.html.twig @@ -15,11 +15,11 @@ {% block content %}{% endblock %}
    {% block confirm %} - {% endblock %} -
    diff --git a/templates/layout.html.twig b/templates/layout.html.twig index 7701850..a8c2b60 100644 --- a/templates/layout.html.twig +++ b/templates/layout.html.twig @@ -1,52 +1,51 @@ {% extends 'base.html.twig' %} +{# + Sidebar layout of the E&P corporate design (ep-corporate-design, layout_sidebar.html.twig): the + main menu in a left sidebar from lg up, below that in a drawer behind the "Menü" button. The area + layouts fill `main_menu` and `mobile_menu` with the same KnpMenu menu. +#} {% block body %} - {# E&P header as in the apps portal (EP/apps) and epbms: logo with the app name, brand bar #} -
    -
    -
    - - {% include '_partials/_brand.html.twig' %} - +
    + {% embed '_partials/_header.html.twig' with { + home_path: path(app.user ? app.user.defaultRoute : 'app_security_login'), + header_width: 'mx-auto max-w-screen-2xl px-4 lg:px-8', + } %} + {% block header_end %} {% if app.user %} -
    +
    {% include '_partials/_user_menu.html.twig' %} -
    + {% endif %} + {% endblock %} + {% endembed %} + +
    + +
    + {% block content %}{% endblock %} +
    +
    + + + {# fills the dialog, so only clicks beside the drawer reach the dialog element itself #} +
    +
    + + +
    +
    -
    - -
    -
    - -
    - {% block content %}{% endblock %} -
    -
    -
    -
    -
    - - -
    -
    - {% block mobile_menu %}{% endblock %} -
    -
    +
    {% endblock %} diff --git a/templates/maintenance/index.html.twig b/templates/maintenance/index.html.twig index 9d2ac11..dea8467 100644 --- a/templates/maintenance/index.html.twig +++ b/templates/maintenance/index.html.twig @@ -1,7 +1,7 @@ {% extends 'base.html.twig' %} {% block body %} -
    +

    {% include '_partials/_brand.html.twig' %} diff --git a/templates/paginator/sliding.html.twig b/templates/paginator/sliding.html.twig index 9d4433d..dd41136 100644 --- a/templates/paginator/sliding.html.twig +++ b/templates/paginator/sliding.html.twig @@ -38,7 +38,7 @@ {% endif %} {% for page in pagesInRange %} - + {{ page }} {% endfor %} diff --git a/templates/paginator/sliding_boxes.html.twig b/templates/paginator/sliding_boxes.html.twig index cce90d9..ee1ceb7 100644 --- a/templates/paginator/sliding_boxes.html.twig +++ b/templates/paginator/sliding_boxes.html.twig @@ -20,7 +20,7 @@ {% endif %} {% for page in pagesInRange %} - + {{ page }} {% endfor %} diff --git a/templates/questionnaire/_form.html.twig b/templates/questionnaire/_form.html.twig index a4b5ae9..8c8903b 100644 --- a/templates/questionnaire/_form.html.twig +++ b/templates/questionnaire/_form.html.twig @@ -7,8 +7,8 @@ {{ form_row(child) }} {% endfor %}
    - {{ form_widget(form.submit, { attr: { class: 'btn btn--cta' } }) }} - {{ form_widget(form.draft, { attr: { class: 'btn btn--secondary' } }) }} + {{ form_widget(form.submit, { attr: { class: 'btn-primary' } }) }} + {{ form_widget(form.draft, { attr: { class: 'btn-secondary' } }) }}

    Als Entwurf kannst du den Fragebogen jederzeit speichern und später weiter ausfüllen. diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig index 27ca10d..78f5ab2 100644 --- a/templates/security/login.html.twig +++ b/templates/security/login.html.twig @@ -1,13 +1,13 @@ {% extends 'base.html.twig' %} {% block body %} -

    +

    {% include '_partials/_brand.html.twig' %}

    {% if error %} - {% include '_partials/_alert.html.twig' with { type: 'warning', message: error.messageKey|trans(error.messageData, 'security') } %} + {% include '_partials/_alert.html.twig' with { type: 'error', message: error.messageKey|trans(error.messageData, 'security') } %} {% endif %}
    @@ -34,7 +34,7 @@ required autocomplete="current-password">
    - diff --git a/templates/security/password_reset.html.twig b/templates/security/password_reset.html.twig index c96de24..d836ed0 100644 --- a/templates/security/password_reset.html.twig +++ b/templates/security/password_reset.html.twig @@ -1,7 +1,7 @@ {% extends 'base.html.twig' %} {% block body %} -
    +

    {% include '_partials/_brand.html.twig' %} @@ -14,7 +14,7 @@ {{ form_widget(form.email) }} {{ form_errors(form.email) }}

    - {{ form_rest(form) }} diff --git a/templates/teamer/application/create.html.twig b/templates/teamer/application/create.html.twig index 4aeaf05..0002011 100644 --- a/templates/teamer/application/create.html.twig +++ b/templates/teamer/application/create.html.twig @@ -27,7 +27,7 @@ {% endif %} {{ form_row(form.requests) }}
    - {{ form_rest(form) }} diff --git a/templates/teamer/application/index.html.twig b/templates/teamer/application/index.html.twig index 169982b..dc6c4c8 100644 --- a/templates/teamer/application/index.html.twig +++ b/templates/teamer/application/index.html.twig @@ -48,7 +48,7 @@ {% set label = 'in Bearbeitung' %} {% endif %} + class="btn-tool flex items-center space-x-2 {{ class }}"> {{ icon(icon, 'w-4 h-4 shrink-0') }} {{ label }} diff --git a/templates/teamer/assignment/detail.html.twig b/templates/teamer/assignment/detail.html.twig index 33ec664..f976a09 100644 --- a/templates/teamer/assignment/detail.html.twig +++ b/templates/teamer/assignment/detail.html.twig @@ -39,7 +39,7 @@ {% if is_granted('WITHDRAW', application) %} {% if filterDto.active %} - + Reset {% endif %} @@ -62,26 +62,26 @@ {% if application %} {% if application.status == constant('App\\Entity\\Application::STATUS_REJECTED') %} + class="btn-tool flex items-center space-x-2 bg-gray-100 text-gray-800 hover:bg-gray-50"> {{ icon('close', 'w-4 h-4 shrink-0') }} Bewerbung abgelehnt {% else %} + class="btn-tool flex items-center space-x-2 bg-yellow-100 text-yellow-800 hover:bg-yellow-50"> {{ icon('hourglass', 'w-4 h-4 shrink-0') }} in Bearbeitung {% endif %} {% elseif disposition %} + class="btn-tool flex items-center space-x-2 bg-green-100 text-green-700 hover:bg-green-50"> {{ icon('check', 'w-4 h-4 shrink-0') }} eingeteilt {% elseif is_granted('APPLY', assignment) %} + class="btn-tool flex items-center space-x-2"> {{ icon('info', 'w-4 h-4 shrink-0') }} weitere Infos diff --git a/templates/teamer/bookmark/index.html.twig b/templates/teamer/bookmark/index.html.twig index 96048fe..748e038 100644 --- a/templates/teamer/bookmark/index.html.twig +++ b/templates/teamer/bookmark/index.html.twig @@ -48,12 +48,12 @@ {% set label = 'eingeteilt' %} {% else %} {% set icon = 'hand' %} - {% set class = 'btn--info' %} + {% set class = '' %} {% set url = path('app_teamer_assignment_detail', { 'uuid': assignment.uuid, 'r': return_url() }) %} {% set label = 'bewerben' %} {% endif %} + class="btn-tool flex items-center space-x-2 {{ class }}"> {{ icon(icon, 'w-4 h-4') }} {{ label }} diff --git a/templates/teamer/check/driver_license.html.twig b/templates/teamer/check/driver_license.html.twig index eda869b..22dad77 100644 --- a/templates/teamer/check/driver_license.html.twig +++ b/templates/teamer/check/driver_license.html.twig @@ -16,7 +16,7 @@

    {% if teamer.driverLicenseStatus == constant('App\\Entity\\Teamer::DRIVER_LICENSE_STATUS_DENIED') %} - {% embed '_partials/_alert.html.twig' with { 'type': 'warning' } %} + {% embed '_partials/_alert.html.twig' with { 'type': 'error' } %} {% block message %} Dein zuletzt hochgeladener Führerschein wurde abgelehnt. {% if teamer.driverLicenseReviewComment %} @@ -28,7 +28,7 @@ {% endif %} {% if not form.vars.valid %} - {% embed '_partials/_alert.html.twig' with { 'type': 'warning' } %} + {% embed '_partials/_alert.html.twig' with { 'type': 'error' } %} {% block message %} {% include '_partials/_form_errors.html.twig' with { 'form': form } %} {% endblock %} @@ -61,7 +61,7 @@ {{ form_row(form.confirmTermsOfUse) }}
    -
    diff --git a/templates/teamer/check/financial_data.html.twig b/templates/teamer/check/financial_data.html.twig index d9e626d..fa8f696 100644 --- a/templates/teamer/check/financial_data.html.twig +++ b/templates/teamer/check/financial_data.html.twig @@ -15,7 +15,7 @@

    {% if not form.vars.valid %} - {% embed '_partials/_alert.html.twig' with { 'type': 'warning' } %} + {% embed '_partials/_alert.html.twig' with { 'type': 'error' } %} {% block message %} {% include '_partials/_form_errors.html.twig' with { 'form': form } %} {% endblock %} @@ -30,7 +30,7 @@ {{ form_row(form.holder) }}
    -
    diff --git a/templates/teamer/check/meal_preference.html.twig b/templates/teamer/check/meal_preference.html.twig index 1df433f..8b08434 100644 --- a/templates/teamer/check/meal_preference.html.twig +++ b/templates/teamer/check/meal_preference.html.twig @@ -15,7 +15,7 @@

    {% if not form.vars.valid %} - {% embed '_partials/_alert.html.twig' with { 'type': 'warning' } %} + {% embed '_partials/_alert.html.twig' with { 'type': 'error' } %} {% block message %} {% include '_partials/_form_errors.html.twig' with { 'form': form } %} {% endblock %} @@ -26,7 +26,7 @@ {{ form_row(form.mealPreference) }}

    -
    diff --git a/templates/teamer/check/personal_data.html.twig b/templates/teamer/check/personal_data.html.twig index 97eae14..d08acb3 100644 --- a/templates/teamer/check/personal_data.html.twig +++ b/templates/teamer/check/personal_data.html.twig @@ -14,7 +14,7 @@

    {% if not form.vars.valid %} - {% embed '_partials/_alert.html.twig' with { 'type': 'warning' } %} + {% embed '_partials/_alert.html.twig' with { 'type': 'error' } %} {% block message %} {% include '_partials/_form_errors.html.twig' with { 'form': form } %} {% endblock %} @@ -74,7 +74,7 @@ {{ form_row(form.confirmed) }}
    - diff --git a/templates/teamer/disposition/_card.html.twig b/templates/teamer/disposition/_card.html.twig index a7aae35..550ad7f 100644 --- a/templates/teamer/disposition/_card.html.twig +++ b/templates/teamer/disposition/_card.html.twig @@ -28,7 +28,7 @@ {% endif %} + class="btn-tool flex items-center space-x-2"> {{ icon('info', 'w-4 h-4 shrink-0') }} Details diff --git a/templates/teamer/disposition/_season_card.html.twig b/templates/teamer/disposition/_season_card.html.twig index b8e97bd..748065d 100644 --- a/templates/teamer/disposition/_season_card.html.twig +++ b/templates/teamer/disposition/_season_card.html.twig @@ -21,7 +21,7 @@ {% if seasonAssignment is same as(linkedSeasonAssignment) %} + class="btn-tool flex items-center space-x-2"> {{ icon('info', 'w-4 h-4 shrink-0') }} Details diff --git a/templates/teamer/disposition/detail.html.twig b/templates/teamer/disposition/detail.html.twig index b4bf9f0..a1c12c3 100644 --- a/templates/teamer/disposition/detail.html.twig +++ b/templates/teamer/disposition/detail.html.twig @@ -64,7 +64,7 @@ {% if form.pickup is defined %} {{ form_row(form.pickup) }} {% endif %} - @@ -112,7 +112,7 @@ {% if form.confirmInvoiceData is defined %} {{ form_row(form.confirmInvoiceData) }} {% endif %} - @@ -228,7 +228,7 @@

    Wie lief dein Einsatz? Dein Feedback hilft uns, besser zu werden.

    - + Zum Fragebogen {% endif %} diff --git a/templates/teamer/disposition/modal_receipt_upload.html.twig b/templates/teamer/disposition/modal_receipt_upload.html.twig index 44089ec..618b7ce 100644 --- a/templates/teamer/disposition/modal_receipt_upload.html.twig +++ b/templates/teamer/disposition/modal_receipt_upload.html.twig @@ -16,7 +16,7 @@ 'accepted_files': 'image/jpg,image/jpeg,application/pdf', } %} - {{ form_rest(form) }} diff --git a/templates/teamer/profile/availability/index.html.twig b/templates/teamer/profile/availability/index.html.twig index ccafb81..949c257 100644 --- a/templates/teamer/profile/availability/index.html.twig +++ b/templates/teamer/profile/availability/index.html.twig @@ -77,7 +77,7 @@ {% endif %} {{ form_rest(form) }} diff --git a/templates/teamer/profile/index.html.twig b/templates/teamer/profile/index.html.twig index e5ac68f..841391b 100644 --- a/templates/teamer/profile/index.html.twig +++ b/templates/teamer/profile/index.html.twig @@ -145,7 +145,7 @@ nicht vorhanden {% endif %} - + Führerscheinstatus bearbeiten @@ -175,7 +175,7 @@ anmelden. diff --git a/templates/teamer/profile/license/modal_add.html.twig b/templates/teamer/profile/license/modal_add.html.twig index 2c94903..ca39483 100644 --- a/templates/teamer/profile/license/modal_add.html.twig +++ b/templates/teamer/profile/license/modal_add.html.twig @@ -24,7 +24,7 @@ } %} - {{ form_rest(form) }} diff --git a/templates/teamer/profile/modal_delete_account.html.twig b/templates/teamer/profile/modal_delete_account.html.twig index b98c1fe..1a4d5ff 100644 --- a/templates/teamer/profile/modal_delete_account.html.twig +++ b/templates/teamer/profile/modal_delete_account.html.twig @@ -19,7 +19,7 @@ {{ form_row(form.confirmed) }} - {{ form_rest(form) }} diff --git a/templates/teamer/profile/skills.html.twig b/templates/teamer/profile/skills.html.twig index 3271feb..b9f7963 100644 --- a/templates/teamer/profile/skills.html.twig +++ b/templates/teamer/profile/skills.html.twig @@ -60,7 +60,7 @@ {% endfor %} {{ form_rest(form) }} diff --git a/templates/teamer/questionnaire/detail.html.twig b/templates/teamer/questionnaire/detail.html.twig index 896107e..c119cfb 100644 --- a/templates/teamer/questionnaire/detail.html.twig +++ b/templates/teamer/questionnaire/detail.html.twig @@ -24,7 +24,7 @@ {% endfor %} {% if open %} - + Offenen Fragebogen ausfüllen {% endif %} diff --git a/templates/teamer/season/index.html.twig b/templates/teamer/season/index.html.twig index 424b834..1076f6e 100644 --- a/templates/teamer/season/index.html.twig +++ b/templates/teamer/season/index.html.twig @@ -89,7 +89,7 @@ {% endif %} {{ form_rest(form) }} diff --git a/templates/teamer/work_month/modal_upload.html.twig b/templates/teamer/work_month/modal_upload.html.twig index c4e1199..5b53cb3 100644 --- a/templates/teamer/work_month/modal_upload.html.twig +++ b/templates/teamer/work_month/modal_upload.html.twig @@ -18,7 +18,7 @@ 'accepted_files': 'image/jpg,image/jpeg,application/pdf', } %} - {{ form_rest(form) }}