Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-08-29 13:42:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated remaining views to 2017 design update.

Browse Source 
Also fixed issue with duplicate confirmation email.
This commit is contained in:
Dan Brown 2017-08-26 17:17:04 +01:00
parent 36f524a354
commit 4cb4c9e568
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
20 changed files with 835 additions and 832 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Auth/RegisterController.php
View File

@ -231,7 +231,6 @@ class RegisterController extends Controller
return redirect('/register/confirm'); return redirect('/register/confirm');
} }
$this->emailConfirmationService->sendConfirmation($user);
session()->flash('success', trans('auth.email_confirm_resent')); session()->flash('success', trans('auth.email_confirm_resent'));
return redirect('/register/confirm'); return redirect('/register/confirm');
} }

2
app/Services/SearchService.php
View File

@ -92,7 +92,7 @@ class SearchService
return [ return [
'total' => $total, 'total' => $total,
'count' => count($results), 'count' => count($results),
'results' => $results->sortByDesc('score') 'results' => $results->sortByDesc('score')->values()
]; ];
} }

4
resources/assets/sass/_forms.scss
View File

@ -237,8 +237,8 @@ div[editor-type="markdown"] .title-input.page-title input[type="text"] {
padding: 0; padding: 0;
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
left: 7px; left: 8px;
top: 7px; top: 9.5px;
} }
input { input {
display: block; display: block;

6
resources/assets/sass/_text.scss
View File

@ -378,12 +378,6 @@ span.sep {
display: block; display: block;
} }
.action-header {
h1 {
margin-top: $-m;
}
}
/** /**
* Icons * Icons
*/ */

6
resources/views/auth/register-confirm.blade.php
View File

@ -9,10 +9,12 @@
@section('content') @section('content')
<div class="text-center"> <div class="text-center">
<div class="center-box"> <div class="card center-box">
<h2>{{ trans('auth.register_thanks') }}</h2> <h3><i class="zmdi zmdi-accounts"></i> {{ trans('auth.register_thanks') }}</h3>
<div class="body">
<p>{{ trans('auth.register_confirm', ['appName' => setting('app-name')]) }}</p> <p>{{ trans('auth.register_confirm', ['appName' => setting('app-name')]) }}</p>
</div> </div>
</div> </div>
</div>
@stop @stop

10
resources/views/auth/user-unconfirmed.blade.php
View File

@ -2,9 +2,11 @@
@section('content') @section('content')
<div class="row"> <div class="container small">
<div class="col-md-6 col-md-offset-3"> <p>&nbsp;</p>
<h2>{{ trans('auth.email_not_confirmed') }}</h2> <div class="card">
<h3><i class="zmdi zmdi-accounts"></i> {{ trans('auth.email_not_confirmed') }}</h3>
<div class="body">
<p class="text-muted">{{ trans('auth.email_not_confirmed_text') }}<br> <p class="text-muted">{{ trans('auth.email_not_confirmed_text') }}<br>
{{ trans('auth.email_not_confirmed_click_link') }} <br> {{ trans('auth.email_not_confirmed_click_link') }} <br>
{{ trans('auth.email_not_confirmed_resend') }} {{ trans('auth.email_not_confirmed_resend') }}
@ -27,4 +29,6 @@
</div> </div>
</div> </div>
</div>
@stop @stop

2
resources/views/partials/activity-list.blade.php
View File

@ -8,5 +8,5 @@
@endforeach @endforeach
</div> </div>
@else @else
<p class="text-muted">{{ trans('common.no_activity') }}</p> <p class="text-muted empty-text">{{ trans('common.no_activity') }}</p>
@endif @endif

57
resources/views/search/all.blade.php
View File

@ -1,39 +1,23 @@
@extends('base') @extends('sidebar-layout')
@section('content') @section('toolbar')
<input type="hidden" name="searchTerm" value="{{$searchTerm}}">
<div id="search-system">
<div class="faded-small toolbar">
<div class="container">
<div class="row">
<div class="col-sm-12 faded"> <div class="col-sm-12 faded">
<div class="breadcrumbs"> <div class="breadcrumbs">
<a href="{{ baseUrl("/search?term=" . urlencode($searchTerm)) }}" class="text-button"><i class="zmdi zmdi-search"></i>{{ trans('entities.search_for_term', ['term' => $searchTerm]) }}</a> <a href="{{ baseUrl("/search?term=" . urlencode($searchTerm)) }}" class="text-button"><i class="zmdi zmdi-search"></i>{{ trans('entities.search_for_term', ['term' => $searchTerm]) }}</a>
</div> </div>
</div> </div>
</div> @stop
</div>
</div>
<div class="container" ng-non-bindable id="searchSystem"> @section('container-attrs')
id="search-system"
ng-non-bindable=""
@stop
<div class="row"> @section('sidebar')
<div class="card">
<div class="col-md-6">
<h1>{{ trans('entities.search_results') }}</h1>
<h6 class="text-muted">{{ trans_choice('entities.search_total_results_found', $totalResults, ['count' => $totalResults]) }}</h6>
@include('partials/entity-list', ['entities' => $entities])
@if ($hasNextPage)
<a href="{{ $nextPageLink }}" class="button">{{ trans('entities.search_more') }}</a>
@endif
</div>
<div class="col-md-5 col-md-offset-1">
<h3>{{ trans('entities.search_filters') }}</h3> <h3>{{ trans('entities.search_filters') }}</h3>
<div class="body">
<form v-on:submit="updateSearch" v-cloak class="v-cloak anim fadeIn"> <form v-on:submit="updateSearch" v-cloak class="v-cloak anim fadeIn">
<h6 class="text-muted">{{ trans('entities.search_content_type') }}</h6> <h6 class="text-muted">{{ trans('entities.search_content_type') }}</h6>
<div class="form-group"> <div class="form-group">
@ -200,14 +184,21 @@
<button type="submit" class="button primary">{{ trans('entities.search_update') }}</button> <button type="submit" class="button primary">{{ trans('entities.search_update') }}</button>
</form> </form>
</div> </div>
</div> </div>
@stop
</div> @section('body')
</div>
<div class="container small">
<input type="hidden" name="searchTerm" value="{{$searchTerm}}">
<h1>{{ trans('entities.search_results') }}</h1>
<h6 class="text-muted">{{ trans_choice('entities.search_total_results_found', $totalResults, ['count' => $totalResults]) }}</h6>
@include('partials/entity-list', ['entities' => $entities])
@if ($hasNextPage)
<a href="{{ $nextPageLink }}" class="button">{{ trans('entities.search_more') }}</a>
@endif
</div>
@stop @stop

45
resources/views/settings/index.blade.php
View File

@ -1,18 +1,22 @@
@extends('base') @extends('simple-layout')
@section('content')
@section('toolbar')
@include('settings/navbar', ['selected' => 'settings']) @include('settings/navbar', ['selected' => 'settings'])
@stop
<div class="container small settings-container"> @section('body')
<div class="container small">
<h1>{{ trans('settings.settings') }}</h1> <div class="text-right text-muted container">
<br>
BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
</div>
<div class="card">
<h3><i class="zmdi zmdi-settings-square"></i> {{ trans('settings.app_settings') }}</h3>
<div class="body">
<form action="{{ baseUrl("/settings") }}" method="POST"> <form action="{{ baseUrl("/settings") }}" method="POST">
{!! csrf_field() !!} {!! csrf_field() !!}
<h3>{{ trans('settings.app_settings') }}</h3>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
@ -77,9 +81,20 @@
<textarea name="setting-app-custom-head" id="setting-app-custom-head">{{ setting('app-custom-head', '') }}</textarea> <textarea name="setting-app-custom-head" id="setting-app-custom-head">{{ setting('app-custom-head', '') }}</textarea>
</div> </div>
<hr class="margin-top"> <div class="form-group text-right">
<button type="submit" class="button pos">{{ trans('settings.settings_save') }}</button>
</div>
</form>
</div>
</div>
<h3>{{ trans('settings.reg_settings') }}</h3> <p>&nbsp;</p>
<div class="card">
<h3><i class="zmdi zmdi-accounts-add"></i> {{ trans('settings.reg_settings') }}</h3>
<div class="body">
<form action="{{ baseUrl("/settings") }}" method="POST">
{!! csrf_field() !!}
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
@ -114,15 +129,13 @@
</div> </div>
</div> </div>
<hr class="margin-top"> <div class="form-group text-right">
<div class="form-group">
<span class="float right muted">
BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
</span>
<button type="submit" class="button pos">{{ trans('settings.settings_save') }}</button> <button type="submit" class="button pos">{{ trans('settings.settings_save') }}</button>
</div> </div>
</form> </form>
</div>
</div>
</div> </div>

6
resources/views/settings/navbar.blade.php
View File

@ -1,7 +1,4 @@
<div class="faded-small toolbar">
<div class="container">
<div class="row">
<div class="col-md-12 setting-nav nav-tabs"> <div class="col-md-12 setting-nav nav-tabs">
@if($currentUser->can('settings-manage')) @if($currentUser->can('settings-manage'))
<a href="{{ baseUrl('/settings') }}" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>{{ trans('settings.settings') }}</a> <a href="{{ baseUrl('/settings') }}" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>{{ trans('settings.settings') }}</a>
@ -13,6 +10,3 @@
<a href="{{ baseUrl('/settings/roles') }}" @if($selected == 'roles') class="selected text-button" @endif><i class="zmdi zmdi-lock-open"></i>{{ trans('settings.roles') }}</a> <a href="{{ baseUrl('/settings/roles') }}" @if($selected == 'roles') class="selected text-button" @endif><i class="zmdi zmdi-lock-open"></i>{{ trans('settings.roles') }}</a>
@endif @endif
</div> </div>
</div>
</div>
</div>

16
resources/views/settings/roles/create.blade.php
View File

@ -1,15 +1,17 @@
@extends('base') @extends('simple-layout')
@section('content')
@section('toolbar')
@include('settings/navbar', ['selected' => 'roles']) @include('settings/navbar', ['selected' => 'roles'])
@stop
<div class="container"> @section('body')
<h1>{{ trans('settings.role_create') }}</h1>
<form action="{{ baseUrl("/settings/roles/new") }}" method="POST"> <form action="{{ baseUrl("/settings/roles/new") }}" method="POST">
@include('settings/roles/form') <div class="container">
</form> <div class="row">
@include('settings/roles/form', ['title' => trans('settings.role_create'), 'icon' => 'plus'])
</div> </div>
</div>
</form>
@stop @stop

18
resources/views/settings/roles/delete.blade.php
View File

@ -1,11 +1,15 @@
@extends('base') @extends('simple-layout')
@section('content')
@section('toolbar')
@include('settings/navbar', ['selected' => 'roles']) @include('settings/navbar', ['selected' => 'roles'])
@stop
@section('body')
<div class="container small" ng-non-bindable> <div class="container small" ng-non-bindable>
<h1>{{ trans('settings.role_delete') }}</h1> <p>&nbsp;</p>
<div class="card">
<h3><i class="zmdi zmdi-delete"></i> {{ trans('settings.role_delete') }}</h3>
<div class="body">
<p>{{ trans('settings.role_delete_confirm', ['roleName' => $role->display_name]) }}</p> <p>{{ trans('settings.role_delete_confirm', ['roleName' => $role->display_name]) }}</p>
<form action="{{ baseUrl("/settings/roles/delete/{$role->id}") }}" method="POST"> <form action="{{ baseUrl("/settings/roles/delete/{$role->id}") }}" method="POST">
@ -20,9 +24,13 @@
@endif @endif
<p class="text-neg">{{ trans('settings.role_delete_sure') }}</p> <p class="text-neg">{{ trans('settings.role_delete_sure') }}</p>
<a href="{{ baseUrl("/settings/roles/{$role->id}") }}" class="button muted">{{ trans('common.cancel') }}</a> <div class="form-group">
<a href="{{ baseUrl("/settings/roles/{$role->id}") }}" class="button outline">{{ trans('common.cancel') }}</a>
<button type="submit" class="button neg">{{ trans('common.confirm') }}</button> <button type="submit" class="button neg">{{ trans('common.confirm') }}</button>
</div>
</form> </form>
</div> </div>
</div>
</div>
@stop @stop

25
resources/views/settings/roles/edit.blade.php
View File

@ -1,24 +1,17 @@
@extends('base') @extends('simple-layout')
@section('content')
@section('toolbar')
@include('settings/navbar', ['selected' => 'roles']) @include('settings/navbar', ['selected' => 'roles'])
@stop
<div class="container"> @section('body')
<div class="row">
<div class="col-sm-6">
<h1>{{ trans('settings.role_edit') }}</h1>
</div>
<div class="col-sm-6">
<p></p>
<a href="{{ baseUrl("/settings/roles/delete/{$role->id}") }}" class="button neg float right">{{ trans('settings.role_delete') }}</a>
</div>
</div>
<form action="{{ baseUrl("/settings/roles/{$role->id}") }}" method="POST"> <form action="{{ baseUrl("/settings/roles/{$role->id}") }}" method="POST">
<input type="hidden" name="_method" value="PUT"> <input type="hidden" name="_method" value="PUT">
@include('settings/roles/form', ['model' => $role]) <div class="container">
</form> <div class="row">
@include('settings/roles/form', ['model' => $role, 'title' => trans('settings.role_edit'), 'icon' => 'edit'])
</div> </div>
</div>
</form>
@stop @stop

30
resources/views/settings/roles/form.blade.php
View File

@ -1,11 +1,12 @@
{!! csrf_field() !!} {!! csrf_field() !!}
<div class="row">
<div class="col-md-9"> <div class="col-md-9">
<div class="card">
<h3><i class="zmdi zmdi-{{$icon}}"></i> {{$title}}</h3>
<div class="body">
<div class="row"> <div class="row">
<div class="col-md-5"> <div class="col-md-5">
<h3>{{ trans('settings.role_details') }}</h3> <h5>{{ trans('settings.role_details') }}</h5>
<div class="form-group"> <div class="form-group">
<label for="name">{{ trans('settings.role_name') }}</label> <label for="name">{{ trans('settings.role_name') }}</label>
@include('form/text', ['name' => 'display_name']) @include('form/text', ['name' => 'display_name'])
@ -14,7 +15,7 @@
<label for="name">{{ trans('settings.role_desc') }}</label> <label for="name">{{ trans('settings.role_desc') }}</label>
@include('form/text', ['name' => 'description']) @include('form/text', ['name' => 'description'])
</div> </div>
<h3>{{ trans('settings.role_system') }}</h3> <h5>{{ trans('settings.role_system') }}</h5>
<label>@include('settings/roles/checkbox', ['permission' => 'users-manage']) {{ trans('settings.role_manage_users') }}</label> <label>@include('settings/roles/checkbox', ['permission' => 'users-manage']) {{ trans('settings.role_manage_users') }}</label>
<label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) {{ trans('settings.role_manage_roles') }}</label> <label>@include('settings/roles/checkbox', ['permission' => 'user-roles-manage']) {{ trans('settings.role_manage_roles') }}</label>
<label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-all']) {{ trans('settings.role_manage_entity_permissions') }}</label> <label>@include('settings/roles/checkbox', ['permission' => 'restrictions-manage-all']) {{ trans('settings.role_manage_entity_permissions') }}</label>
@ -24,7 +25,7 @@
<div class="col-md-6"> <div class="col-md-6">
<h3>{{ trans('settings.role_asset') }}</h3> <h5>{{ trans('settings.role_asset') }}</h5>
<p>{{ trans('settings.role_asset_desc') }}</p> <p>{{ trans('settings.role_asset_desc') }}</p>
<table class="table"> <table class="table">
@ -133,12 +134,20 @@
</table> </table>
</div> </div>
</div> </div>
<a href="{{ baseUrl("/settings/roles") }}" class="button muted">{{ trans('common.cancel') }}</a> <div class="form-group text-right">
<a href="{{ baseUrl("/settings/roles") }}" class="button outline">{{ trans('common.cancel') }}</a>
@if (isset($role) && $role->id)
<a href="{{ baseUrl("/settings/roles/delete/{$role->id}") }}" class="button neg">{{ trans('settings.role_delete') }}</a>
@endif
<button type="submit" class="button pos">{{ trans('settings.role_save') }}</button> <button type="submit" class="button pos">{{ trans('settings.role_save') }}</button>
</div> </div>
</div>
</div>
</div>
<div class="col-md-3"> <div class="col-md-3">
<h3>{{ trans('settings.role_users') }}</h3> <div class="card">
<h3><i class="zmdi zmdi-accounts"></i> {{ trans('settings.role_users') }}</h3>
<div class="body">
@if(isset($role) && count($role->users) > 0) @if(isset($role) && count($role->users) > 0)
<table class="list-table"> <table class="list-table">
@foreach($role->users as $user) @foreach($role->users as $user)
@ -161,9 +170,6 @@
{{ trans('settings.role_users_none') }} {{ trans('settings.role_users_none') }}
</p> </p>
@endif @endif
</div> </div>
</div>
</div> </div>

29
resources/views/settings/roles/index.blade.php
View File

@ -1,21 +1,16 @@
@extends('base') @extends('simple-layout')
@section('content')
@section('toolbar')
@include('settings/navbar', ['selected' => 'roles']) @include('settings/navbar', ['selected' => 'roles'])
@stop
@section('body')
<div class="container small"> <div class="container small">
<p>&nbsp;</p>
<div class="row action-header"> <div class="card">
<div class="col-sm-8"> <h3><i class="zmdi zmdi-lock-open"></i> {{ trans('settings.role_user_roles') }}</h3>
<h1>{{ trans('settings.role_user_roles') }}</h1> <div class="body">
</div>
<div class="col-sm-4">
<p></p>
<a href="{{ baseUrl("/settings/roles/new") }}" class="button float right pos"><i class="zmdi zmdi-lock-open"></i>{{ trans('settings.role_create') }}</a>
</div>
</div>
<table class="table"> <table class="table">
<tr> <tr>
<th>{{ trans('settings.role_name') }}</th> <th>{{ trans('settings.role_name') }}</th>
@ -30,6 +25,12 @@
</tr> </tr>
@endforeach @endforeach
</table> </table>
<div class="form-group">
<a href="{{ baseUrl("/settings/roles/new") }}" class="button pos">{{ trans('settings.role_create') }}</a>
</div>
</div>
</div>
</div> </div>
@stop @stop

