diff --git a/assets/styles/ep-design.css b/assets/styles/ep-design.css index 7c1d1409..cb3964fe 100644 --- a/assets/styles/ep-design.css +++ b/assets/styles/ep-design.css @@ -273,6 +273,43 @@ @apply border-b last:border-b-0; } + /* + * Lists of entries in a card, as on a dashboard (components/dashboard/): one line per entry, the + * whole line is the link or button, its parts separated by a dot, the last part cut off with "…". + */ + .entry-list { + @apply divide-y divide-line; + } + + .entry-list > li { + @apply py-2 first:pt-0 last:pb-0; + } + + /* a work queue that would otherwise grow the card without limit; keep it rare, it scrolls awkwardly on phones */ + .entry-list--scroll { + @apply max-h-64 overflow-y-auto pr-3; + } + + .entry-link { + @apply flex w-full min-w-0 items-center gap-1.5 text-left text-ink no-underline; + } + + :is(a, button).entry-link { + @apply hover:text-brand; + } + + .entry-link > * { + @apply shrink-0 whitespace-nowrap; + } + + .entry-link > :last-child { + @apply min-w-0 shrink truncate; + } + + .entry-link > .entry-dot { + @apply text-muted; + } + /* notices (_partials/_alert.html.twig): light, with a coloured bar on the left */ .notice { @apply border-l-4 px-4 py-2; diff --git a/templates/admin/dashboard.html.twig b/templates/admin/dashboard.html.twig index 822f03e1..531150b2 100644 --- a/templates/admin/dashboard.html.twig +++ b/templates/admin/dashboard.html.twig @@ -10,7 +10,7 @@ {% if widget.actionUrl %} - {{ widget.actionLabel }} + {{ widget.actionLabel }} {% endif %} {% for entry in widget.entries %} diff --git a/templates/components/dashboard/entry.html.twig b/templates/components/dashboard/entry.html.twig index b9674d60..4e326479 100644 --- a/templates/components/dashboard/entry.html.twig +++ b/templates/components/dashboard/entry.html.twig @@ -1,13 +1,30 @@ +{#- + One line of a dashboard:widget. Its text is `parts` (shown with dots between them) or the content + block; `icon` in front. With `url` the line is a link, without one but with hx-* attributes a + button (opening a modal, say), otherwise plain text. +-#} {% set url = url ?? null %} {% set icon = icon ?? null %} +{% set parts = parts ?? null %} +{% set is_button = not url and attributes.all|keys|filter(k => k starts with 'hx-')|length > 0 %} {% set body %} - {% if icon %}{{ icon(icon, 'w-4 h-4 shrink-0') }}{% endif %} - {{ block('content') }} -{% endset %} -
  • - {% if url %} - {{ body }} + {% if icon %}{{ include('_partials/_icon.html.twig', {icon: icon, class: 'size-4 text-muted'}) }}{% endif %} + {% if parts is not null %} + {% for part in parts|filter(p => p is not empty) %} + {% if not loop.first %}{% endif %} + {{ part }} + {% endfor %} {% else %} -
    {{ body }}
    + {{ block('content') }} + {% endif %} +{% endset %} +{% set attrs = attributes.defaults({class: 'entry-link'}).without('url', 'icon', 'parts') %} +
  • + {% if url %} + {{ body }} + {% elseif is_button %} + + {% else %} +
    {{ body }}
    {% endif %}
  • diff --git a/templates/components/dashboard/widget.html.twig b/templates/components/dashboard/widget.html.twig index 6016b7dc..233c209a 100644 --- a/templates/components/dashboard/widget.html.twig +++ b/templates/components/dashboard/widget.html.twig @@ -1,15 +1,25 @@ +{#- + A card of entries, as on a dashboard. `title`; optional `meta` (a short count beside the title, + such as "3 neu, 2 in Bearbeitung"), `emptyText` and `scroll` (for work queues that would grow the + card without limit); the `actions` block goes to the right of the header, typically "alle anzeigen". +-#} {% set emptyText = emptyText ?? 'Keine Einträge vorhanden.' %} +{% set meta = meta ?? null %} +{% set scroll = scroll ?? false %} {% set entries %}{% block content %}{% endblock %}{% endset %} -
    -
    +
    +

    {{ title }}

    - {% block actions %}{% endblock %} +
    + {% if meta %}{{ meta }}{% endif %} + {% block actions %}{% endblock %} +
    {% if entries|trim is empty %} {% block empty %} -

    {{ emptyText }}

    +

    {{ emptyText }}

    {% endblock %} {% else %} -
      {{ entries }}
    +
      {{ entries }}
    {% endif %} -
    +