X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/4e71a5a47b97bee59b8afff98b510c4d0d7ead15..refs/pull/2336/head:/resources/views/users/edit.blade.php

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index ff3475194..f78c25ceb 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -1,86 +1,96 @@
-@extends('base')
+@extends('simple-layout')
 
+@section('body')
+    <div class="container small">
 
-@section('content')
+        <div class="py-m">
+            @include('settings.navbar', ['selected' => 'users'])
+        </div>
 
-    @include('settings/navbar', ['selected' => 'users'])
+        <section class="card content-wrap">
+            <h1 class="list-heading">{{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h1>
+            <form action="{{ url("/http/source.bookstackapp.com/settings/users/{$user->id}") }}" method="post" enctype="multipart/form-data">
+                {!! csrf_field() !!}
+                <input type="hidden" name="_method" value="PUT">
 
-    <div class="container small">
-        <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() !!}
-                    <input type="hidden" name="_method" value="put">
-                    @include('users.forms.' . $authMethod, ['model' => $user])
+                <div class="setting-list">
+                    @include('users.form', ['model' => $user, 'authMethod' => $authMethod])
 
-                </div>
-                <div class="col-sm-6">
-                    <div class="form-group" id="logo-control">
-                        <label for="user-avatar">{{ trans('settings.users_avatar') }}</label>
-                        <p class="small">{{ trans('settings.users_avatar_desc') }}</p>
-
-                        @include('components.image-picker', [
-                              'resizeHeight' => '512',
-                              'resizeWidth' => '512',
-                              'showRemove' => false,
-                              'defaultImage' => baseUrl('/user_avatar.png'),
-                              'currentImage' => $user->getAvatar(80),
-                              'currentId' => $user->image_id,
-                              'name' => 'image_id',
-                              'imageClass' => 'avatar large'
-                          ])
+                    <div class="grid half gap-xl">
+                        <div>
+                            <label for="user-avatar" class="setting-list-label">{{ trans('settings.users_avatar') }}</label>
+                            <p class="small">{{ trans('settings.users_avatar_desc') }}</p>
+                        </div>
+                        <div>
+                            @include('components.image-picker', [
+                                'resizeHeight' => '512',
+                                'resizeWidth' => '512',
+                                'showRemove' => false,
+                                'defaultImage' => url('/http/source.bookstackapp.com/user_avatar.png'),
+                                'currentImage' => $user->getAvatar(80),
+                                'currentId' => $user->image_id,
+                                'name' => 'profile_image',
+                                'imageClass' => 'avatar large'
+                            ])
+                        </div>
                     </div>
-                    <div class="form-group">
-                        <label for="user-language">{{ trans('settings.users_preferred_language') }}</label>
-                        <select name="setting[language]" id="user-language">
-                            @foreach(trans('settings.language_select') as $lang => $label)
-                                <option @if(setting()->getUser($user, 'language') === $lang) selected @endif value="{{ $lang }}">{{ $label }}</option>
-                            @endforeach
-                        </select>
+
+                    <div class="grid half gap-xl v-center">
+                        <div>
+                            <label for="user-language" class="setting-list-label">{{ trans('settings.users_preferred_language') }}</label>
+                            <p class="small">
+                                {{ trans('settings.users_preferred_language_desc') }}
+                            </p>
+                        </div>
+                        <div>
+                            <select name="setting[language]" id="user-language">
+                                @foreach(trans('settings.language_select') as $lang => $label)
+                                    <option @if(setting()->getUser($user, 'language', config('app.default_locale')) === $lang) selected @endif value="{{ $lang }}">{{ $label }}</option>
+                                @endforeach
+                            </select>
+                        </div>
                     </div>
+
                 </div>
-            </div>
-            <div class="form-group">
-                <a href="{{  baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button muted">{{ trans('common.cancel') }}</a>
-                <button class="button pos" type="submit">{{ trans('common.save') }}</button>
-            </div>
-        </form>
 
-        <hr class="margin-top large">
+                <div class="text-right">
+                    <a href="{{  url($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button outline">{{ trans('common.cancel') }}</a>
+                    @if($authMethod !== 'system')
+                        <a href="{{ url("/http/source.bookstackapp.com/settings/users/{$user->id}/delete") }}" class="button outline">{{ trans('settings.users_delete') }}</a>
+                    @endif
+                    <button class="button" type="submit">{{ trans('common.save') }}</button>
+                </div>
+            </form>
+        </section>
 
         @if($currentUser->id === $user->id && count($activeSocialDrivers) > 0)
-            <h3>{{ trans('settings.users_social_accounts') }}</h3>
-            <p class="text-muted">{{ trans('settings.users_social_accounts_info') }}</p>
-            <div class="row">
-                @foreach($activeSocialDrivers as $driver => $enabled)
-                    <div class="col-sm-3 col-xs-6 text-center">
-                        <div>@icon($driver, ['width' => 56])</div>
-                        <div>
-                            @if($user->hasSocialAccount($driver))
-                                <a href="{{ baseUrl("/login/service/{$driver}/detach") }}" class="button neg">{{ trans('settings.users_social_disconnect') }}</a>
-                            @else
-                                <a href="{{ baseUrl("/login/service/{$driver}") }}" class="button pos">{{ trans('settings.users_social_connect') }}</a>
-                            @endif
-                        </div>
+            <section class="card content-wrap auto-height">
+                <h2 class="list-heading">{{ trans('settings.users_social_accounts') }}</h2>
+                <p class="text-muted">{{ trans('settings.users_social_accounts_info') }}</p>
+                <div class="container">
+                    <div class="grid third">
+                        @foreach($activeSocialDrivers as $driver => $enabled)
+                            <div class="text-center mb-m">
+                                <div role="presentation">@icon('auth/'. $driver, ['style' => 'width: 56px;height: 56px;'])</div>
+                                <div>
+                                    @if($user->hasSocialAccount($driver))
+                                        <a href="{{ url("/http/source.bookstackapp.com/login/service/{$driver}/detach") }}" aria-label="{{ trans('settings.users_social_disconnect') }} - {{ $driver }}"
+                                           class="button small outline">{{ trans('settings.users_social_disconnect') }}</a>
+                                    @else
+                                        <a href="{{ url("/http/source.bookstackapp.com/login/service/{$driver}") }}" aria-label="{{ trans('settings.users_social_connect') }} - {{ $driver }}"
+                                           class="button small outline">{{ trans('settings.users_social_connect') }}</a>
+                                    @endif
+                                </div>
+                            </div>
+                        @endforeach
                     </div>
-                @endforeach
-            </div>
+                </div>
+            </section>
         @endif
 
-
+        @if(($currentUser->id === $user->id && userCan('access-api')) || userCan('users-manage'))
+            @include('users.api-tokens.list', ['user' => $user])
+        @endif
     </div>
 
-    <p class="margin-top large"><br></p>
-    @include('components.image-manager', ['imageType' => 'user'])
 @stop