Started work on user profile pages

resources/views/base.blade.php

@@ -58,7 +58,7 @@
                                 </span>
                                 <ul>
                                     <li>
-                                        <a href="/users/{{$currentUser->id}}" class="text-primary"><i class="zmdi zmdi-edit zmdi-hc-lg"></i>Edit Profile</a>
+                                        <a href="/settings/users/{{$currentUser->id}}" class="text-primary"><i class="zmdi zmdi-edit zmdi-hc-lg"></i>Edit Profile</a>
                                     </li>
                                     <li>
                                         <a href="/logout" class="text-neg"><i class="zmdi zmdi-run zmdi-hc-lg"></i>Logout</a>

resources/views/settings/navbar.blade.php

@@ -4,7 +4,7 @@
         <div class="row">
             <div class="col-md-12 setting-nav">
                 <a href="/settings" @if($selected == 'settings') class="selected text-button" @endif><i class="zmdi zmdi-settings"></i>Settings</a>
-                <a href="/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a>
+                <a href="/settings/users" @if($selected == 'users') class="selected text-button" @endif><i class="zmdi zmdi-accounts"></i>Users</a>
             </div>
         </div>
     </div>

resources/views/users/create.blade.php

@@ -6,7 +6,7 @@
     <div class="container small" ng-non-bindable>
         <h1>Create User</h1>
 
-        <form action="/users/create" method="post">
+        <form action="/settings/users/create" method="post">
             {!! csrf_field() !!}
             @include('users.forms.' . $authMethod)
         </form>

resources/views/users/delete.blade.php

@@ -7,7 +7,7 @@
         <p>This will fully delete this user with the name '<span class="text-neg">{{$user->name}}</span>' from the system.</p>
         <p class="text-neg">Are you sure you want to delete this user?</p>
 
-        <form action="/users/{{$user->id}}" method="POST">
+        <form action="/settings/users/{{$user->id}}" method="POST">
             {!! csrf_field() !!}
             <input type="hidden" name="_method" value="DELETE">
             <a href="/users/{{$user->id}}" class="button muted">Cancel</a>

resources/views/users/edit.blade.php

@@ -9,7 +9,7 @@
                 <div class="col-sm-6"></div>
                 <div class="col-sm-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>
+                        <a href="/settings/users/{{$user->id}}/delete" class="text-neg text-button"><i class="zmdi zmdi-delete"></i>Delete User</a>
                     </div>
                 </div>
             </div>
@@ -19,7 +19,7 @@
 
 
     <div class="container small">
-        <form action="/users/{{$user->id}}" method="post">
+        <form action="/settings/users/{{$user->id}}" method="post">
         <div class="row">
             <div class="col-md-6" ng-non-bindable>
                 <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>

resources/views/users/forms/ldap.blade.php

@@ -25,6 +25,6 @@
 @endif
 
 <div class="form-group">
-    <a href="/users" class="button muted">Cancel</a>
+    <a href="/settings/users" class="button muted">Cancel</a>
     <button class="button pos" type="submit">Save</button>
 </div>

resources/views/users/forms/standard.blade.php

@@ -34,7 +34,7 @@
 </div>
 
 <div class="form-group">
-    <a href="/users" class="button muted">Cancel</a>
+    <a href="/settings/users" class="button muted">Cancel</a>
     <button class="button pos" type="submit">Save</button>
 </div>
 

resources/views/users/index.blade.php

@@ -10,7 +10,7 @@
         <h1>Users</h1>
         @if($currentUser->can('user-create'))
             <p>
-                <a href="/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>Add new user</a>
+                <a href="/settings/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>Add new user</a>
             </p>
         @endif
         <table class="table">
@@ -25,7 +25,7 @@
                     <td style="line-height: 0;"><img class="avatar med" src="{{$user->getAvatar(40)}}" alt="{{$user->name}}"></td>
                     <td>
                         @if($currentUser->can('user-update') || $currentUser->id == $user->id)
-                            <a href="/users/{{$user->id}}">
+                            <a href="/settings/users/{{$user->id}}">
                                 @endif
                                 {{ $user->name }}
                                 @if($currentUser->can('user-update') || $currentUser->id == $user->id)
@@ -34,7 +34,7 @@
                     </td>
                     <td>
                         @if($currentUser->can('user-update') || $currentUser->id == $user->id)
-                            <a href="/users/{{$user->id}}">
+                            <a href="/settings/users/{{$user->id}}">
                                 @endif
                                 {{ $user->email }}
                                 @if($currentUser->can('user-update') || $currentUser->id == $user->id)

resources/views/users/profile.blade.php

@@ -0,0 +1,27 @@
+@extends('base')
+
+@section('content')
+
+    <div class="container" ng-non-bindable>
+        <div class="row">
+            <div class="col-sm-8">
+
+                <div class="padded-top large"></div>
+                <img class="" src="{{$user->getAvatar(120)}}" alt="{{ $user->name }}">
+                <h3>{{ $user->name }}</h3>
+                <p class="text-muted">
+                    User for {{ $user->created_at->diffForHumans(null, true) }}
+                </p>
+
+            </div>
+
+            <div class="col-sm-4">
+                <h3>Recent Activity</h3>
+                @include('partials/activity-list', ['activity' => $activity])
+            </div>
+
+        </div>
+    </div>
+
+
+@stop