Merge branch 'master' into translations

[bookstack] / resources / views / users / edit.blade.php

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index b981c64d8dc73414563035a659503ab150776ff6..4db00e31f932fb8157fa63d8c085b25ead1a2b24 100644 (file)
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -3,60 +3,65 @@
 
 @section('content')
 
-    <div class="faded-small">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-6"></div>
-                <div class="col-md-6 faded">
-                    <div class="action-buttons">
-                        <a href="/users/{{$user->id}}/delete" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete User</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+    @include('settings/navbar', ['selected' => 'users'])
 
 
 
     <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])
 
-        <div class="row">
-            <div class="col-md-6">
-                <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
-                <form action="/users/{{$user->id}}" method="post">
-                    {!! csrf_field() !!}
-                    <input type="hidden" name="_method" value="put">
-                    @include('users/form', ['model' => $user])
-                </form>
             </div>
             <div class="col-md-6">
-                <h1>&nbsp;</h1>
-                <div class="shaded padded margin-top">
-                    <p>
-                        <img class="avatar" src="{{ $user->getAvatar(80) }}" alt="{{ $user->name }}">
-                    </p>
-                    <p class="text-muted">You can change your profile picture at <a href="http://en.gravatar.com/">Gravatar</a>.</p>
+                <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>
         </div>
+        </form>
 
         <hr class="margin-top large">
 
-        @if($currentUser->id === $user->id)
-            <h3>Social Accounts</h3>
-            <p class="text-muted">
-                Here you can connect your other accounts for quicker and easier login. <br>
-                Disconnecting an account here does not previously authorized access. Revoke access from your profile settings on the connected social account.
-            </p>
+        @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="/login/service/google/detach" class="button neg">Disconnect Account</a>
+                                <a href="{{ baseUrl("/login/service/google/detach") }}" class="button neg">{{ trans('settings.users_social_disconnect') }}</a>
                             @else
-                                <a href="/login/service/google" class="button pos">Attach Account</a>
+                                <a href="{{ baseUrl("/login/service/google") }}" class="button pos">{{ trans('settings.users_social_connect') }}</a>
                             @endif
                         </div>
                     </div>
@@ -66,9 +71,9 @@
                         <div><i class="zmdi zmdi-github zmdi-hc-4x" style="color: #444;"></i></div>
                         <div>
                             @if($user->hasSocialAccount('github'))
-                                <a href="/login/service/github/detach" class="button neg">Disconnect Account</a>
+                                <a href="{{ baseUrl("/login/service/github/detach") }}" class="button neg">{{ trans('settings.users_social_disconnect') }}</a>
                             @else
-                                <a href="/login/service/github" class="button pos">Attach Account</a>
+                                <a href="{{ baseUrl("/login/service/github") }}" class="button pos">{{ trans('settings.users_social_connect') }}</a>
                             @endif
                         </div>
                     </div>
@@ -80,5 +85,5 @@
     </div>
 
     <p class="margin-top large"><br></p>
-
+    @include('components.image-manager', ['imageType' => 'user'])
 @stop