kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Learned that I should not refer to env vars directly so I removed all references.

Browse Source
This commit is contained in:
James Cole
2018-12-15 07:59:02 +01:00
parent 4bd94e5450
commit c54541b839
116 changed files with 239 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/v1/layout/default.twig
View File

@@ -199,15 +199,15 @@
{% endif %}
{% block scripts %}{% endblock %}
{% if env('ANALYTICS_ID','') != '' %}
{% if config('firefly.analytics_id') != '' %}
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id={{ env('ANALYTICS_ID', 'XXX-XX-X') }}"></script>
<script async src="https://www.googletagmanager.com/gtag/js?id={{ config('firefly.analytics_id') }}"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}');
gtag('config', '{{ config('firefly.analytics_id') }}');
</script>
{% endif %}

6
resources/views/v1/layout/empty.twig
View File

@@ -41,15 +41,15 @@
</div>
<script src="v1/js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
{% if env('ANALYTICS_ID','') != '' %}
{% if config('firefly.analytics_id') != '' %}
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id={{ env('ANALYTICS_ID', 'XXX-XX-X') }}"></script>
<script async src="https://www.googletagmanager.com/gtag/js?id={{ config('firefly.analytics_id') }}"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}');
gtag('config', '{{ config('firefly.analytics_id') }}');
</script>
{% endif %}
</body>

6
resources/views/v1/layout/guest.twig
View File

@@ -50,15 +50,15 @@
</div>
<script src="v1/js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script type="text/javascript" src="v1/js/ff/guest.js?v={{ FF_VERSION }}"></script>
{% if env('ANALYTICS_ID','') != '' %}
{% if config('firefly.analytics_id') != '' %}
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id={{ env('ANALYTICS_ID', 'XXX-XX-X') }}"></script>
<script async src="https://www.googletagmanager.com/gtag/js?id={{ config('firefly.analytics_id') }}"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}');
gtag('config', '{{ config('firefly.analytics_id') }}');
</script>
{% endif %}
</body>