Release 2.11 (#4580)

2024-02-02 13:52:24 +01:00
parent a9a32c83ac
commit 49e69d1ae3
55 changed files with 347 additions and 264 deletions
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -10,11 +10,13 @@
        {% block modal_title %}{% endblock %}
        {% block modal_body %}{% endblock %}
        {% block modal_footer %}{% endblock %}
+        {% block modal_effects %}{% endblock %}
    {% endembed %}
    {% embed '@theme/embeds/modal.html.twig' %}
        {% block modal_id %}remote_modal{% endblock %}
        {% block modal_title %}{% endblock %}
        {% block modal_body %}{% endblock %}
+        {% block modal_effects %}{% endblock %}
        {% block modal_footer %}
            <button type="button" class="btn btn-cancel" data-bs-dismiss="modal">{{ 'action.close'|trans }}</button>
        {% endblock %}
@@ -112,16 +114,18 @@
 {% block page_pretitle %}{% endblock %}

 {% block stylesheets %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('app') }}
+    {% if tabler_bundle.isRightToLeft() %}
+        {{ encore_entry_link_tags('app-rtl') }}
+    {% else %}
+        {{ encore_entry_link_tags('app') }}
+    {% endif %}
    {% set event = trigger(constant('App\\Event\\ThemeEvent::STYLESHEET')) %}
    {{ event.content|raw }}
 {% endblock %}

 {% block head %}
-    {{ parent() }}
-    {{ encore_entry_script_tags('app') }}
    {% include 'partials/head.html.twig' %}
+    {{ encore_entry_script_tags('app') }}
    {% set event = trigger(constant('App\\Event\\ThemeEvent::HTML_HEAD')) %}
    {{ event.content|raw }}
 {% endblock %}
--- a/templates/bundles/TablerBundle/includes/logo.html.twig
+++ b/templates/bundles/TablerBundle/includes/logo.html.twig
@@ -1,4 +1,4 @@
-<a href="{{ path('tabler_welcome'|tabler_route) }}">
+<a href="{{ path('tabler_welcome'|tabler_route) }}" title="{{ 'dashboard.title'|trans }}">
    {% set logo = config('theme.branding.logo') %}
    {% set company = config('theme.branding.company') %}
    {% if company is not empty %}
@@ -6,9 +6,9 @@
    {% elseif logo is not empty %}
        <img src="{{ logo }}" class="navbar-brand-image" style="max-height:32px" alt="{{ company }}">
    {% elseif tabler_bundle.getLogoUrl() is not empty %}
-        <img class="navbar-brand-image" alt="{{ company }}" width="110" height="32"
+        <img class="navbar-brand-image" alt="{{ company|default(constant('\\App\\Constants::SOFTWARE') ~ ' ' ~ constant('\\App\\Constants::VERSION')) }}" width="110" height="32"
                src="{% if '://' in tabler_bundle.getLogoUrl() %}{{ tabler_bundle.getLogoUrl() }}{% else %}{{ asset(tabler_bundle.getLogoUrl()) }}{% endif %}">
    {% else %}
        <span>{{ get_title()|raw }}</span>
    {% endif %}
-</a>
+</a>
--- a/templates/default/_form_delete_modal.html.twig
+++ b/templates/default/_form_delete_modal.html.twig
@@ -2,6 +2,7 @@
    {% set used = used|default(false) %}
    {% block modal_id %}form_modal{% endblock %}
    {% block modal_before %}{{ form_start(form) }}{% endblock %}
+    {% block modal_effects %}{% endblock %}
    {% block modal_title %}
        {{ title|default('confirm.delete'|trans) }}
    {% endblock %}
--- a/templates/default/_form_modal.html.twig
+++ b/templates/default/_form_modal.html.twig
@@ -1,4 +1,4 @@
-<div class="modal modal-blur fade {% block modal_class %}{% endblock %}" id="{% block modal_id %}form_modal{% endblock %}" tabindex="-1" role="dialog" aria-labelledby="{{ block('modal_id') }}_label">
+<div class="modal {% block modal_class %}{% endblock %}" id="{% block modal_id %}form_modal{% endblock %}" tabindex="-1" role="dialog" aria-labelledby="{{ block('modal_id') }}_label">
    <div class="modal-dialog {% block modal_size %}modal-lg{% endblock %}" role="document">
        <div class="modal-content">
            {% block form_before %}{% endblock %}
--- a/templates/export/layout.html.twig
+++ b/templates/export/layout.html.twig
@@ -2,7 +2,6 @@
 <html lang="{{ app.request.locale }}">
 <head>
    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta content="width=device-width, initial-scale=1" name="viewport">
    <link rel="stylesheet" href="{{ asset('bundles/tabler/tabler.css') }}">
    {{ encore_entry_link_tags('app') }}
--- a/templates/invoice/renderer/timesheet.html.twig
+++ b/templates/invoice/renderer/timesheet.html.twig
@@ -2,7 +2,6 @@
 <html lang="{{ invoice['invoice.language'] }}">
 <head>
    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
    <title>{{ invoice['invoice.number'] }}-{{ invoice['customer.company']|default(invoice['customer.name'])|u.snake }}</title>
    <style>
--- a/templates/macros/datatables.html.twig
+++ b/templates/macros/datatables.html.twig
@@ -97,7 +97,7 @@

 {% macro data_table_column_modal(name, columns) %}
 {% set visibility = initialize_datatable(app.user, app.session, name, columns) %}
-<div class="modal modal-blur fade" data-bs-backdrop="static" id="modal_{{ name }}" data-column-visibility="{{ name }}" tabindex="-1" role="dialog" aria-labelledby="data_table_modal_label">
+<div class="modal" data-bs-backdrop="static" id="modal_{{ name }}" data-column-visibility="{{ name }}" tabindex="-1" role="dialog" aria-labelledby="data_table_modal_label">
    <div class="modal-dialog modal-lg" role="document">
        <div class="modal-content">
            <div class="modal-header">
--- a/templates/partials/head.html.twig
+++ b/templates/partials/head.html.twig
@@ -1,3 +1,6 @@
+<meta charset="utf-8">
+<meta content="width=device-width, initial-scale=1" name="viewport">
+<meta name="robots" content="noindex,nofollow">
 <link id="favicon" rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">
 <link rel="icon" type="image/png" href="{{ asset('favicon-16x16.png') }}" sizes="16x16">
 <link rel="icon" type="image/png" href="{{ asset('favicon-32x32.png') }}" sizes="32x32">
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -4,15 +4,17 @@
 {% block title %}{{- get_title() -}}{% endblock %}

 {% block head %}
-    {{ parent() }}
    {% include 'partials/head.html.twig' %}
    {% set event = trigger(constant('App\\Event\\ThemeEvent::HTML_HEAD')) %}
    {{ event.content|raw }}
 {% endblock %}

 {% block stylesheets %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('app') }}
+    {% if tabler_bundle.isRightToLeft() %}
+        {{ encore_entry_link_tags('app-rtl') }}
+    {% else %}
+        {{ encore_entry_link_tags('app') }}
+    {% endif %}
    {% set event = trigger(constant('App\\Event\\ThemeEvent::STYLESHEET')) %}
    {{ event.content|raw }}
 {% endblock %}
--- a/templates/timesheet/export.html.twig
+++ b/templates/timesheet/export.html.twig
@@ -9,7 +9,6 @@
 <html lang="{{ language }}">
 <head>
    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
    <title>{{ 'export'|trans }}</title>
    <style type="text/css">