Time-based navigation and some feedback for the user as to his import.

This commit is contained in:
James Cole
2014-09-14 21:09:52 +02:00
parent 49b8742082
commit 4f3493f9ff
8 changed files with 277 additions and 12 deletions

View File

@@ -61,6 +61,20 @@
</div>
<div class="col-lg-4 col-md-6 col-sm-12">
<!-- time based navigation -->
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa fa-clock-o fa-fw"></i>
{{{\Session::get('period')}}}
</div>
<div class="panel-body">
<div class="btn-group btn-group-sm btn-group-justified">
<a class="btn btn-default" href="{{route('sessionPrev')}}"><i class="fa fa-arrow-left"></i> {{{\Session::get('prev')}}}</a>
<a class="btn btn-default" href="{{route('sessionNext')}}">{{{\Session::get('next')}}} <i class="fa fa-arrow-right"></i></a>
</div>
</div>
</div>
<!-- TRANSACTIONS -->
@foreach($transactions as $data)
<div class="panel panel-default">

View File

@@ -12,7 +12,40 @@
<!-- /.navbar-header -->
<ul class="nav navbar-top-links navbar-right">
<li class="dropdown">
<!-- /.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>
<!-- display for import tasks, possibly others -->
@if(Session::has('job_pct'))
<ul class="dropdown-menu dropdown-tasks">
<li>
<a href="#">
<div>
<p>
<strong>Import from Firefly II</strong>
<span class="pull-right text-muted">{{Session::get('job_pct')}}% Complete</span>
</p>
<div class="progress progress-striped active">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{Session::get('job_pct')}}" aria-valuemin="0" aria-valuemax="100" style="width: {{Session::get('job_pct')}}%">
<span class="sr-only">{{Session::get('job_pct')}}% Complete (success)</span>
</div>
</div>
<p>
<small>Finished ~ {{Session::get('job_text')}}</small>
</p>
</div>
</a>
</li>
</ul>
<!-- /.dropdown-tasks -->
</li>
@endif
<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>

View File

@@ -1,6 +1,5 @@
@extends('layouts.guest')
@section('content')
<div class="row">
<div class="col-md-4 col-md-offset-4">
<div class="login-panel panel panel-default">