Page Attachments - Improved UI, Now initially complete

[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..6cbbdb7f7ec879a776e3ec0087f13618c8a836c0 100644 (file)
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -3,46 +3,43 @@
 
 @section('content')
 
 
 @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">
 
 
 
     <div class="container small">

+        <form action="{{ baseUrl("/settings/users/{$user->id}") }}" method="post">
+            <div class="row">
+                <div class="col-sm-8">
+                    <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</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">Delete User</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">
             </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">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>
             </div>
         </div>

+        </form>

 
         <hr class="margin-top large">
 
 
         <hr class="margin-top large">
 

-        @if($currentUser->id === $user->id)
+        @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>
             <h3>Social Accounts</h3>
             <p class="text-muted">
                 Here you can connect your other accounts for quicker and easier login. <br>


@@ -54,9 +51,9 @@
                         <div><i class="zmdi zmdi-google-plus-box zmdi-hc-4x" style="color: #DC4E41;"></i></div>
                         <div>
                             @if($user->hasSocialAccount('google'))
                         <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">Disconnect Account</a>

                             @else
                             @else

-                                <a href="/login/service/google" class="button pos">Attach Account</a>
+                                <a href="{{ baseUrl("/login/service/google") }}" class="button pos">Attach Account</a>

                             @endif
                         </div>
                     </div>
                             @endif
                         </div>
                     </div>


@@ -66,9 +63,9 @@
                         <div><i class="zmdi zmdi-github zmdi-hc-4x" style="color: #444;"></i></div>
                         <div>
                             @if($user->hasSocialAccount('github'))
                         <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">Disconnect Account</a>

                             @else
                             @else

-                                <a href="/login/service/github" class="button pos">Attach Account</a>
+                                <a href="{{ baseUrl("/login/service/github") }}" class="button pos">Attach Account</a>

                             @endif
                         </div>
                     </div>
                             @endif
                         </div>
                     </div>


@@ -80,5 +77,5 @@
     </div>
 
     <p class="margin-top large"><br></p>
     </div>
 
     <p class="margin-top large"><br></p>

-
+    @include('partials/image-manager', ['imageType' => 'user'])

 @stop
 @stop