Skip to content

Commit

Permalink
Upgrading StartBootstrap 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@antonioribeiro
antonioribeiro committed Jul 21, 2014
1 parent 0aa96fc commit a57d994
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 34 deletions.
2 changes: 1 addition & 1 deletion readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ You don't need to use a different database, but, since Tracker may generate a hu

To use the stats panel on your website you'll need to download the sb-admin 2 sources to your public folder:

wget --output-document=/tmp/sba2.zip http://startbootstrap.com/downloads/sb-admin-v2.zip
wget --output-document=/tmp/sba2.zip http://startbootstrap.com/downloads/sb-admin-2.zip
unzip /tmp/sba2.zip -d public/templates/

And enabled in your config file:
Expand Down
2 changes: 1 addition & 1 deletion src/config/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
/**
* Stats Panel template path
*/
'stats_template_path' => '/templates/sb-admin-v2',
'stats_template_path' => '/templates/sb-admin-2',

/**
* Stats Panel base uri.
Expand Down
56 changes: 24 additions & 32 deletions src/views/layout.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,34 @@

<title>Laravel Stats Tracker</title>

<script src="{{ $stats_template_path }}/js/jquery-1.11.0.js"></script>

@yield('required-scripts-top')

<!-- Core CSS - Include with every page -->
<link href="{{ $stats_template_path }}/css/bootstrap.min.css" rel="stylesheet">
<link href="{{ $stats_template_path }}/font-awesome/css/font-awesome.css" rel="stylesheet">
<link href="{{ $stats_template_path }}/font-awesome-4.1.0/css/font-awesome.min.css" rel="stylesheet">
<link href="{{ $stats_template_path }}/css/plugins/metisMenu/metisMenu.min.css" rel="stylesheet">

<!-- Page-Level Plugin CSS - Dashboard -->
<link href="{{ $stats_template_path }}/css/plugins/morris/morris-0.4.3.min.css" rel="stylesheet">
<link href="{{ $stats_template_path }}/css/plugins/timeline/timeline.css" rel="stylesheet">
<link href="{{ $stats_template_path }}/css/plugins/morris.css" rel="stylesheet">
<link href="{{ $stats_template_path }}/css/plugins/timeline.css" rel="stylesheet">

<!-- SB Admin CSS - Include with every page -->
<link href="{{ $stats_template_path }}/css/sb-admin.css" rel="stylesheet">
<link href="{{ $stats_template_path }}/css/sb-admin-2.css" rel="stylesheet">

<link
rel="stylesheet"
type="text/css"
href="https://cloud.github.com/downloads/lafeber/world-flags-sprite/flags16.css"
/>

<script src="{{ $stats_template_path }}/js/jquery-1.10.2.js"></script>
</head>

<body>

<div id="wrapper">

<nav class="navbar navbar-default navbar-fixed-top" role="navigation" style="margin-bottom: 0">
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-collapse">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
Expand All @@ -43,7 +44,7 @@
</div>
<!-- /.navbar-header -->

<ul class="nav navbar-top-links navbar-right navbar-nav">
<ul class="nav navbar-top-links navbar-right navbar-nav">
<li {{ Session::get('tracker.stats.days') == '0' ? 'class="active"' : '' }}>
<a href="{{route('tracker.stats.index')}}?days=0">Today</a>
</li>
Expand All @@ -66,23 +67,23 @@
</ul>
<!-- /.navbar-top-links -->

<div class="navbar-default navbar-static-side" role="navigation">
<div class="sidebar-collapse">
<ul class="nav" id="side-menu">
<div class="navbar-default sidebar" role="navigation">
<div class="sidebar-nav navbar-collapse">
<ul class="nav" id="side-menu">
<li>
<a href="{{route('tracker.stats.index')}}?page=visits" ><i class="fa fa-dashboard fa-fw"></i> Visits <span class="{{ Session::get('tracker.stats.page') =='visits' ? 'fa arrow' : '' }}"></span></a>
<a href="{{route('tracker.stats.index')}}?page=visits" class="{{ Session::get('tracker.stats.page') =='visits' ? 'active' : '' }}" ><i class="fa fa-dashboard fa-fw"></i> Visits <span class="{{ Session::get('tracker.stats.page') =='visits' ? 'fa arrow' : '' }}"></span></a>
</li>
<li>
<a href="{{route('tracker.stats.index')}}?page=summary"><i class="fa fa-bar-chart-o fa-fw"></i> Summary <span class="{{ Session::get('tracker.stats.page') =='summary' ? 'fa arrow' : '' }}"></span></a>
<a href="{{route('tracker.stats.index')}}?page=summary" class="{{ Session::get('tracker.stats.page') =='summary' ? 'active' : '' }}"><i class="fa fa-bar-chart-o fa-fw"></i> Summary <span class="{{ Session::get('tracker.stats.page') =='summary' ? 'fa arrow' : '' }}"></span></a>
</li>
<li>
<a href="{{route('tracker.stats.index')}}?page=users"><i class="fa fa-user fa-fw"></i> Users <span class="{{ Session::get('tracker.stats.page') =='users' ? 'fa arrow' : '' }}"></span></a>
<a href="{{route('tracker.stats.index')}}?page=users" class="{{ Session::get('tracker.stats.page') =='users' ? 'active' : '' }}"><i class="fa fa-user fa-fw"></i> Users <span class="{{ Session::get('tracker.stats.page') =='users' ? 'fa arrow' : '' }}"></span></a>
</li>
<li>
<a href="{{route('tracker.stats.index')}}?page=events"><i class="fa fa-bolt fa-fw"></i> Events <span class="{{ Session::get('tracker.stats.page') =='events' ? 'fa arrow' : '' }}"></span></a>
<a href="{{route('tracker.stats.index')}}?page=events" class="{{ Session::get('tracker.stats.page') =='events' ? 'active' : '' }}"><i class="fa fa-bolt fa-fw"></i> Events <span class="{{ Session::get('tracker.stats.page') =='events' ? 'fa arrow' : '' }}"></span></a>
</li>
<li>
<a href="{{route('tracker.stats.index')}}?page=errors"><i class="fa fa-exclamation fa-fw"></i>Errors <span class="{{ Session::get('tracker.stats.page') =='errors' ? 'fa arrow' : '' }}"></span></a>
<a href="{{route('tracker.stats.index')}}?page=errors" class="{{ Session::get('tracker.stats.page') =='errors' ? 'active' : '' }}"><i class="fa fa-exclamation fa-fw"></i>Errors <span class="{{ Session::get('tracker.stats.page') =='errors' ? 'fa arrow' : '' }}"></span></a>
</li>
</ul>
<!-- /#side-menu -->
Expand Down Expand Up @@ -118,24 +119,15 @@

<!-- Core Scripts - Include with every page -->
<script src="{{ $stats_template_path }}/js/bootstrap.min.js"></script>
<script src="{{ $stats_template_path }}/js/plugins/metisMenu/jquery.metisMenu.js"></script>

<!-- Page-Level Plugin Scripts - Main -->
<script src="{{ $stats_template_path }}/js/plugins/morris/raphael-2.1.0.min.js"></script>
<script src="{{ $stats_template_path }}/js/plugins/morris/morris.js"></script>

<!-- Page-Level Plugin Scripts - Flot -->
<!--[if lte IE 8]><script src="{{ $stats_template_path }}/js/excanvas.min.js"></script><![endif]-->
<script src="{{ $stats_template_path }}/js/plugins/flot/jquery.flot.js"></script>
<script src="{{ $stats_template_path }}/js/plugins/flot/jquery.flot.tooltip.min.js"></script>
<script src="{{ $stats_template_path }}/js/plugins/flot/jquery.flot.resize.js"></script>
<script src="{{ $stats_template_path }}/js/plugins/flot/jquery.flot.pie.js"></script>
<script src="{{ $stats_template_path }}/js/plugins/metisMenu/metisMenu.min.js"></script>

<!-- SB Admin Scripts - Include with every page -->
<script src="{{ $stats_template_path }}/js/sb-admin.js"></script>
<script src="{{ $stats_template_path }}/js/sb-admin-2.js"></script>

<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.7.0/moment.min.js"></script>

@yield('required-scripts-bottom')

<script>
@yield('inline-javascript')
</script>
Expand Down
14 changes: 14 additions & 0 deletions src/views/summary.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
@section('inline-javascript')
jQuery(function()
{
console.log(jQuery('#pageViews'));

var pageViews = Morris.Bar({
element: 'pageViews',
grid: false,
Expand Down Expand Up @@ -76,3 +78,15 @@
});
@stop

@section('required-scripts-top')
<!-- Page-Level Plugin Scripts - Main -->
<script src="{{ $stats_template_path }}/js/plugins/morris/raphael.min.js"></script>
<script src="{{ $stats_template_path }}/js/plugins/morris/morris.min.js"></script>

<!-- Page-Level Plugin Scripts - Flot -->
<!--[if lte IE 8]><script src="{{ $stats_template_path }}/js/excanvas.min.js"></script><![endif]-->
<script src="{{ $stats_template_path }}/js/plugins/flot/jquery.flot.js"></script>
<script src="{{ $stats_template_path }}/js/plugins/flot/jquery.flot.tooltip.min.js"></script>
<script src="{{ $stats_template_path }}/js/plugins/flot/jquery.flot.resize.js"></script>
<script src="{{ $stats_template_path }}/js/plugins/flot/jquery.flot.pie.js"></script>
@stop
9 changes: 9 additions & 0 deletions upgrading.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Laravel Stats Tracker Upgrading Guide

## to 0.6.0

A massive updgrade happened at StartBootstrap, you need to download and unzip the admin frontend again:

```
wget --output-document=/tmp/sba2.zip http://startbootstrap.com/downloads/sb-admin-2.zip
unzip /tmp/sba2.zip -d public/templates/
```

## to 0.5.1

####As `tracker_route_paths.route_id` column was wrongly set to string, you need to change it to int8 or bigint. This is how you do this
Expand Down

0 comments on commit a57d994

Please sign in to comment.