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

Some new code + GA

Browse Source
This commit is contained in:
James Cole
2015-03-31 19:21:49 +02:00
parent f8a5fb4225
commit e11e53913a
13 changed files with 84 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
resources/views/layouts/default.blade.php
View File

@@ -121,19 +121,31 @@
<script type="text/javascript" src="js/daterangepicker.js"></script>
<script type="text/javascript">
var start = "{{Session::get('start')->format('d-m-Y')}}";
var end = "{{Session::get('end')->format('d-m-Y')}}";
var titleString = "{{Session::get('start')->format('j M Y')}} - {{Session::get('end')->format('j M Y')}}";
var start = "{{Session::get('start', new Carbon\Carbon)->format('d-m-Y')}}";
var end = "{{Session::get('end', new Carbon\Carbon)->format('d-m-Y')}}";
var titleString = "{{Session::get('start', new Carbon\Carbon)->format('j M Y')}} - {{Session::get('end', new Carbon\Carbon)->format('j M Y')}}";
var dateRangeURL = "{{route('daterange')}}";
var token = "{{csrf_token()}}";
var firstDate = moment("{{Session::get('first')->format('Y-m-d')}}");
var currentMonthName = "{{$currentMonthName}}";
var previousMonthName = "{{$previousMonthName}}";
var nextMonthName = "{{$nextMonthName}}";
var firstDate = moment("{{Session::get('first', new Carbon\Carbon)->format('Y-m-d')}}");
var currentMonthName = "{{isset($currentMonthName) ? $currentMonthName : 'Month'}}";
var previousMonthName = "{{isset($previousMonthName) ? $previousMonthName : 'Month'}}";
var nextMonthName = "{{isset($nextMonthName) ? $nextMonthName : 'Month'}}";
$('#daterange span').text(titleString);
</script>
<script type="text/javascript" src="js/firefly.js"></script>
@yield('scripts')
<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', '<?php echo env('ANALYTICS_ID', 'XXX-XX-X'); ?>', 'auto');
ga('send', 'pageview');
</script>
</body>
</html>

2
resources/views/partials/menu.blade.php
View File

@@ -18,7 +18,7 @@
<ul class="nav navbar-top-links navbar-right">
<!-- reminders -->
@if($reminders->count() > 0)
@if(isset($reminders) && $reminders->count() > 0)
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" aria-expanded="false">
<i class="fa fa-envelope fa-fw"></i> <i class="fa fa-caret-down"></i>