FEATURE: style user management
This commit is contained in:
Michal Kváček
@@ -39,7 +39,7 @@ class UserDetail extends Controller
|
|||||||
|
|
||||||
return view('admin.userManagement.detail', [
|
return view('admin.userManagement.detail', [
|
||||||
'user' => $user,
|
'user' => $user,
|
||||||
'states' => $states,
|
'statuses' => $states,
|
||||||
'roles' => $roles,
|
'roles' => $roles,
|
||||||
'actions' => $actions
|
'actions' => $actions
|
||||||
]);
|
]);
|
||||||
|
|||||||
+8479
-7244
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,7 @@ return [
|
|||||||
"deleteCustomField" => "a",
|
"deleteCustomField" => "a",
|
||||||
"deleteWidgetArea" => "Smazal plochu pro widget :name",
|
"deleteWidgetArea" => "Smazal plochu pro widget :name",
|
||||||
"draftFromContent" => "Upraven widget :name (#:id)",
|
"draftFromContent" => "Upraven widget :name (#:id)",
|
||||||
"editContent" => 'Editace stránky - nový titulek je ":title", url :url a ID #"id. Revize změny: :revision.',
|
"editContent" => 'Editace stránky - nový titulek je ":title", url :url a ID #:id. Revize změny: :revision.',
|
||||||
"editCustomField" => "a",
|
"editCustomField" => "a",
|
||||||
"editWidget" => "Upraven widget :name (#:id)",
|
"editWidget" => "Upraven widget :name (#:id)",
|
||||||
"editWidgetArea" => 'Upravena plocha pro widgety :name (#:id) s popisem ":description"',
|
"editWidgetArea" => 'Upravena plocha pro widgety :name (#:id) s popisem ":description"',
|
||||||
|
|||||||
@@ -1,29 +1,29 @@
|
|||||||
<?php
|
<?php
|
||||||
return [
|
return [
|
||||||
"actionLog" => "Záznam událostí",
|
"actionLog" => "Záznam událostí",
|
||||||
"assignWidgets" => "Přidat widget",
|
"assignWidgets" => "Přidat widget",
|
||||||
"contentPageOverview" => "Přehled",
|
"contentPageOverview" => "Přehled",
|
||||||
"contentPages" => "Stránky",
|
"contentPages" => "Stránky",
|
||||||
"customFields" => "Uživatelská pole",
|
"customFields" => "Uživatelská pole",
|
||||||
"customFieldsNew" => "Nové pole",
|
"customFieldsNew" => "Nové pole",
|
||||||
"customFieldsOverview" => "Přehled",
|
"customFieldsOverview" => "Přehled",
|
||||||
"dashboard" => "Nástěnka",
|
"dashboard" => "Nástěnka",
|
||||||
"directories" => "Adresáře",
|
"directories" => "Adresáře",
|
||||||
"fileManager" => "Správce souborů",
|
"fileManager" => "Správce souborů",
|
||||||
"newContentPage" => "Nová stránka",
|
"newContentPage" => "Nová stránka",
|
||||||
"newUser" => "Nový uživatel",
|
"newUser" => "Nový uživatel",
|
||||||
"newWidget" => "Nový widget",
|
"newWidget" => "Nový widget",
|
||||||
"newWidgetArea" => "Nová plocha",
|
"newWidgetArea" => "Nová plocha",
|
||||||
"settings" => "Nastavení",
|
"settings" => "Nastavení",
|
||||||
"templates" => "Šablony",
|
"templates" => "Šablony",
|
||||||
"uploadFile" => "Nový soubor",
|
"uploadFile" => "Nový soubor",
|
||||||
"uploadImage" => "Nový obrázek",
|
"uploadImage" => "Nový obrázek",
|
||||||
"uploadedFiles" => "Přehled",
|
"uploadedFiles" => "Přehled",
|
||||||
"userDetail" => "Detail",
|
"userDetail" => "Můj profil",
|
||||||
"userManagement" => "Uživatelé",
|
"userManagement" => "Uživatelé",
|
||||||
"usersOverview" => "Přehled",
|
"usersOverview" => "Přehled",
|
||||||
"widgetAreaOverview" => "Seznam všech ploch pro widgety",
|
"widgetAreaOverview" => "Seznam všech ploch pro widgety",
|
||||||
"widgetAreas" => "Plochy pro widgety",
|
"widgetAreas" => "Plochy pro widgety",
|
||||||
"widgets" => "Widgety",
|
"widgets" => "Widgety",
|
||||||
"widgetsOverview" => "Všechny widgety",
|
"widgetsOverview" => "Všechny widgety",
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,28 +1,28 @@
|
|||||||
<?php
|
<?php
|
||||||
return [
|
return [
|
||||||
"addNewUser" => "Přidat nového uživatele",
|
"addNewUser" => "Přidat nového uživatele",
|
||||||
"allStatuses" => "Všechny",
|
"allStatuses" => "Všechny",
|
||||||
"detail" => "Detaily uživatele :name (:email)",
|
"detail" => "Detaily uživatele :name (:email)",
|
||||||
"editUser" => "Editace uživatele :name (:email)",
|
"editUser" => "Editace uživatele :name (:email)",
|
||||||
"email" => "E-mail",
|
"email" => "E-mail",
|
||||||
"name" => "Celé jméno",
|
"name" => "Celé jméno",
|
||||||
"noActions" => "Uživatel zatím v systému nic neudělal.",
|
"noActions" => "Uživatel zatím v systému nic neudělal.",
|
||||||
"noUsers" => "Žádní uživatelé.",
|
"noUsers" => "Žádní uživatelé.",
|
||||||
"overview" => "Seznam všech uživatelů",
|
"overview" => "Seznam všech uživatelů",
|
||||||
"password" => "Heslo",
|
"password" => "Heslo",
|
||||||
"passwordLeaveEmpty" => "Nevyplňujte, pokud nechcete změnit heslo.",
|
"passwordLeaveEmpty" => "Nevyplňujte, pokud nechcete změnit heslo.",
|
||||||
"profile" => "Profil",
|
"profile" => "Profil uživatele",
|
||||||
"register" => "Vytvořit uživatele",
|
"register" => "Vytvořit uživatele",
|
||||||
"registrationSuccessfull" => "Nový úživatel úspěšně přidán.",
|
"registrationSuccessfull" => "Nový úživatel úspěšně přidán.",
|
||||||
"role_admin" => "Administrátor",
|
"role_admin" => "Administrátor",
|
||||||
"role_editor" => "Editor",
|
"role_editor" => "Editor",
|
||||||
"role_visitor" => "Návštěvník",
|
"role_visitor" => "Návštěvník",
|
||||||
"roles" => "Prosím, zvolte roli uživatele",
|
"roles" => "Prosím, zvolte roli uživatele",
|
||||||
"status" => "Stav",
|
"status" => "Stav",
|
||||||
"status_active" => "Aktivní",
|
"status_active" => "Aktivní",
|
||||||
"status_blocked" => "Zablokovaný",
|
"status_blocked" => "Zablokovaný",
|
||||||
"status_deleted" => "Smazaný",
|
"status_deleted" => "Smazaný",
|
||||||
"update" => "Upravit informace",
|
"update" => "Upravit informace",
|
||||||
"userSuccessfullyEdited" => "Uživatel úspěšně upraven.",
|
"userSuccessfullyEdited" => "Uživatel úspěšně upraven.",
|
||||||
"usersActions" => "Akce uživatele",
|
"usersActions" => "Akce uživatele",
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ return [
|
|||||||
'status_deleted' => 'Deleted',
|
'status_deleted' => 'Deleted',
|
||||||
'status_blocked' => 'Blocked',
|
'status_blocked' => 'Blocked',
|
||||||
'status_active' => 'Active',
|
'status_active' => 'Active',
|
||||||
'allStatuses' => 'All',
|
'allStatuses' => 'All',
|
||||||
'register' => 'Create user',
|
'register' => 'Create user',
|
||||||
'registrationSuccessfull' => 'New user successfully added.',
|
'registrationSuccessfull' => 'New user successfully added.',
|
||||||
'profile' => 'Your profile',
|
'profile' => 'Your profile',
|
||||||
@@ -25,5 +25,7 @@ return [
|
|||||||
'update' => 'Update informations',
|
'update' => 'Update informations',
|
||||||
'passwordLeaveEmpty' => 'Leave empty, if you do not want to change it.',
|
'passwordLeaveEmpty' => 'Leave empty, if you do not want to change it.',
|
||||||
'userSuccessfullyEdited' => 'User successfully edited.',
|
'userSuccessfullyEdited' => 'User successfully edited.',
|
||||||
'noActions' => 'There are no actions yet.',
|
'userDetail' => 'Information',
|
||||||
|
'edit' => 'Edit user',
|
||||||
|
'noActions' => 'There are no actions yet.',
|
||||||
];
|
];
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
@extends('admin.layoutWithNavigation')
|
||||||
|
|
||||||
|
@section('pageHeading', trans('admin/userManagement.profile'))
|
||||||
|
@section('pageDescription', @trans('admin/userManagement.detail', ['name' => $user->name, 'email' => $user->email]))
|
||||||
|
|
||||||
|
@section('content')
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-lg-2">
|
||||||
|
<div class="callout">
|
||||||
|
<div class="user-img text-center">
|
||||||
|
<img src="{{$user->gravatar(200)}}" alt="" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-10">
|
||||||
|
<ul class="nav nav-tabs nav-tabs-bordered" role="tablist">
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link active" data-toggle="tab" href="#user-detail" role="tab" id="user-detail-tab"
|
||||||
|
aria-controls="user-detail">
|
||||||
|
@lang('admin/userManagement.userDetail')
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#user-edit" role="tab" id="user-edit-tab"
|
||||||
|
aria-controls="user-edit">
|
||||||
|
@lang('admin/userManagement.edit')
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#user-actions" role="tab" id="user-actions-tab"
|
||||||
|
aria-controls="user-edit">
|
||||||
|
@lang('admin/userManagement.usersActions')
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div class="tab-content tabs-bordered card">
|
||||||
|
<div class="tab-pane active" id="user-detail" role="tabpanel">
|
||||||
|
<ul>
|
||||||
|
<li><strong>{{$user->name}}</strong></li>
|
||||||
|
<li>{{$user->email}}</li>
|
||||||
|
<li><em>{{$roles[$user->role]}}</em></li>
|
||||||
|
<li>{{$statuses[$user->status]}}</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="tab-pane" id="user-edit" role="tabpanel">
|
||||||
|
@include('admin.userManagement.editForm')
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="tab-pane" id="user-actions" role="tabpanel">
|
||||||
|
<ul class="timeline">
|
||||||
|
@if (!empty($actions))
|
||||||
|
<?php $odd = false; ?>
|
||||||
|
|
||||||
|
@foreach($actions as $action)
|
||||||
|
<li @if($odd) class="timeline-inverted" @endif>
|
||||||
|
<?php $odd = !$odd;?>
|
||||||
|
<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">
|
||||||
|
@date($action->created_at)
|
||||||
|
</small>
|
||||||
|
</p>
|
||||||
|
</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>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@stop
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
@extends('admin.layoutWithNavigation')
|
||||||
|
|
||||||
|
@section('pageHeading', @trans('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email]))
|
||||||
|
|
||||||
|
@section('content')
|
||||||
|
<div class="row">
|
||||||
|
@include('admin.userManagement.editForm')
|
||||||
|
</div>
|
||||||
|
@stop
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<form method="POST" action="{{route('users.editPost', ['id' => $user->id])}}">
|
||||||
|
{!! csrf_field() !!}
|
||||||
|
|
||||||
|
<input type="text" class="form-control" placeholder="@lang('admin/userManagement.name')" value="{{$user->name}}"
|
||||||
|
name="name">
|
||||||
|
<input type="text" class="form-control" name="email" value="{{$user->email}}" placeholder="somebody@example.com">
|
||||||
|
<input type="text" class="form-control"
|
||||||
|
placeholder="@lang('admin/userManagement.password') (@lang('admin/userManagement.passwordLeaveEmpty'))"
|
||||||
|
name="password"
|
||||||
|
value="">
|
||||||
|
|
||||||
|
@if (\Auth::user()->role == \App\Models\User::ROLE_ADMIN && \Auth::user()->id != $user->id)
|
||||||
|
<select class="form-control" name="role">
|
||||||
|
@foreach($roles as $role => $translation)
|
||||||
|
<option value="{{$role}}" @if($role == $user->role) selected @endif>{{$translation}}</option>
|
||||||
|
@endforeach
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<select class="form-control" name="status">
|
||||||
|
@foreach($states as $status => $translation)
|
||||||
|
<option value="{{$status}}" @if($status == $user->status) selected @endif>{{$translation}}</option>
|
||||||
|
@endforeach
|
||||||
|
</select>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<button type="submit" class="btn btn-primary">@lang('admin/userManagement.update')</button>
|
||||||
|
</form>
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
@extends('admin.layoutWithNavigation')
|
||||||
|
|
||||||
|
@section('pageName', @trans('admin/userManagement.addNewUser'))
|
||||||
|
|
||||||
|
@section('content')
|
||||||
|
|
||||||
|
<h1>@lang('admin/userManagement.addNewUser')</h1>
|
||||||
|
|
||||||
|
@if (session('success'))
|
||||||
|
<div class="callout success">
|
||||||
|
{{ session('success') }}
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if (session('error'))
|
||||||
|
<div class="callout alert">
|
||||||
|
{{ session('error') }}
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@include('admin.userManagement.newForm', ['roles' => $roles])
|
||||||
|
@stop
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
<form method="POST" action="{{route('users.newPost')}}">
|
||||||
|
{!! csrf_field() !!}
|
||||||
|
|
||||||
|
<label>
|
||||||
|
@lang('admin/userManagement.name')
|
||||||
|
<input type="text" placeholder="@lang('admin/userManagement.name')" name="name">
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label>
|
||||||
|
@lang('admin/userManagement.email')
|
||||||
|
|
||||||
|
<input type="text" name="email" placeholder="somebody@example.com">
|
||||||
|
|
||||||
|
@if (isset($errors) && $errors->has('email'))
|
||||||
|
<div class="callout alert">
|
||||||
|
{{ $errors->first('email') }}
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label>
|
||||||
|
@lang('admin/userManagement.password')
|
||||||
|
|
||||||
|
<input type="text" name="password">
|
||||||
|
|
||||||
|
@if (isset($errors) && $errors->has('password'))
|
||||||
|
<div class="callout alert">
|
||||||
|
{{ $errors->first('password') }}
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</label>
|
||||||
|
|
||||||
|
|
||||||
|
<label>
|
||||||
|
@lang('admin/userManagement.roles')
|
||||||
|
|
||||||
|
<select name="role">
|
||||||
|
@foreach($roles as $role => $translation)
|
||||||
|
<option value="{{$role}}">{{$translation}}</option>
|
||||||
|
@endforeach
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
|
||||||
|
@if (isset($errors) && $errors->has('role'))
|
||||||
|
<div class="callout alert">
|
||||||
|
{{ $errors->first('role') }}
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<label>
|
||||||
|
<button type="submit" class="button success">@lang('admin/userManagement.register')</button>
|
||||||
|
</label>
|
||||||
|
</form>
|
||||||
@@ -12,10 +12,7 @@
|
|||||||
@section('content')
|
@section('content')
|
||||||
<div class="row users-list">
|
<div class="row users-list">
|
||||||
@forelse($users as $user)
|
@forelse($users as $user)
|
||||||
|
|
||||||
|
|
||||||
<div class="col-lg-4">
|
<div class="col-lg-4">
|
||||||
|
|
||||||
<div class="card card-default">
|
<div class="card card-default">
|
||||||
<div class="row card-block">
|
<div class="row card-block">
|
||||||
<div class="col-lg-4 text-center">
|
<div class="col-lg-4 text-center">
|
||||||
@@ -41,7 +38,6 @@
|
|||||||
</div>
|
</div>
|
||||||
@empty
|
@empty
|
||||||
<div class="alert alert-info">
|
<div class="alert alert-info">
|
||||||
|
|
||||||
<em>@lang('admin/userManagement.noUsers')</em>
|
<em>@lang('admin/userManagement.noUsers')</em>
|
||||||
</div>
|
</div>
|
||||||
@endforelse
|
@endforelse
|
||||||
|
|||||||
Reference in New Issue
Block a user