From 4dff40d92b1b4848da2ceec6088c4cee68a06eb7 Mon Sep 17 00:00:00 2001 From: Guillaume AGNIERAY Date: Mon, 4 Dec 2023 18:57:23 +0100 Subject: [PATCH] Improve listings headers display on mobile --- .../elements/edit_dynamic_fields.html.twig | 10 +++--- .../default/elements/edit_entitleds.html.twig | 8 ++--- .../pages/configuration_core_fields.html.twig | 10 +++--- .../pages/configuration_core_lists.html.twig | 16 ++++----- .../configuration_payment_types.html.twig | 4 +-- .../pages/configuration_titles.html.twig | 8 ++--- .../pages/contributions_list.html.twig | 16 ++++----- .../templates/default/pages/export.html.twig | 14 ++++---- .../templates/default/pages/history.html.twig | 10 +++--- .../templates/default/pages/import.html.twig | 4 +-- .../default/pages/mailings_list.html.twig | 12 +++---- .../default/pages/members_list.html.twig | 2 +- .../pages/members_public_list.html.twig | 6 ++-- .../templates/default/pages/plugins.html.twig | 10 +++--- .../pages/saved_searches_list.html.twig | 6 ++-- .../default/pages/transactions_list.html.twig | 10 +++--- .../galette/collections/table.overrides | 25 ++++++++++++++ ui/semantic/galette/globals/site.overrides | 34 +++++++++++++++++++ 18 files changed, 132 insertions(+), 73 deletions(-) diff --git a/galette/templates/default/elements/edit_dynamic_fields.html.twig b/galette/templates/default/elements/edit_dynamic_fields.html.twig index a003663f6..abfbe4d2e 100644 --- a/galette/templates/default/elements/edit_dynamic_fields.html.twig +++ b/galette/templates/default/elements/edit_dynamic_fields.html.twig @@ -22,11 +22,11 @@ {% for field in fields_list %} - {{ field.getIndex() }} - {{ field.getName()|escape }} - {{ field.getPermName() }} - {{ field.getTypeName() }} - + {{ field.getIndex() }} + {{ field.getName()|escape }} + {{ field.getPermName() }} + {{ field.getTypeName() }} + {% if field.getType != 0 %} {% if field.isRequired() %}{{ _T("Yes") }}{% else %}{{ _T("No") }}{% endif %} {% endif %} diff --git a/galette/templates/default/elements/edit_entitleds.html.twig b/galette/templates/default/elements/edit_entitleds.html.twig index 4374e4ca3..7d05d59ca 100644 --- a/galette/templates/default/elements/edit_entitleds.html.twig +++ b/galette/templates/default/elements/edit_entitleds.html.twig @@ -31,13 +31,13 @@ {% endif %} - +
- + {% if class == 'ContributionsTypes' %} @@ -51,7 +51,7 @@
- + @@ -59,7 +59,7 @@
- + {{ field.label }}
- + {% if field.visible == constant('Galette\\Entity\\FieldsConfig::NOBODY') %}{{ _T("Inaccessible") }}{% endif %} {% if field.visible == constant('Galette\\Entity\\FieldsConfig::ADMIN') %}{{ _T("Administrator") }}{% endif %} {% if field.visible == constant('Galette\\Entity\\FieldsConfig::STAFF') %}{{ _T("Staff member") }}{% endif %} @@ -61,7 +61,7 @@
-
+
{{ _T("Field name") }} @@ -76,17 +76,17 @@ {% for col, field in remaining_fields %} {% set fid = field.field_id %}
  • -
    +
    - + {{ field.label }}
    - + {% if field.visible == constant('Galette\\Entity\\FieldsConfig::NOBODY') %}{{ _T("Inaccessible") }}{% endif %} {% if field.visible == constant('Galette\\Entity\\FieldsConfig::ADMIN') %}{{ _T("Administrator") }}{% endif %} {% if field.visible == constant('Galette\\Entity\\FieldsConfig::STAFF') %}{{ _T("Staff member") }}{% endif %} diff --git a/galette/templates/default/pages/configuration_payment_types.html.twig b/galette/templates/default/pages/configuration_payment_types.html.twig index a6ffcded4..6def752bf 100644 --- a/galette/templates/default/pages/configuration_payment_types.html.twig +++ b/galette/templates/default/pages/configuration_payment_types.html.twig @@ -18,7 +18,7 @@ {{ _T("Add payment type") }} - +
    @@ -48,7 +48,7 @@ - {{ ptype.getName() }} + {{ ptype.getName() }} - +
    - +
    @@ -55,8 +55,8 @@ - {{ title.short|escape }} - {{ title.long|escape }} + {{ title.short|escape }} + {{ title.long|escape }}   {% endif %} - {{ contribution.date }} - {{ contribution.begin_date }} - {{ contribution.end_date }} + {{ contribution.date }} + {{ contribution.begin_date }} + {{ contribution.end_date }} {% if ((login.isAdmin() or login.isStaff()) and member is not defined) or pmember is defined %} - + {% if member is defined %} {% set mname = member.sname %} {% else %} @@ -293,10 +293,10 @@ {% endif %} - {{ contribution.type.libelle }} - {{ contribution.amount }} - {{ contribution.spayment_type }} - {{ contribution.duration }} + {{ contribution.type.libelle }} + {{ contribution.amount }} + {{ contribution.spayment_type }} + {{ contribution.duration }} {% if mode != 'ajax' %} {{ export.name }} - + {{ export.date }} - + {{ export.size }} @@ -85,7 +85,7 @@
    {% if parameted|length > 0 %}

    {{ _T('Which parameted export(s) do you want to run?') }}

    - +
    {% for param in parameted %} - - @@ -123,7 +123,7 @@

    {{ _T('Additionnaly, which table(s) do you want to export?') }}

    -
    @@ -96,13 +96,13 @@
    + +
    +
    {% for table in tables_list %} - - - - - - + + + + - - - - - - - - + + + + + - + {% if login.isLogged() %} - + {% endif %} - + {% else %} diff --git a/galette/templates/default/pages/plugins.html.twig b/galette/templates/default/pages/plugins.html.twig index 0ee61e6c1..b99677f9c 100644 --- a/galette/templates/default/pages/plugins.html.twig +++ b/galette/templates/default/pages/plugins.html.twig @@ -20,10 +20,10 @@ {% for name, plugin in plugins_list %} - - - - + + + + - - - - + + - + {% if ((login.isAdmin() or login.isStaff()) and member is not defined) or pmember is defined %} - {% endif %} - - + + {% if login.isAdmin() or login.isStaff() %} -
    @@ -133,7 +133,7 @@
    + diff --git a/galette/templates/default/pages/history.html.twig b/galette/templates/default/pages/history.html.twig index 282c49070..6a486f5a7 100644 --- a/galette/templates/default/pages/history.html.twig +++ b/galette/templates/default/pages/history.html.twig @@ -116,11 +116,11 @@ {{ _T("History entry %id")|replace({"%id": loop.index}) }} {{ log.date_log|date(_T("Y-m-d H:i:s")) }}{{ log.ip_log }}{{ log.adh_log }}{{ log.action_log|escape }} + {{ log.date_log|date(_T("Y-m-d H:i:s")) }}{{ log.ip_log }}{{ log.adh_log }}{{ log.action_log|escape }} {{ log.text_log|escape }} {% if log.sql_log %}
    diff --git a/galette/templates/default/pages/import.html.twig b/galette/templates/default/pages/import.html.twig index 887e5e388..7db1e7dd0 100644 --- a/galette/templates/default/pages/import.html.twig +++ b/galette/templates/default/pages/import.html.twig @@ -33,10 +33,10 @@ ({{ _T('see') }})
    		+ {{ import.date }} + {{ import.size }} diff --git a/galette/templates/default/pages/mailings_list.html.twig b/galette/templates/default/pages/mailings_list.html.twig index 9df15c997..e7a40be85 100644 --- a/galette/templates/default/pages/mailings_list.html.twig +++ b/galette/templates/default/pages/mailings_list.html.twig @@ -132,12 +132,12 @@ {{ _T('Mailing entry %id')|replace({'%id': log.mailing_id}) }} {{ log.mailing_date|date(date_format) }}{% if log.mailing_sender == 0 %}{{ _T('Superadmin') }}{% else %}{{ log.mailing_sender_name }}{% endif %}{{ log.mailing_recipients|length }}{{ log.mailing_subject }}{{ log.attachments }} + {{ log.mailing_date|date(date_format) }}{% if log.mailing_sender == 0 %}{{ _T('Superadmin') }}{% else %}{{ log.mailing_sender_name }}{% endif %}{{ log.mailing_recipients|length }}{{ log.mailing_subject }}{{ log.attachments }} {% if log.mailing_sent == 1 %} {% else %} diff --git a/galette/templates/default/pages/members_list.html.twig b/galette/templates/default/pages/members_list.html.twig index 9a12fabf4..8ff9fcd79 100644 --- a/galette/templates/default/pages/members_list.html.twig +++ b/galette/templates/default/pages/members_list.html.twig @@ -394,7 +394,7 @@ {% set value = value|e('html') %} {% endif %} - + {# Display column. A check is done here to adapt display, this is may not the best way to go but for now, that works as expected. diff --git a/galette/templates/default/pages/members_public_list.html.twig b/galette/templates/default/pages/members_public_list.html.twig index 721c9355c..b32ba3b36 100644 --- a/galette/templates/default/pages/members_public_list.html.twig +++ b/galette/templates/default/pages/members_public_list.html.twig @@ -83,11 +83,11 @@ {{ member.sfullname }} {% endif %} {{ member.nickname|escape }}{{ member.nickname|escape }}{{ member.email }}{{ member.email }}{{ member.others_infos }}{{ member.others_infos }}
    {{ plugin.name }} ({{ name }}){{ plugin.desc }}{{ plugin.author }}{{ plugin.version }}{{ plugin.date }}{{ plugin.desc }}{{ plugin.author }}{{ plugin.version }}{{ plugin.date }} {{ name }} + {% if plugin.cause == constant('Galette\\Core\\Plugins::DISABLED_MISS') %} {{ _T('A required file is missing') }} {% elseif plugin.cause == constant('Galette\\Core\\Plugins::DISABLED_COMPAT') %} diff --git a/galette/templates/default/pages/saved_searches_list.html.twig b/galette/templates/default/pages/saved_searches_list.html.twig index ed35b9ae1..b6e2b9b15 100644 --- a/galette/templates/default/pages/saved_searches_list.html.twig +++ b/galette/templates/default/pages/saved_searches_list.html.twig @@ -27,9 +27,9 @@ {{ loop.index1 }} {% endif %} {{ search.creation_date }}{{ search.name|default("-") }} + {{ search.creation_date }}{{ search.name|default("-") }}
    {{ _T("Show parameters") }} diff --git a/galette/templates/default/pages/transactions_list.html.twig b/galette/templates/default/pages/transactions_list.html.twig index 57bcc3cbd..0f5e6c75d 100644 --- a/galette/templates/default/pages/transactions_list.html.twig +++ b/galette/templates/default/pages/transactions_list.html.twig @@ -158,9 +158,9 @@
    		{{ transaction.date }}{{ transaction.date }} + {% if filters.filtre_cotis_adh == "" or filters.filtre_cotis_adh == null %} {{ transaction.description|escape }}{{ transaction.amount }}{{ transaction.description|escape }}{{ transaction.amount }} + thead { + display: none !important; + } + & td { + &[data-scope="id"] { + float: left; + } + &[data-scope="row"] { + font-weight: bold; + input[type="checkbox"] { + float: right; + } + } + &[data-col-label]::before { + display: inline-block; + content: attr(data-col-label); + width: 10em; + font-weight: bold; + } + &.actions_row { + text-align: center; + } + } + } .ui.ui.ui.ui.table.listing:not(.unstackable) > tbody > tr:hover, .ui.ui.ui.ui.table.listing:not(.unstackable) > tbody > tr:hover > td { background: @activeLineBackgroundColor !important; diff --git a/ui/semantic/galette/globals/site.overrides b/ui/semantic/galette/globals/site.overrides index 6131cbbcc..b04af28fc 100644 --- a/ui/semantic/galette/globals/site.overrides +++ b/ui/semantic/galette/globals/site.overrides @@ -223,6 +223,40 @@ body:not(.loggedin) main.pusher.dimmed.closing ~ footer.page-footer { html.public_page .ui.ui.ui.container:not(.fluid) { width: 100%; } + .core-lists-properties, + .core-fields-properties { + display: none !important; + } + .core-lists-listing, + .core-fields-listing { + i.arrows.alternate { + display: block; + margin: 1rem auto; + &::before { + display: block; + } + } + } + .core-lists-listing { + span[data-prop-label] { + display: block; + text-align: center; + &::before { + display: block; + content: attr(data-prop-label); + text-align: center; + font-weight: bold; + } + } + } + .core-fields-listing { + span[data-prop-label]::before { + display: inline-block; + content: attr(data-prop-label); + width: 10em; + font-weight: bold; + } + } } @media only screen and (max-width: 991px) { -- 2.39.2