minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FEATURE: few mostly minor UI tweaks in admin

Browse Source
This commit is contained in:
Michal Kváček
2016-09-21 01:15:32 +02:00
parent 7d051d1f6a
commit fb977ce1b9
5 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/admin/css/vendor.css
Vendored
+1 -4
View File
@@ -14369,10 +14369,7 @@ img {
} }
.truncate { .truncate {
width: 90%; word-break: break-all;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.bold { .bold {
resources/views/admin/fileManager/filesTiles.blade.php
+8 -4
View File
@@ -7,12 +7,16 @@
</a> </a>
</div> </div>
<a href="{{route('upload.detail', ['id' => $file->id])}}"> <div>
{{str_limit($file->original_filename, 10)}} <a href="{{route('upload.detail', ['id' => $file->id])}}">
</a>``` {{str_limit($file->original_filename, 10)}}
</a>
</div>
@if(!isset($hideDelete) || !$hideDelete) @if(!isset($hideDelete) || !$hideDelete)
<a href="{{route('upload.delete', ['id' => $file->id])}}" class="btn btn-sm btn-danger confirm" <a href="{{route('upload.delete', ['id' => $file->id])}}" data-toggle="tooltip"
class="btn btn-sm rounded btn-danger confirm"
title="@lang('admin/fileManager.delete')"> title="@lang('admin/fileManager.delete')">
<i class="fa fa-trash"></i> <i class="fa fa-trash"></i>
</a> </a>
resources/views/admin/settings/overview.blade.php
+23 -18
View File
@@ -6,27 +6,32 @@
<form action="{{route('settings.save')}}" method="POST"> <form action="{{route('settings.save')}}" method="POST">
{!! csrf_field() !!} {!! csrf_field() !!}
<ul class="nav nav-tabs nav-tabs-bordered" role="tablist"> <div class="card">
@foreach($formSections as $id => $section) <div class="card-block">
<li class="nav-item"> <ul class="nav nav-pills nav-pills-bordered" role="tablist">
<a class="nav-link @if($section->getId() == reset($formSections)->getId()) active @endif" @foreach($formSections as $id => $section)
data-toggle="tab" <li class="nav-item">
href="#{{$section->getId()}}" role="tab" <a class="nav-link @if($section->getId() == reset($formSections)->getId()) active @endif"
aria-controls="{{$section->getId()}}">{{trans($section->getName())}}</a> data-toggle="tab"
</li> href="#{{$section->getId()}}" role="tab"
@endforeach aria-controls="{{$section->getId()}}">{{trans($section->getName())}}</a>
</ul> </li>
@endforeach
</ul>
<div class="tab-content tabs-bordered card"> <div class="tab-content">
@foreach($formSections as $section => $view)
@foreach($formSections as $section => $view) <div class="tab-pane fade @if($view == reset($formSections)) in active @endif" id="{{$section}}"
<div class="tab-pane @if($view == reset($formSections)) active @endif" id="{{$section}}" role="tabpanel">
role="tabpanel"> @include($view->getView())
@include($view->getView()) </div>
@endforeach
</div> </div>
@endforeach
<button type="submit" class="btn btn-primary">@lang('admin/settings.save')</button>
</div>
</div> </div>
<button type="submit" class="btn btn-primary">@lang('admin/settings.save')</button>
</form> </form>
@stop @stop
resources/views/admin/userManagement/detail.blade.php
+4 -4
View File
@@ -53,12 +53,12 @@
</div> </div>
<div class="tab-pane" id="user-edit" role="tabpanel"> <div class="tab-pane" id="user-edit" role="tabpanel">
@include('admin.userManagement.editForm') @include('admin.userManagement.editForm', ['states' => $statuses])
</div> </div>
<div class="tab-pane" id="user-actions" role="tabpanel"> <div class="tab-pane" id="user-actions" role="tabpanel">
<ul class="timeline"> @if (!empty($actions))
@if (!empty($actions)) <ul class="timeline">
<?php $odd = false; ?> <?php $odd = false; ?>
@foreach($actions as $action) @foreach($actions as $action)
@@ -79,7 +79,7 @@
</div> </div>
</li> </li>
@endforeach @endforeach
</ul> </ul>
@else @else
<div class="alert alert-info"> <div class="alert alert-info">
<em>@lang('admin/userManagement.noActions')</em> <em>@lang('admin/userManagement.noActions')</em>
resources/views/admin/userManagement/overview.blade.php
+6 -6
View File
@@ -10,12 +10,12 @@
@endsection @endsection
@section('content') @section('content')
<div class="row users-list"> <div class="row users-list sameheight-container">
@forelse($users as $user) @forelse($users as $user)
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3 "> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
<div class="card card-default "> <div class="card card-default">
<div class="card-block truncate"> <div class="card-block container truncate sameheight-item">
<div class="cl-xs-12 text-center"> <div class="col-xs-12 text-center">
<a href="{{route('users.edit', ['id' => $user->id])}}"> <a href="{{route('users.edit', ['id' => $user->id])}}">
<img src="{{$user->gravatar(100)}}" alt="" /> <img src="{{$user->gravatar(100)}}" alt="" />
</a> </a>
@@ -29,9 +29,9 @@
</div> </div>
</div> </div>
<div class="card-footer text-right"> <div class="card-footer text-right">
<a href="{{route('users.detail', ['id' => $user->id])}}" class="btn btn-secondary"><i class="fa fa-info"></i></a>
<a href="{{route('users.edit', ['id' => $user->id])}}" class="btn btn-primary"><i <a href="{{route('users.edit', ['id' => $user->id])}}" class="btn btn-primary"><i
class="fa fa-pencil edit"></i></a> class="fa fa-pencil edit"></i></a>
<a href="#" class="btn btn-danger"><i class="fa fa-trash edit"></i></a>
</div> </div>
</div> </div>
</div> </div>