X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/0775cd09a152c6e05c100139812f1fc35cb1ac6a..refs/pull/846/head:/resources/views/users/edit.blade.php

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index b753dfc45..b6f8f7345 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -1,72 +1,84 @@
-@extends('base')
-
-
-@section('content')
+@extends('simple-layout')
 
+@section('toolbar')
     @include('settings/navbar', ['selected' => 'users'])
+@stop
 
-
+@section('body')
 
     <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-md-6" ng-non-bindable>
-                {!! csrf_field() !!}
-                <input type="hidden" name="_method" value="put">
-                @include('users.forms.' . $authMethod, ['model' => $user])
+        <p>&nbsp;</p>
+        <div class="card">
+            <h3>@icon('edit') {{ $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-6" ng-non-bindable>
+                            {!! csrf_field() !!}
+                            <input type="hidden" name="_method" value="put">
+                            @include('users.forms.' . $authMethod, ['model' => $user])
 
-            </div>
-            <div class="col-md-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>
-                    <image-picker resize-height="512" resize-width="512" current-image="{{ $user->getAvatar(80) }}" current-id="{{ $user->image_id }}" default-image="{{ baseUrl("/user_avatar.png") }}" name="image_id" show-remove="false" image-class="['avatar' ,'large']"></image-picker>
-                </div>
+                        </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>
+                            <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>
+                        </div>
+                    </div>
+                    <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>
             </div>
         </div>
-        </form>
-
-        <hr class="margin-top large">
 
         @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">
-                @if(isset($activeSocialDrivers['google']))
-                    <div class="col-md-3 text-center">
-                        <div><i class="zmdi zmdi-google-plus-box zmdi-hc-4x" style="color: #DC4E41;"></i></div>
-                        <div>
-                            @if($user->hasSocialAccount('google'))
-                                <a href="{{ baseUrl("/login/service/google/detach") }}" class="button neg">{{ trans('settings.users_social_disconnect') }}</a>
-                            @else
-                                <a href="{{ baseUrl("/login/service/google") }}" class="button pos">{{ trans('settings.users_social_connect') }}</a>
-                            @endif
+            <div class="card">
+                <h3>@icon('login')  {{ 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-4 col-xs-6 text-center">
+                                    <div>@icon('auth/'. $driver, ['style' => 'width: 56px;height: 56px;'])</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>
+                                    <div>&nbsp;</div>
+                                </div>
+                            @endforeach
                         </div>
                     </div>
-                @endif
-                @if(isset($activeSocialDrivers['github']))
-                    <div class="col-md-3 text-center">
-                        <div><i class="zmdi zmdi-github zmdi-hc-4x" style="color: #444;"></i></div>
-                        <div>
-                            @if($user->hasSocialAccount('github'))
-                                <a href="{{ baseUrl("/login/service/github/detach") }}" class="button neg">{{ trans('settings.users_social_disconnect') }}</a>
-                            @else
-                                <a href="{{ baseUrl("/login/service/github") }}" class="button pos">{{ trans('settings.users_social_connect') }}</a>
-                            @endif
-                        </div>
-                    </div>
-                @endif
+                </div>
             </div>
         @endif
 
@@ -74,5 +86,5 @@
     </div>
 
     <p class="margin-top large"><br></p>
-    @include('partials/image-manager', ['imageType' => 'user'])
-@stop
+    @include('components.image-manager', ['imageType' => 'user'])
+@stop
\ No newline at end of file