hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2997 Rename properties

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-03-24 18:25:31 +04:00
parent 8e03128544
commit 49ce33ceef
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
View File

@@ -102,8 +102,8 @@ class RegistryFormManipulator
'keywords' => null, 'keywords' => null,
'description' => null, 'description' => null,
'analytics' => null, 'analytics' => null,
'mamoto-url' => null, 'matomo-analytics-url' => null,
'mamoto-id' => null, 'matomo-analytics-id' => null,
'allow-indexation' => true, 'allow-indexation' => true,
'home-presentation-mode' => 'GALLERIA', 'home-presentation-mode' => 'GALLERIA',
'default-subdef-url-ttl' => 7200, 'default-subdef-url-ttl' => 7200,

4
lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php
View File

@@ -38,10 +38,10 @@ class GeneralFormType extends AbstractType
$builder->add('analytics', 'text', [ $builder->add('analytics', 'text', [
'label' => 'Google Analytics identifier', 'label' => 'Google Analytics identifier',
]); ]);
$builder->add('matomo-url', 'text', [ $builder->add('matomo-analytics-url', 'text', [
'label' => 'Matomo Analytics url', 'label' => 'Matomo Analytics url',
]); ]);
$builder->add('matomo-id', 'text', [ $builder->add('matomo-analytics-id', 'text', [
'label' => 'Matomo Analytics identifier', 'label' => 'Matomo Analytics identifier',
]); ]);
$builder->add('allow-indexation', 'checkbox', [ $builder->add('allow-indexation', 'checkbox', [

2
templates/web/common/indexfloat.html.twig
View File

@@ -25,6 +25,6 @@
</div> </div>
</div> </div>
{% include 'common/analytics.html.twig' %} {% include 'common/analytics.html.twig' %}
{% include 'common/mamoto_analytics.html.twig' %} {% include 'common/matomo_analytics.html.twig' %}
</body> </body>
</html> </html>

8
templates/web/common/matomo_analytics.html.twig
View File

@@ -1,14 +1,14 @@
{% if app['conf'].get(['registry', 'general', 'matomo-url']) != '' %} {% if app['conf'].get(['registry', 'general', 'matomo-analytics-url']) != '' %}
{% if app['conf'].get(['registry', 'general', 'matomo-id']) != '' %} {% if app['conf'].get(['registry', 'general', 'matomo-analytics-id']) != '' %}
<!-- Matomo --> <!-- Matomo -->
<script type="text/javascript"> <script type="text/javascript">
var _paq = window._paq || []; var _paq = window._paq || [];
_paq.push(['trackPageView']); _paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']); _paq.push(['enableLinkTracking']);
(function() { (function() {
var u="//{{ app['conf'].get(['registry', 'general', 'matomo-url']) }}/"; var u="//{{ app['conf'].get(['registry', 'general', 'matomo-analytics-url']) }}/";
_paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', {{ app['conf'].get(['registry', 'general', 'matomo-id']) }}]); _paq.push(['setSiteId', {{ app['conf'].get(['registry', 'general', 'matomo-analytics-id']) }}]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})(); })();

2
tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-with-hosts.yml
View File

@@ -193,6 +193,8 @@ registry:
keywords: '' keywords: ''
description: '' description: ''
analytics: '' analytics: ''
matomo-analytics-url: ''
matomo-analytics-id: ''
allow-indexation: true allow-indexation: true
home-presentation-mode: COOLIRIS home-presentation-mode: COOLIRIS
modules: modules: