mirror of
https://github.com/BookStackApp/BookStack.git
synced 2025-05-01 23:19:51 +00:00
Updated remaining views to 2017 design update.
Also fixed issue with duplicate confirmation email.
This commit is contained in:
Dan Brown
parent
36f524a354
commit
4cb4c9e568
20 changed files with 835 additions and 832 deletions
|
|
@ -231,7 +231,6 @@ class RegisterController extends Controller
|
|||
return redirect('/register/confirm');
|
||||
}
|
||||
|
||||
$this->emailConfirmationService->sendConfirmation($user);
|
||||
session()->flash('success', trans('auth.email_confirm_resent'));
|
||||
return redirect('/register/confirm');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ class SearchService
|
|||
return [
|
||||
'total' => $total,
|
||||
'count' => count($results),
|
||||
'results' => $results->sortByDesc('score')
|
||||
'results' => $results->sortByDesc('score')->values()
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -237,8 +237,8 @@ div[editor-type="markdown"] .title-input.page-title input[type="text"] {
|
|||
padding: 0;
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
left: 7px;
|
||||
top: 7px;
|
||||
left: 8px;
|
||||
top: 9.5px;
|
||||
}
|
||||
input {
|
||||
display: block;
|
||||
|
|
|
|||
|
|
@ -378,12 +378,6 @@ span.sep {
|
|||
display: block;
|
||||
}
|
||||
|
||||
.action-header {
|
||||
h1 {
|
||||
margin-top: $-m;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Icons
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -9,10 +9,12 @@
|
|||
@section('content')
|
||||
|
||||
<div class="text-center">
|
||||
<div class="center-box">
|
||||
<h2>{{ trans('auth.register_thanks') }}</h2>
|
||||
<div class="card center-box">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -2,9 +2,11 @@
|
|||
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6 col-md-offset-3">
|
||||
<h2>{{ trans('auth.email_not_confirmed') }}</h2>
|
||||
<div class="container small">
|
||||
<p> </p>
|
||||
<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>
|
||||
{{ trans('auth.email_not_confirmed_click_link') }} <br>
|
||||
{{ trans('auth.email_not_confirmed_resend') }}
|
||||
|
|
@ -27,4 +29,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -8,5 +8,5 @@
|
|||
@endforeach
|
||||
</div>
|
||||
@else
|
||||
<p class="text-muted">{{ trans('common.no_activity') }}</p>
|
||||
<p class="text-muted empty-text">{{ trans('common.no_activity') }}</p>
|
||||
@endif
|
||||
|
|
@ -1,39 +1,23 @@
|
|||
@extends('base')
|
||||
@extends('sidebar-layout')
|
||||
|
||||
@section('content')
|
||||
|
||||
<input type="hidden" name="searchTerm" value="{{$searchTerm}}">
|
||||
|
||||
<div id="search-system">
|
||||
|
||||
<div class="faded-small toolbar">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
@section('toolbar')
|
||||
<div class="col-sm-12 faded">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
<div class="container" ng-non-bindable id="searchSystem">
|
||||
@section('container-attrs')
|
||||
id="search-system"
|
||||
ng-non-bindable=""
|
||||
@stop
|
||||
|
||||
<div class="row">
|
||||
|
||||
<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">
|
||||
@section('sidebar')
|
||||
<div class="card">
|
||||
<h3>{{ trans('entities.search_filters') }}</h3>
|
||||
|
||||
<div class="body">
|
||||
<form v-on:submit="updateSearch" v-cloak class="v-cloak anim fadeIn">
|
||||
<h6 class="text-muted">{{ trans('entities.search_content_type') }}</h6>
|
||||
<div class="form-group">
|
||||
|
|
@ -200,14 +184,21 @@
|
|||
|
||||
<button type="submit" class="button primary">{{ trans('entities.search_update') }}</button>
|
||||
</form>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
||||
@section('body')
|
||||
|
||||
<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
|
||||
|
|
@ -1,18 +1,22 @@
|
|||
@extends('base')
|
||||
|
||||
@section('content')
|
||||
@extends('simple-layout')
|
||||
|
||||
@section('toolbar')
|
||||
@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">
|
||||
{!! csrf_field() !!}
|
||||
|
||||
<h3>{{ trans('settings.app_settings') }}</h3>
|
||||
|
||||
<div class="row">
|
||||
|
||||
<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>
|
||||
</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> </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="col-md-6">
|
||||
|
|
@ -114,15 +129,13 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<hr class="margin-top">
|
||||
|
||||
<div class="form-group">
|
||||
<span class="float right muted">
|
||||
BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
|
||||
</span>
|
||||
<div class="form-group text-right">
|
||||
<button type="submit" class="button pos">{{ trans('settings.settings_save') }}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
|
||||
<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'))
|
||||
<a href="{{ baseUrl('/settings') }}" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>{{ trans('settings.settings') }}</a>
|
||||
@endif
|
||||
|
|
@ -12,7 +9,4 @@
|
|||
@if($currentUser->can('user-roles-manage'))
|
||||
<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
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,15 +1,17 @@
|
|||
@extends('base')
|
||||
|
||||
@section('content')
|
||||
@extends('simple-layout')
|
||||
|
||||
@section('toolbar')
|
||||
@include('settings/navbar', ['selected' => 'roles'])
|
||||
@stop
|
||||
|
||||
<div class="container">
|
||||
<h1>{{ trans('settings.role_create') }}</h1>
|
||||
@section('body')
|
||||
|
||||
<form action="{{ baseUrl("/settings/roles/new") }}" method="POST">
|
||||
@include('settings/roles/form')
|
||||
</form>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
@include('settings/roles/form', ['title' => trans('settings.role_create'), 'icon' => 'plus'])
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -1,11 +1,15 @@
|
|||
@extends('base')
|
||||
|
||||
@section('content')
|
||||
@extends('simple-layout')
|
||||
|
||||
@section('toolbar')
|
||||
@include('settings/navbar', ['selected' => 'roles'])
|
||||
@stop
|
||||
|
||||
@section('body')
|
||||
<div class="container small" ng-non-bindable>
|
||||
<h1>{{ trans('settings.role_delete') }}</h1>
|
||||
<p> </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>
|
||||
|
||||
<form action="{{ baseUrl("/settings/roles/delete/{$role->id}") }}" method="POST">
|
||||
|
|
@ -20,9 +24,13 @@
|
|||
@endif
|
||||
|
||||
<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>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -1,24 +1,17 @@
|
|||
@extends('base')
|
||||
|
||||
@section('content')
|
||||
@extends('simple-layout')
|
||||
|
||||
@section('toolbar')
|
||||
@include('settings/navbar', ['selected' => 'roles'])
|
||||
@stop
|
||||
|
||||
<div class="container">
|
||||
<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>
|
||||
@section('body')
|
||||
|
||||
<form action="{{ baseUrl("/settings/roles/{$role->id}") }}" method="POST">
|
||||
<input type="hidden" name="_method" value="PUT">
|
||||
@include('settings/roles/form', ['model' => $role])
|
||||
</form>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
@include('settings/roles/form', ['model' => $role, 'title' => trans('settings.role_edit'), 'icon' => 'edit'])
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</form>
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{!! 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="col-md-5">
|
||||
<h3>{{ trans('settings.role_details') }}</h3>
|
||||
<h5>{{ trans('settings.role_details') }}</h5>
|
||||
<div class="form-group">
|
||||
<label for="name">{{ trans('settings.role_name') }}</label>
|
||||
@include('form/text', ['name' => 'display_name'])
|
||||
|
|
@ -14,7 +15,7 @@
|
|||
<label for="name">{{ trans('settings.role_desc') }}</label>
|
||||
@include('form/text', ['name' => 'description'])
|
||||
</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' => '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>
|
||||
|
|
@ -24,7 +25,7 @@
|
|||
|
||||
<div class="col-md-6">
|
||||
|
||||
<h3>{{ trans('settings.role_asset') }}</h3>
|
||||
<h5>{{ trans('settings.role_asset') }}</h5>
|
||||
<p>{{ trans('settings.role_asset_desc') }}</p>
|
||||
|
||||
<table class="table">
|
||||
|
|
@ -133,12 +134,20 @@
|
|||
</table>
|
||||
</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>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h3>{{ trans('settings.role_users') }}</h3>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<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)
|
||||
<table class="list-table">
|
||||
@foreach($role->users as $user)
|
||||
|
|
@ -161,9 +170,6 @@
|
|||
{{ trans('settings.role_users_none') }}
|
||||
</p>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,21 +1,16 @@
|
|||
@extends('base')
|
||||
|
||||
@section('content')
|
||||
@extends('simple-layout')
|
||||
|
||||
@section('toolbar')
|
||||
@include('settings/navbar', ['selected' => 'roles'])
|
||||
@stop
|
||||
|
||||
@section('body')
|
||||
|
||||
<div class="container small">
|
||||
|
||||
<div class="row action-header">
|
||||
<div class="col-sm-8">
|
||||
<h1>{{ trans('settings.role_user_roles') }}</h1>
|
||||
</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>
|
||||
|
||||
<p> </p>
|
||||
<div class="card">
|
||||
<h3><i class="zmdi zmdi-lock-open"></i> {{ trans('settings.role_user_roles') }}</h3>
|
||||
<div class="body">
|
||||
<table class="table">
|
||||
<tr>
|
||||
<th>{{ trans('settings.role_name') }}</th>
|
||||
|
|
@ -30,6 +25,12 @@
|
|||
</tr>
|
||||
@endforeach
|
||||
</table>
|
||||
|
||||
<div class="form-group">
|
||||
<a href="{{ baseUrl("/settings/roles/new") }}" class="button pos">{{ trans('settings.role_create') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -1,31 +1,26 @@
|
|||
@extends('base')
|
||||
@extends('simple-layout')
|
||||
|
||||
@section('toolbar')
|
||||
@include('settings/navbar', ['selected' => 'users'])
|
||||
@stop
|
||||
|
||||
@section('content')
|
||||
|
||||
<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>
|
||||
@section('body')
|
||||
|
||||
<div class="container small" ng-non-bindable>
|
||||
<h1>{{ trans('settings.users_add_new') }}</h1>
|
||||
|
||||
<p> </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">
|
||||
{!! csrf_field() !!}
|
||||
@include('users/forms/' . $authMethod)
|
||||
<div class="form-group">
|
||||
<a href="{{ baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button muted">{{ trans('common.cancel') }}</a>
|
||||
<div class="form-group text-right">
|
||||
<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>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -1,32 +1,27 @@
|
|||
@extends('base')
|
||||
@extends('simple-layout')
|
||||
|
||||
@section('content')
|
||||
@section('toolbar')
|
||||
@include('settings/navbar', ['selected' => 'users'])
|
||||
@stop
|
||||
|
||||
<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>Users</a>
|
||||
<span class="sep">»</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>
|
||||
@section('body')
|
||||
|
||||
<div class="container small" ng-non-bindable>
|
||||
<h1>{{ trans('settings.users_delete') }}</h1>
|
||||
<p> </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 class="text-neg">{{ trans('settings.users_delete_confirm') }}</p>
|
||||
|
||||
<form action="{{ baseUrl("/settings/users/{$user->id}") }}" method="POST">
|
||||
{!! csrf_field() !!}
|
||||
<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>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -1,23 +1,17 @@
|
|||
@extends('base')
|
||||
|
||||
|
||||
@section('content')
|
||||
@extends('simple-layout')
|
||||
|
||||
@section('toolbar')
|
||||
@include('settings/navbar', ['selected' => 'users'])
|
||||
@stop
|
||||
|
||||
@section('body')
|
||||
|
||||
<div class="container small">
|
||||
<p> </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">
|
||||
<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="col-sm-6" ng-non-bindable>
|
||||
{!! csrf_field() !!}
|
||||
|
|
@ -51,20 +45,26 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="{{ baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button muted">{{ trans('common.cancel') }}</a>
|
||||
<div class="form-group text-right">
|
||||
<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>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<hr class="margin-top large">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@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>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
@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>
|
||||
@if($user->hasSocialAccount($driver))
|
||||
|
|
@ -73,9 +73,13 @@
|
|||
<a href="{{ baseUrl("/login/service/{$driver}") }}" class="button pos">{{ trans('settings.users_social_connect') }}</a>
|
||||
@endif
|
||||
</div>
|
||||
<div> </div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +1,31 @@
|
|||
@extends('base')
|
||||
|
||||
|
||||
@section('content')
|
||||
@extends('simple-layout')
|
||||
|
||||
@section('toolbar')
|
||||
@include('settings/navbar', ['selected' => 'users'])
|
||||
@stop
|
||||
|
||||
|
||||
@section('body')
|
||||
<div class="container small" ng-non-bindable>
|
||||
<div class="row action-header">
|
||||
<div class="col-sm-8">
|
||||
<h1>{{ trans('settings.users') }}</h1>
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<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>
|
||||
|
||||
<p> </p>
|
||||
<div class="card">
|
||||
<h3><i class="zmdi zmdi-accounts"></i> {{ trans('settings.users') }}</h3>
|
||||
<div class="body">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-sm-8">
|
||||
<div class="compact">
|
||||
{{ $users->links() }}
|
||||
</div>
|
||||
</div>
|
||||
<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)
|
||||
<input type="hidden" name="{{ $name }}" value="{{ $val }}">
|
||||
@endforeach
|
||||
<input type="text" name="search" placeholder="{{ trans('settings.users_search') }}" @if($listDetails['search']) value="{{$listDetails['search']}}" @endif>
|
||||
</form>
|
||||
</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>
|
||||
|
||||
<table class="table">
|
||||
|
|
@ -75,6 +68,10 @@
|
|||
<div>
|
||||
{{ $users->links() }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@stop
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
<div class="row">
|
||||
<div class="col-sm-7">
|
||||
@section('sidebar')
|
||||
<div class="card" id="recent-activity">
|
||||
<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>
|
||||
|
||||
|
|
@ -65,13 +78,5 @@
|
|||
@endif
|
||||
</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
|
||||
Loading…
Add table
Add a link
Reference in a new issue