FEATURE: add action log in bootstrap

This commit is contained in:
Michal Kváček
2016-09-04 03:08:58 +02:00
parent 418d9ac4ca
commit 79ec8e1d2e
4 changed files with 68 additions and 17 deletions
+26 -12
View File
@@ -14190,8 +14190,8 @@ img {
}
.timeline > li {
/*margin-bottom: 0px;*/
position: relative;
}
.timeline > li:before,
@@ -14204,15 +14204,6 @@ img {
clear: both;
}
.timeline > li:before,
.timeline > li:after {
content: " ";
display: table;
}
.timeline > li:after {
clear: both;
}
.timeline > li > .timeline-panel {
width: 46%;
@@ -14223,6 +14214,7 @@ img {
-webkit-box-shadow: 0 1px 6px rgba(0, 0, 0, 0.175);
border: 1px solid #D4D4D4;
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.175);
background: #FFF;
}
.timeline > li > .timeline-panel:before {
@@ -14262,9 +14254,22 @@ img {
z-index: 100;
border-radius: 50%;
}
.timeline > li.timeline-inverted {
margin-top: -70px;
.timeline > li > .timeline-badge.big {
width: 40px;
height: 40px;
top: 23px;
margin-left: -20px;
}
.timeline > li {
margin-top: -25px;
}
.timeline > li:first-child {
margin-top: 0;
}
.timeline > li.timeline-inverted > .timeline-panel {
float: right;
}
@@ -14350,3 +14355,12 @@ img {
height: 100%;
bottom: 0;
}
.pagination {
list-style: none;
}
.pagination li {
display: inline;
padding: .5em;
}
+4
View File
@@ -1430,6 +1430,10 @@ $ (document).ready (function () {
target.val (slugify (source.val (), true));
});
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
// find if any error occured and mark tab with that error
$('.has-error').each(function () {
var error = $(this);
@@ -0,0 +1,36 @@
@extends('admin.layoutWithNavigation')
@section('pageHeading', @trans('admin/actionLog.overview'))
@section('content')
@if (!empty($actions))
<ul class="timeline">
<?php $odd = false; ?>
@foreach($actions as $action)
<li @if($odd) class="timeline-inverted" @endif>
<?php $odd = !$odd;?>
<div class="timeline-badge big" style="background: url('{{\App\Helpers\Gravatar::img($action->email, 40)}}') no-repeat center center" data-toggle="tooltip" data-placement="top" title="{{$action->user_name}} {{$action->email}}"></div>
<div class="timeline-panel">
<div class="timeline-heading">
<h5 class="timeline-title">{{$action->name}} <small class="text-muted">
@date($action->created_at)
</small></h5>
</div>
<div class="timeline-body">
<p>{!! $action->value !!}</p>
</div>
</div>
</li>
@endforeach
</ul>
@else
<div class="alert alert-info">
<em>@lang('admin/userManagement.noActions')</em>
</div>
@endif
<div class="row text-center">
{!! $actions->render() !!}
</div>
@stop
@@ -63,12 +63,9 @@
<div class="timeline-badge"></div>
<div class="timeline-panel">
<div class="timeline-heading">
<h4 class="timeline-title">{{$action->name}}</h4>
<p>
<small class="text-muted">
<h5 class="timeline-title">{{$action->name}} <small class="text-muted">
@date($action->created_at)
</small>
</p>
</small></h5>
</div>
<div class="timeline-body">
<p>{!! $action->value !!}</p>