First change; menu is now from sb-admin.

This commit is contained in:
James Cole
2014-09-10 06:56:57 +02:00
parent bcf71cdf85
commit 18748510b1
2 changed files with 305 additions and 87 deletions

View File

@@ -14,20 +14,30 @@
<?php echo stylesheet_link_tag(); ?> <?php echo stylesheet_link_tag(); ?>
@yield('styles') @yield('styles')
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<!-- <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
-->
<![endif]--> <![endif]-->
</head> </head>
<body> <body>
<div class="container"> <div id="wrapper">
@include('partials.menu') @include('partials.menu')
@include('partials.flashes')
@yield('content') <div id="page-wrapper">
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">Firefly <small>What's playing?</small></h1>
</div>
<!-- /.col-lg-12 -->
</div>
@include('partials.flashes')
@yield('content')
</div>
</div> </div>
<div class="modal fade" id="reminderModal" tabindex="-1" role="dialog" <div class="modal fade" id="reminderModal" tabindex="-1" role="dialog"

View File

@@ -1,80 +1,288 @@
<?php <!-- Navigation -->
$r = Route::current()->getName(); <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
?> <div class="navbar-header">
<nav class="navbar navbar-default" role="navigation"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<div class="container-fluid"> <span class="sr-only">Toggle navigation</span>
<!-- Brand and toggle get grouped for better mobile display --> <span class="icon-bar"></span>
<div class="navbar-header"> <span class="icon-bar"></span>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <span class="icon-bar"></span>
<span class="sr-only">Toggle navigation</span> </button>
<span class="icon-bar"></span> <a class="navbar-brand" href="{{route('index')}}">Firefly</a>
<span class="icon-bar"></span> </div>
<span class="icon-bar"></span> <!-- /.navbar-header -->
</button>
<a class="navbar-brand" href="{{route('index')}}">Firefly III</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling --> <ul class="nav navbar-top-links navbar-right">
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <li class="dropdown">
<ul class="nav navbar-nav"> <a class="dropdown-toggle" data-toggle="dropdown" href="#">
<li @if($r=='index')class="active"@endif><a href="{{route('index')}}">Home</a></li> <i class="fa fa-envelope fa-fw"></i> <i class="fa fa-caret-down"></i>
<li class="dropdown"> </a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Go to...<span class="caret"></span></a> <ul class="dropdown-menu dropdown-messages">
<ul class="dropdown-menu" role="menu"> <li>
<li><a href="{{route('accounts.index')}}"><span class="glyphicon glyphicon-inbox"></span> Accounts</a></li> <a href="#">
<li><a href="{{route('budgets.index')}}"><span class="glyphicon glyphicon-euro"></span> Budgets</a></li> <div>
<li><a href="{{route('categories.index')}}"><span class="glyphicon glyphicon-tags"></span> Categories</a></li> <strong>John Smith</strong>
<span class="pull-right text-muted">
<em>Yesterday</em>
</span>
</div>
<div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eleifend...</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<strong>John Smith</strong>
<span class="pull-right text-muted">
<em>Yesterday</em>
</span>
</div>
<div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eleifend...</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<strong>John Smith</strong>
<span class="pull-right text-muted">
<em>Yesterday</em>
</span>
</div>
<div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eleifend...</div>
</a>
</li>
<li class="divider"></li>
<li>
<a class="text-center" href="#">
<strong>Read All Messages</strong>
<i class="fa fa-angle-right"></i>
</a>
</li>
</ul>
<!-- /.dropdown-messages -->
</li>
<!-- /.dropdown -->
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<i class="fa fa-tasks fa-fw"></i> <i class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu dropdown-tasks">
<li>
<a href="#">
<div>
<p>
<strong>Task 1</strong>
<span class="pull-right text-muted">40% Complete</span>
</p>
<div class="progress progress-striped active">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%">
<span class="sr-only">40% Complete (success)</span>
</div>
</div>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<p>
<strong>Task 2</strong>
<span class="pull-right text-muted">20% Complete</span>
</p>
<div class="progress progress-striped active">
<div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
<span class="sr-only">20% Complete</span>
</div>
</div>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<p>
<strong>Task 3</strong>
<span class="pull-right text-muted">60% Complete</span>
</p>
<div class="progress progress-striped active">
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
<span class="sr-only">60% Complete (warning)</span>
</div>
</div>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<p>
<strong>Task 4</strong>
<span class="pull-right text-muted">80% Complete</span>
</p>
<div class="progress progress-striped active">
<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
<span class="sr-only">80% Complete (danger)</span>
</div>
</div>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a class="text-center" href="#">
<strong>See All Tasks</strong>
<i class="fa fa-angle-right"></i>
</a>
</li>
</ul>
<!-- /.dropdown-tasks -->
</li>
<!-- /.dropdown -->
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<i class="fa fa-bell fa-fw"></i> <i class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu dropdown-alerts">
<li>
<a href="#">
<div>
<i class="fa fa-comment fa-fw"></i> New Comment
<span class="pull-right text-muted small">4 minutes ago</span>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<i class="fa fa-twitter fa-fw"></i> 3 New Followers
<span class="pull-right text-muted small">12 minutes ago</span>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<i class="fa fa-envelope fa-fw"></i> Message Sent
<span class="pull-right text-muted small">4 minutes ago</span>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<i class="fa fa-tasks fa-fw"></i> New Task
<span class="pull-right text-muted small">4 minutes ago</span>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a href="#">
<div>
<i class="fa fa-upload fa-fw"></i> Server Rebooted
<span class="pull-right text-muted small">4 minutes ago</span>
</div>
</a>
</li>
<li class="divider"></li>
<li>
<a class="text-center" href="#">
<strong>See All Alerts</strong>
<i class="fa fa-angle-right"></i>
</a>
</li>
</ul>
<!-- /.dropdown-alerts -->
</li>
<!-- /.dropdown -->
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu dropdown-user">
<li><a href="#"><i class="fa fa-user fa-fw"></i> User Profile</a>
</li>
<li><a href="#"><i class="fa fa-gear fa-fw"></i> Settings</a>
</li>
<li class="divider"></li>
<li><a href="login.html"><i class="fa fa-sign-out fa-fw"></i> Logout</a>
</li>
</ul>
<!-- /.dropdown-user -->
</li>
<!-- /.dropdown -->
</ul>
<!-- /.navbar-top-links -->
<li class="divider"></li> <div class="navbar-default sidebar" role="navigation">
<li><a href="{{route('transactions.index')}}"><span class="glyphicon glyphicon-list-alt"></span> Transactions</a></li> <div class="sidebar-nav navbar-collapse">
<li><a href="{{route('recurring.index')}}"><span class="glyphicon glyphicon-refresh"></span> Recurring transactions</a></li> <ul class="nav" id="side-menu">
<li class="sidebar-search">
<li class="divider"></li> <div class="input-group custom-search-form">
<li><a href="{{route('piggybanks.index')}}"><span class="glyphicon glyphicon-save"></span> Piggy banks</a></li> <input type="text" class="form-control" placeholder="Search...">
</ul> <span class="input-group-btn">
</li> <button class="btn btn-default" type="button">
</ul> <i class="fa fa-search"></i>
<!-- the rest --> </button>
<ul class="nav navbar-nav"> </span>
</div>
<li class="dropdown"> <!-- /input-group -->
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Add ... <span class="caret"></span></a> </li>
<ul class="dropdown-menu" role="menu"> <li>
<a class="active" href="{{route('index')}}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
<li><a href="{{route('transactions.create','withdrawal')}}" title="For when you spend money"><span class="glyphicon glyphicon-arrow-left"></span> Withdrawal</a></li> </li>
<li><a href="{{route('transactions.create','deposit')}}" title="For when you earn money"><span class="glyphicon glyphicon-arrow-right"></span> Deposit</a></li> <li>
<li><a href="{{route('transactions.create','transfer')}}" title="For when you move money around"><span class="glyphicon glyphicon-resize-full"></span> Transfer</a></li> <a href="#"><i class="fa fa-bar-chart-o fa-fw"></i> Accounts<span class="fa arrow"></span></a>
</ul> <ul class="nav nav-second-level">
</li> <li>
<a href="{{route('accounts.index')}}"><i class="fa fa-bar-chart-o fa-fw"></i> Asset accounts</a>
<li class="dropdown"> </li>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Create ... <span class="caret"></span></a> <li>
<ul class="dropdown-menu" role="menu"> <a href="{{route('accounts.index')}}"><i class="fa fa-bar-chart-o fa-fw"></i> Expense accounts</a>
<li><a href="{{route('accounts.create')}}" title="Create new account"><span class="glyphicon glyphicon-inbox"></span> Account</a></li> </li>
</ul> <li>
</li> <a href="{{route('accounts.index')}}"><i class="fa fa-bar-chart-o fa-fw"></i> Revenue accounts</a>
</ul> </li>
@if(Session::get('reminderCount') == 1) </ul>
<p style="cursor:pointer;" id="reminderModalTrigger" class="navbar-text"><span class="label label-danger">1 reminder</span> </p> <!-- /.nav-second-level -->
@endif </li>
@if(Session::get('reminderCount') > 1) <li>
<p style="cursor:pointer;" id="reminderModalTrigger" class="navbar-text"><span class="label label-danger">{{Session::get('reminderCount')}} <a href="{{route('budgets.index')}}"><i class="fa fa-table fa-fw"></i> Budgets</a>
reminders</span> </p> </li>
@endif <li>
<a href="{{route('categories.index')}}"><i class="fa fa-edit fa-fw"></i> Categories</a>
@if(\Auth::user() && \Auth::check()) </li>
<ul class="nav navbar-nav navbar-right"> <li>
<li @if($r=='preferences')class="active"@endif><a href="{{route('preferences')}}"><span class="glyphicon glyphicon-cog"></span> Preferences</a></li> <a href="#"><i class="fa fa-edit fa-fw"></i> Tags</a>
<li class="dropdown"> </li>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{{Auth::user()->email}}} <span class="caret"></span></a> <li>
<ul class="dropdown-menu" role="menu"> <a href="{{route('transactions.index')}}"><i class="fa fa-edit fa-fw"></i> Transactions (sub?)</a>
<li><a href="{{route('profile')}}"><span class="glyphicon glyphicon-user"></span> Profile</a></li> </li>
<li class="divider"></li> <li>
<li><a href="{{route('logout')}}"><span class="glyphicon glyphicon-arrow-right"></span> Logout</a></li> <a href="#"><i class="fa fa-wrench fa-fw"></i> Money management<span class="fa arrow"></span></a>
</ul> <ul class="nav nav-second-level">
</li> <li>
</ul> <a href="{{route('piggybanks.index')}}">Piggy banks</a>
@endif </li>
</div><!-- /.navbar-collapse --> <li>
</div><!-- /.container-fluid --> <a href="{{route('recurring.index')}}">Recurring transactions</a>
</nav> </li>
<li>
<a href="{{route('piggybanks.index')}}">Repeated expenses</a>
</li>
</ul>
<!-- /.nav-second-level -->
</li>
</ul>
</div>
<!-- /.sidebar-collapse -->
</div>
<!-- /.navbar-static-side -->
</nav>