IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reimplemented GA code. [skip ci]

Browse Source
This commit is contained in:
James Cole 2015-06-26 05:19:11 +02:00
parent 14934367d8
commit 765152d04b
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
resources/twig/layout/default.twig
View File

@ -13,12 +13,12 @@
</title> </title>
<base href="{{ route('index') }}/"> <base href="{{ route('index') }}/">
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'> <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" /> <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" /> <link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
<link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" /> <link href="dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
<link href="dist/css/skins/skin-blue-light.min.css" rel="stylesheet" type="text/css" /> <link href="dist/css/skins/skin-blue-light.min.css" rel="stylesheet" type="text/css"/>
<link href="css/daterangepicker-bs3.css" rel="stylesheet" type="text/css" /> <link href="css/daterangepicker-bs3.css" rel="stylesheet" type="text/css"/>
<link href="css/firefly.css" rel="stylesheet" type="text/css" /> <link href="css/firefly.css" rel="stylesheet" type="text/css"/>
{% block styles %}{% endblock %} {% block styles %}{% endblock %}
<!--[if lt IE 9]> <!--[if lt IE 9]>
@ -77,7 +77,7 @@
<!-- search form --> <!-- search form -->
<form action="{{ route('search') }}" method="get" class="sidebar-form"> <form action="{{ route('search') }}" method="get" class="sidebar-form">
<div class="input-group"> <div class="input-group">
<input type="text" name="q" class="form-control" placeholder="Search..." value="{{ query }}" /> <input type="text" name="q" class="form-control" placeholder="Search..." value="{{ query }}"/>
<span class="input-group-btn"> <span class="input-group-btn">
<button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button> <button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button>
</span> </span>
@ -105,8 +105,10 @@
<!-- actual content --> <!-- actual content -->
{% block content %}{% endblock %} {% block content %}{% endblock %}
</section><!-- /.content --> </section>
</div><!-- /.content-wrapper --> <!-- /.content -->
</div>
<!-- /.content-wrapper -->
<footer class="main-footer"> <footer class="main-footer">
<div class="pull-right hidden-xs"> <div class="pull-right hidden-xs">
@ -117,7 +119,8 @@
{% include('partials/control-bar.twig') %} {% include('partials/control-bar.twig') %}
</div><!-- ./wrapper --> </div>
<!-- ./wrapper -->
<!-- Modal --> <!-- Modal -->
@ -159,6 +162,28 @@
<script type="text/javascript" src="js/firefly.js"></script> <script type="text/javascript" src="js/firefly.js"></script>
{% block scripts %}{% endblock %} {% block scripts %}{% endblock %}
<script>
(function (i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function () {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
ga('send', 'pageview');
// send an event if relevant:
{% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %}
ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}');
{% endif %}
{% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %}
ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}', '{{ Session.get('gaEventLabel') }}');
{% endif %}
</script>
</body> </body>
</html> </html>

11
resources/twig/layout/guest.twig
View File

@ -59,16 +59,15 @@
a.src = g; a.src = g;
m.parentNode.insertBefore(a, m) m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', 'auto');
ga('send', 'pageview'); ga('send', 'pageview');
// send an event if relevant: // send an event if relevant:
{% if Session.has('gaEventCategory') and Session.has('gaEventAction') %} {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %}
ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}'); ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}');
{% endif %} {% endif %}
{% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %}
ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}','{{ Session.get('gaEventLabel') }}');
{% endif %}
</script> </script>
</body> </body>
</html> </html>