31
resources/views/users/create.blade.php
View File

@ -1,31 +1,26 @@
@extends('base') @extends('simple-layout')
@section('toolbar')
@include('settings/navbar', ['selected' => 'users'])
@stop
@section('content') @section('body')
<div class="faded-small toolbar">
<div class="container">
<div class="row">
<div class="col-sm-12 faded">
<div class="breadcrumbs">
<a href="{{ baseUrl('/settings/users') }}" class="text-button"><i class="zmdi zmdi-accounts"></i>{{ trans('settings.users') }}</a>
</div>
</div>
</div>
</div>
</div>
<div class="container small" ng-non-bindable> <div class="container small" ng-non-bindable>
<h1>{{ trans('settings.users_add_new') }}</h1> <p>&nbsp;</p>
<div class="card">
<h3><i class="zmdi zmdi-accounts-add"></i> {{ trans('settings.users_add_new') }}</h3>
<div class="body">
<form action="{{ baseUrl("/settings/users/create") }}" method="post"> <form action="{{ baseUrl("/settings/users/create") }}" method="post">
{!! csrf_field() !!} {!! csrf_field() !!}
@include('users/forms/' . $authMethod) @include('users/forms/' . $authMethod)
<div class="form-group"> <div class="form-group text-right">
<a href="{{ baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button muted">{{ trans('common.cancel') }}</a> <a href="{{ baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button outline">{{ trans('common.cancel') }}</a>
<button class="button pos" type="submit">{{ trans('common.save') }}</button> <button class="button pos" type="submit">{{ trans('common.save') }}</button>
</div> </div>
</form> </form>
</div> </div>
</div>
</div>
@stop @stop

