diff --git a/resources/assets/admin/css/vendor.css b/resources/assets/admin/css/vendor.css index 8e25735d..a1a072a0 100644 --- a/resources/assets/admin/css/vendor.css +++ b/resources/assets/admin/css/vendor.css @@ -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; +} \ No newline at end of file diff --git a/resources/assets/admin/js/app.js b/resources/assets/admin/js/app.js index faea5bd0..dde0296d 100644 --- a/resources/assets/admin/js/app.js +++ b/resources/assets/admin/js/app.js @@ -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); diff --git a/resources/views/admin/actionLog/overview.blade.php b/resources/views/admin/actionLog/overview.blade.php new file mode 100644 index 00000000..90a056e4 --- /dev/null +++ b/resources/views/admin/actionLog/overview.blade.php @@ -0,0 +1,36 @@ +@extends('admin.layoutWithNavigation') + +@section('pageHeading', @trans('admin/actionLog.overview')) + +@section('content') + @if (!empty($actions)) + + @else +
+ @lang('admin/userManagement.noActions') +
+ @endif + +
+ {!! $actions->render() !!} +
+@stop \ No newline at end of file diff --git a/resources/views/admin/userManagement/detail.blade.php b/resources/views/admin/userManagement/detail.blade.php index 162d673a..35058ee8 100644 --- a/resources/views/admin/userManagement/detail.blade.php +++ b/resources/views/admin/userManagement/detail.blade.php @@ -63,12 +63,9 @@
-

{{$action->name}}

-

- +

{{$action->name}} @date($action->created_at) - -

+

{!! $action->value !!}