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

FEATURE #1359: some minor changes in styling and layout

Browse Source
This commit is contained in:
Michal Kváček
2016-01-24 20:44:43 +01:00
parent 8fcc5d041c
commit 83f0ca08a1
4 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/lang/en/admin/userManagement.php
+2 -1
View File
@@ -17,6 +17,7 @@ return [
'detail' => 'Details of user :name (:email)', 'detail' => 'Details of user :name (:email)',
'editUser' => 'Editing user :name (:email)', 'editUser' => 'Editing user :name (:email)',
'usersActions' => 'User\'s actions', 'usersActions' => 'User\'s actions',
'update' => 'Update informations' 'update' => 'Update informations',
'passwordLeaveEmpty' => 'Leave empty, if you do not want to change it.'
]; ];
resources/views/admin/userManagement/detail.blade.php
+2 -2
View File
@@ -10,7 +10,7 @@
<div class="columns large-4"> <div class="columns large-4">
<div class="callout"> <div class="callout">
<div class="user-img text-center"> <div class="user-img text-center">
<img src="{{$user->gravatar(350)}}" alt="" /> <img src="{{$user->gravatar(200)}}" alt="" />
</div> </div>
<div class="user-detail text-center"> <div class="user-detail text-center">
<ul> <ul>
@@ -32,7 +32,7 @@
<div class="columns large-8"> <div class="columns large-8">
<div class="callout"> <div class="callout">
<h3>@lang('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email])</h3> <h3>@lang('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email])</h3>
@include('admin.userManagement.editForm', ['roles' => []]) @include('admin.userManagement.editForm')
</div> </div>
</div> </div>
</div> </div>
resources/views/admin/userManagement/edit.blade.php
+15 -13
View File
@@ -1,22 +1,24 @@
@extends('admin.layout') @extends('admin.layout')
@section('pageName', @trans('admin/userManagement.editUser')) @section('pageName', @trans('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email]))
@section('content') @section('content')
<h1>@lang('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email])</h1> <div class="row">
<h1>@lang('admin/userManagement.editUser', ['name' => str_limit($user->name, 20), 'email' => $user->email])</h1>
@if (session('success')) @if (session('success'))
<div class="callout success"> <div class="callout success">
{{ session('success') }} {{ session('success') }}
</div> </div>
@endif @endif
@if (session('error')) @if (session('error'))
<div class="callout alert"> <div class="callout alert">
{{ session('error') }} {{ session('error') }}
</div> </div>
@endif @endif
@include('admin.userManagement.editForm', ['roles' => $roles, 'user' => $user]) @include('admin.userManagement.editForm')
</div>
@stop @stop
resources/views/admin/userManagement/editForm.blade.php
+19 -21
View File
@@ -1,6 +1,8 @@
<form method="POST" action="{{route('users.newPost')}}"> <form method="POST" action="{{route('users.newPost')}}">
{!! csrf_field() !!} {!! csrf_field() !!}
<input type="hidden" value="{{$user->id}}" name="userId" />
<label> <label>
@lang('admin/userManagement.name') @lang('admin/userManagement.name')
<input type="text" placeholder="@lang('admin/userManagement.name')" value="{{$user->name}}" name="name"> <input type="text" placeholder="@lang('admin/userManagement.name')" value="{{$user->name}}" name="name">
@@ -19,32 +21,28 @@
</label> </label>
<label> <label>
@lang('admin/userManagement.password') @lang('admin/userManagement.password') <em>(@lang('admin/userManagement.passwordLeaveEmpty'))</em>
<input type="text" name="password"> <input type="text" name="password" value="">
</label>
@if (isset($errors) && $errors->has('password'))
@if (\Auth::user()->role == \App\Models\User::ROLE_ADMIN)
<label>
@lang('admin/userManagement.roles')
<select name="role">
@foreach($roles as $role => $translation)
<option value="{{$role}}" @if($role == $user->role) selected @endif>@lang($translation)</option>
@endforeach
</select>
</label>
@if (isset($errors) && $errors->has('role'))
<div class="callout alert"> <div class="callout alert">
{{ $errors->first('password') }} {{ $errors->first('role') }}
</div> </div>
@endif @endif
</label>
<label>
@lang('admin/userManagement.roles')
<select name="role">
@foreach($roles as $role => $translation)
<option value="{{$role}}" @if($role == $user->role) selected @endif>@lang($translation)</option>
@endforeach
</select>
</label>
@if (isset($errors) && $errors->has('role'))
<div class="callout alert">
{{ $errors->first('role') }}
</div>
@endif @endif
<label> <label>