FEATURE: make user management nicer
This commit is contained in:
Michal Kváček
@@ -8,9 +8,13 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-2">
|
||||
<div class="callout">
|
||||
<div class="user-img text-center">
|
||||
<img src="{{$user->gravatar(200)}}" alt="" />
|
||||
</div>
|
||||
<figure class="user-img text-center figure">
|
||||
<img class="img-rounded" src="{{$user->gravatar(200)}}" alt="" />
|
||||
|
||||
@if($user->id == Auth::user()->id)
|
||||
<figcaption class="figure-caption">@lang('admin/userManagement.gravatarLink')</figcaption>
|
||||
@endif
|
||||
</figure>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-10">
|
||||
@@ -63,9 +67,11 @@
|
||||
<div class="timeline-badge"></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h5 class="timeline-title">{{$action->name}} <small class="text-muted">
|
||||
<h5 class="timeline-title">{{$action->name}}
|
||||
<small class="text-muted">
|
||||
@date($action->created_at)
|
||||
</small></h5>
|
||||
</small>
|
||||
</h5>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>{!! $action->value !!}</p>
|
||||
|
||||
@@ -1,26 +1,61 @@
|
||||
<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">
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<label class="label-control">
|
||||
@lang('admin/userManagement.name')
|
||||
</label>
|
||||
|
||||
<input type="text" class="form-control" placeholder="@lang('admin/userManagement.name')"
|
||||
value="{{$user->name}}"
|
||||
name="name">
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<label class="label-control">
|
||||
@lang('admin/userManagement.email')
|
||||
</label>
|
||||
<input type="text" class="form-control" name="email" value="{{$user->email}}"
|
||||
placeholder="somebody@example.com">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<label class="label-control">
|
||||
@lang('admin/userManagement.password') (@lang('admin/userManagement.passwordLeaveEmpty'))
|
||||
</label>
|
||||
<input type="text" class="form-control"
|
||||
placeholder="@lang('admin/userManagement.password') (@lang('admin/userManagement.passwordLeaveEmpty'))"
|
||||
placeholder="@lang('admin/userManagement.password')"
|
||||
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>
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
|
||||
<select class="form-control" name="status">
|
||||
@foreach($states as $status => $translation)
|
||||
<option value="{{$status}}" @if($status == $user->status) selected @endif>{{$translation}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
<label class="label-control">
|
||||
@lang('admin/userManagement.roles')
|
||||
</label>
|
||||
|
||||
<select class="form-control" name="role">
|
||||
@foreach($roles as $role => $translation)
|
||||
<option value="{{$role}}" @if($role == $user->role) selected @endif>{{$translation}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-lg-6">
|
||||
<label class="label-control">
|
||||
@lang('admin/userManagement.status')
|
||||
</label>
|
||||
<select class="form-control" name="status">
|
||||
@foreach($states as $status => $translation)
|
||||
<option value="{{$status}}"
|
||||
@if($status == $user->status) selected @endif>{{$translation}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<button type="submit" class="btn btn-primary">@lang('admin/userManagement.update')</button>
|
||||
|
||||
@@ -1,22 +1,7 @@
|
||||
@extends('admin.layoutWithNavigation')
|
||||
|
||||
@section('pageName', @trans('admin/userManagement.addNewUser'))
|
||||
@section('pageHeading', @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
|
||||
@@ -1,54 +1,43 @@
|
||||
<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')
|
||||
<div class="row">
|
||||
<div class="col-lg-6"><label class="label-control">
|
||||
@lang('admin/userManagement.name')
|
||||
</label>
|
||||
|
||||
<input type="text" name="email" placeholder="somebody@example.com">
|
||||
<input class="form-control" type="text" placeholder="@lang('admin/userManagement.name')" name="name"></div>
|
||||
<div class="col-lg-6">
|
||||
<label class="label-control">
|
||||
@lang('admin/userManagement.email')
|
||||
</label>
|
||||
|
||||
@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') }}
|
||||
<input class="form-control" type="text" name="email" placeholder="somebody@example.com">
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<label>
|
||||
<button type="submit" class="button success">@lang('admin/userManagement.register')</button>
|
||||
</label>
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<label class="label-control">
|
||||
@lang('admin/userManagement.password')
|
||||
</label>
|
||||
|
||||
<input class="form-control" type="password" name="password">
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<label class="label-control">
|
||||
@lang('admin/userManagement.roles')
|
||||
</label>
|
||||
|
||||
<select class="form-control" name="role">
|
||||
@foreach($roles as $role => $translation)
|
||||
<option value="{{$role}}">{{$translation}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<button type="submit" class="btn btn-primary">@lang('admin/userManagement.register')</button>
|
||||
</form>
|
||||
Reference in New Issue
Block a user