29
resources/views/users/delete.blade.php
View File

@ -1,32 +1,27 @@
@extends('base') @extends('simple-layout')
@section('content') @section('toolbar')
@include('settings/navbar', ['selected' => 'users'])
@stop
<div class="faded-small toolbar"> @section('body')
<div class="container">
<div class="row">
<div class="col-sm-12 faded">
<div class="breadcrumbs">
<a href="{{ baseUrl("/settings/users") }}" class="text-button"><i class="zmdi zmdi-accounts"></i>Users</a>
<span class="sep">&raquo;</span>
<a href="{{ baseUrl("/settings/users/{$user->id}") }}" class="text-button"><i class="zmdi zmdi-account"></i>{{ $user->name }}</a>
</div>
</div>
</div>
</div>
</div>
<div class="container small" ng-non-bindable> <div class="container small" ng-non-bindable>
<h1>{{ trans('settings.users_delete') }}</h1> <p>&nbsp;</p>
<div class="card">
<h3><i class="zmdi zmdi-delete"></i> {{ trans('settings.users_delete') }}</h3>
<div class="body">
<p>{{ trans('settings.users_delete_warning', ['userName' => $user->name]) }}</p> <p>{{ trans('settings.users_delete_warning', ['userName' => $user->name]) }}</p>
<p class="text-neg">{{ trans('settings.users_delete_confirm') }}</p> <p class="text-neg">{{ trans('settings.users_delete_confirm') }}</p>
<form action="{{ baseUrl("/settings/users/{$user->id}") }}" method="POST"> <form action="{{ baseUrl("/settings/users/{$user->id}") }}" method="POST">
{!! csrf_field() !!} {!! csrf_field() !!}
<input type="hidden" name="_method" value="DELETE"> <input type="hidden" name="_method" value="DELETE">
<a href="{{ baseUrl("/settings/users/{$user->id}") }}" class="button muted">{{ trans('common.cancel') }}</a> <a href="{{ baseUrl("/settings/users/{$user->id}") }}" class="button outline">{{ trans('common.cancel') }}</a>
<button type="submit" class="button neg">{{ trans('common.confirm') }}</button> <button type="submit" class="button neg">{{ trans('common.confirm') }}</button>
</form> </form>
</div> </div>
</div>
</div>
@stop @stop

