diff --git a/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php b/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php index 5a1c6a645e..99526167d6 100644 --- a/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php +++ b/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php @@ -38,6 +38,12 @@ class GeneralFormType extends AbstractType $builder->add('analytics', 'text', [ 'label' => 'Google Analytics identifier', ]); + $builder->add('matomo-url', 'text', [ + 'label' => 'Matomo Analytics url', + ]); + $builder->add('matomo-id', 'text', [ + 'label' => 'Matomo Analytics identifier', + ]); $builder->add('allow-indexation', 'checkbox', [ 'label' => 'Allow the website to be indexed by search engines like Google', ]); diff --git a/templates/mobile/common/index.html.twig b/templates/mobile/common/index.html.twig index 32a08cc094..c5b68592da 100644 --- a/templates/mobile/common/index.html.twig +++ b/templates/mobile/common/index.html.twig @@ -24,5 +24,6 @@ {% block content %}{% endblock %} {% include 'common/analytics.html.twig' %} + {% include 'common/matomo_analytics.html.twig' %} diff --git a/templates/mobile/common/matomo_analytics.html.twig b/templates/mobile/common/matomo_analytics.html.twig new file mode 100644 index 0000000000..affad06a56 --- /dev/null +++ b/templates/mobile/common/matomo_analytics.html.twig @@ -0,0 +1,18 @@ +{% if app['conf'].get(['registry', 'general', 'matomo-url']) != '' %} +{% if app['conf'].get(['registry', 'general', 'matomo-id']) != '' %} + + + +{% endif %} +{% endif %} diff --git a/templates/web/common/index_bootstrap.html.twig b/templates/web/common/index_bootstrap.html.twig index 9b9f27a228..5c535b1767 100644 --- a/templates/web/common/index_bootstrap.html.twig +++ b/templates/web/common/index_bootstrap.html.twig @@ -42,5 +42,6 @@ {% block extra_content %}{% endblock %} {% block bodyJavascript %}{% endblock %} {% include 'common/analytics.html.twig' %} + {% include 'common/matomo_analytics.html.twig' %} diff --git a/templates/web/common/indexfloat.html.twig b/templates/web/common/indexfloat.html.twig index 8727aae954..a5f6aad392 100644 --- a/templates/web/common/indexfloat.html.twig +++ b/templates/web/common/indexfloat.html.twig @@ -25,5 +25,6 @@ {% include 'common/analytics.html.twig' %} + {% include 'common/mamoto_analytics.html.twig' %} diff --git a/templates/web/common/matomo_analytics.html.twig b/templates/web/common/matomo_analytics.html.twig new file mode 100644 index 0000000000..affad06a56 --- /dev/null +++ b/templates/web/common/matomo_analytics.html.twig @@ -0,0 +1,18 @@ +{% if app['conf'].get(['registry', 'general', 'matomo-url']) != '' %} +{% if app['conf'].get(['registry', 'general', 'matomo-id']) != '' %} + + + +{% endif %} +{% endif %} diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig index 8d96cea003..155de6bd6e 100644 --- a/templates/web/login/layout/base-layout.html.twig +++ b/templates/web/login/layout/base-layout.html.twig @@ -100,6 +100,7 @@ {% endblock %} {% block analytics %} {% include 'common/analytics.html.twig' %} + {% include 'common/matomo_analytics.html.twig' %} {% endblock analytics %} {% block scripts %}{% endblock scripts %}