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

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index cb56ad905..6cbbdb7f7 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -3,57 +3,79 @@
 
 @section('content')
 
-    <div class="row faded-small">
-        <div class="col-md-6"></div>
-        <div class="col-md-6 faded">
-            <div class="action-buttons">
-                <a href="/http/source.bookstackapp.com/users/{{$user->id}}/delete" class="text-neg"><i class="zmdi zmdi-delete"></i>Delete User</a>
-            </div>
-        </div>
-    </div>
+    @include('settings/navbar', ['selected' => 'users'])
 
-    <div class="row">
-        <div class="page-content">
 
+
+    <div class="container small">
+        <form action="{{ baseUrl("/settings/users/{$user->id}") }}" method="post">
             <div class="row">
-                <div class="col-md-6">
-                    <h1>Edit User</h1>
-                    <form action="/http/source.bookstackapp.com/users/{{$user->id}}" method="post">
-                        {!! csrf_field() !!}
-                        <input type="hidden" name="_method" value="put">
-                        @include('users/form', ['model' => $user])
-                    </form>
+                <div class="col-sm-8">
+                    <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
                 </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>
+                <div class="col-sm-4">
+                    <p></p>
+                    @if($authMethod !== 'system')
+                        <a href="{{ baseUrl("/settings/users/{$user->id}/delete") }}" class="neg button float right">Delete User</a>
+                    @endif
                 </div>
             </div>
-
-            <hr class="margin-top large">
-
             <div class="row">
-                <div class="col-md-12">
-                    <h3>Permissions</h3>
-                    <p>User Role: <strong>{{$user->role->display_name}}</strong>.</p>
-                    <ul class="text-muted">
-                        @foreach($user->role->permissions as $permission)
-                            <li>
-                                {{ $permission->display_name }}
-                            </li>
-                        @endforeach
-                    </ul>
+            <div class="col-md-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">User Avatar</label>
+                    <p class="small">This image should be approx 256px square.</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>
-    </div>
+        </form>
+
+        <hr class="margin-top large">
 
+        @if($currentUser->id === $user->id && count($activeSocialDrivers) > 0)
+            <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>
+            <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">Disconnect Account</a>
+                            @else
+                                <a href="{{ baseUrl("/login/service/google") }}" class="button pos">Attach Account</a>
+                            @endif
+                        </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">Disconnect Account</a>
+                            @else
+                                <a href="{{ baseUrl("/login/service/github") }}" class="button pos">Attach Account</a>
+                            @endif
+                        </div>
+                    </div>
+                @endif
+            </div>
+        @endif
+
+
+    </div>
 
+    <p class="margin-top large"><br></p>
+    @include('partials/image-manager', ['imageType' => 'user'])
 @stop