46
resources/views/users/edit.blade.php
View File

@ -1,23 +1,17 @@
@extends('base') @extends('simple-layout')
@section('content')
@section('toolbar')
@include('settings/navbar', ['selected' => 'users']) @include('settings/navbar', ['selected' => 'users'])
@stop
@section('body')
<div class="container small"> <div class="container small">
<p>&nbsp;</p>
<div class="card">
<h3><i class="zmdi-edit zmdi"></i> {{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h3>
<div class="body">
<form action="{{ baseUrl("/settings/users/{$user->id}") }}" method="post"> <form action="{{ baseUrl("/settings/users/{$user->id}") }}" method="post">
<div class="row">
<div class="col-sm-8">
<h1>{{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h1>
</div>
<div class="col-sm-4">
<p></p>
@if($authMethod !== 'system')
<a href="{{ baseUrl("/settings/users/{$user->id}/delete") }}" class="neg button float right">{{ trans('settings.users_delete') }}</a>
@endif
</div>
</div>
<div class="row"> <div class="row">
<div class="col-sm-6" ng-non-bindable> <div class="col-sm-6" ng-non-bindable>
{!! csrf_field() !!} {!! csrf_field() !!}
@ -51,20 +45,26 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group text-right">
<a href="{{ baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button muted">{{ trans('common.cancel') }}</a> <a href="{{ baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button outline">{{ trans('common.cancel') }}</a>
@if($authMethod !== 'system')
<a href="{{ baseUrl("/settings/users/{$user->id}/delete") }}" class="neg button">{{ trans('settings.users_delete') }}</a>
@endif
<button class="button pos" type="submit">{{ trans('common.save') }}</button> <button class="button pos" type="submit">{{ trans('common.save') }}</button>
</div> </div>
</form> </form>
</div>
<hr class="margin-top large"> </div>
@if($currentUser->id === $user->id && count($activeSocialDrivers) > 0) @if($currentUser->id === $user->id && count($activeSocialDrivers) > 0)
<h3>{{ trans('settings.users_social_accounts') }}</h3> <div class="card">
<h3><i class="zmdi zmdi-sign-in"></i> {{ trans('settings.users_social_accounts') }}</h3>
<div class="body">
<p class="text-muted">{{ trans('settings.users_social_accounts_info') }}</p> <p class="text-muted">{{ trans('settings.users_social_accounts_info') }}</p>
<div class="container">
<div class="row"> <div class="row">
@foreach($activeSocialDrivers as $driver => $enabled) @foreach($activeSocialDrivers as $driver => $enabled)
<div class="col-sm-3 col-xs-6 text-center"> <div class="col-sm-4 col-xs-6 text-center">
<div>@icon($driver, ['width' => 56])</div> <div>@icon($driver, ['width' => 56])</div>
<div> <div>
@if($user->hasSocialAccount($driver)) @if($user->hasSocialAccount($driver))
@ -73,9 +73,13 @@
<a href="{{ baseUrl("/login/service/{$driver}") }}" class="button pos">{{ trans('settings.users_social_connect') }}</a> <a href="{{ baseUrl("/login/service/{$driver}") }}" class="button pos">{{ trans('settings.users_social_connect') }}</a>
@endif @endif
</div> </div>
<div>&nbsp;</div>
</div> </div>
@endforeach @endforeach
</div> </div>
</div>
</div>
</div>
@endif @endif

43
resources/views/users/index.blade.php
View File

@ -1,38 +1,31 @@
@extends('base') @extends('simple-layout')
@section('content')
@section('toolbar')
@include('settings/navbar', ['selected' => 'users']) @include('settings/navbar', ['selected' => 'users'])
@stop
@section('body')
<div class="container small" ng-non-bindable> <div class="container small" ng-non-bindable>
<div class="row action-header"> <p>&nbsp;</p>
<div class="col-sm-8"> <div class="card">
<h1>{{ trans('settings.users') }}</h1> <h3><i class="zmdi zmdi-accounts"></i> {{ trans('settings.users') }}</h3>
</div> <div class="body">
<div class="col-sm-4"> <div class="container">
<p></p>
@if(userCan('users-manage'))
<a href="{{ baseUrl("/settings/users/create") }}" class="pos button float right"><i class="zmdi zmdi-account-add"></i>{{ trans('settings.users_add_new') }}</a>
@endif
</div>
</div>
<div class="row"> <div class="row">
<div class="col-sm-8">
<div class="compact">
{{ $users->links() }}
</div>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<form method="get" class="float right" action="{{ baseUrl("/settings/users") }}"> <form method="get" action="{{ baseUrl("/settings/users") }}">
@foreach(collect($listDetails)->except('search') as $name => $val) @foreach(collect($listDetails)->except('search') as $name => $val)
<input type="hidden" name="{{ $name }}" value="{{ $val }}"> <input type="hidden" name="{{ $name }}" value="{{ $val }}">
@endforeach @endforeach
<input type="text" name="search" placeholder="{{ trans('settings.users_search') }}" @if($listDetails['search']) value="{{$listDetails['search']}}" @endif> <input type="text" name="search" placeholder="{{ trans('settings.users_search') }}" @if($listDetails['search']) value="{{$listDetails['search']}}" @endif>
</form> </form>
</div> </div>
<div class="col-sm-8 text-right">
@if(userCan('users-manage'))
<a href="{{ baseUrl("/settings/users/create") }}" style="margin-top: 0;" class="pos button">{{ trans('settings.users_add_new') }}</a>
@endif
</div>
</div>
</div> </div>
<table class="table"> <table class="table">
@ -75,6 +68,10 @@
<div> <div>
{{ $users->links() }} {{ $users->links() }}
</div> </div>
</div>
</div>
</div> </div>
@stop @stop

31
resources/views/users/profile.blade.php
View File

@ -1,10 +1,23 @@
@extends('base') @extends('sidebar-layout')
@section('content') @section('toolbar')
<div class="col-sm-6 col-xs-1 faded">
<div class="breadcrumbs">
<a href="{{ $user->getProfileUrl() }}" class="text-button"><i class="zmdi zmdi-account"></i>{{ $user->name }}</a>
</div>
</div>
@stop
<div class="container" ng-non-bindable> @section('sidebar')
<div class="row"> <div class="card" id="recent-activity">
<div class="col-sm-7"> <h3><i class="zmdi zmdi-time"></i> {{ trans('entities.recent_activity') }}</h3>
@include('partials/activity-list', ['activity' => $activity])
</div>
@stop
@section('body')
<div class="container small" ng-non-bindable>
<div class="padded-top large"></div> <div class="padded-top large"></div>
@ -65,13 +78,5 @@
@endif @endif
</div> </div>
<div class="col-sm-4 col-sm-offset-1" id="recent-activity">
<h3>{{ trans('entities.recent_activity') }}</h3>
@include('partials/activity-list', ['activity' => $activity])
</div>
</div>
</div>
@stop @stop