Page Attachments - Improved UI, Now initially complete

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

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index d539f314ee57c49335f67aa09d2149b196145808..105fddb5ba55d232cd69fd684006dd6070dab0ae 100644 (file)
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -14,7 +14,7 @@
             <div class="col-sm-4">
                 <p></p>
                 @if(userCan('users-manage'))
-                    <a href="/settings/users/create" class="pos button float right"><i class="zmdi zmdi-account-add"></i>Add new user</a>
+                    <a href="{{ baseUrl("/settings/users/create") }}" class="pos button float right"><i class="zmdi zmdi-account-add"></i>Add new user</a>
                 @endif
             </div>
         </div>
@@ -22,13 +22,13 @@
         <div class="row">
             <div class="col-sm-8">
                 <div class="compact">
-                    {!! $users->links() !!}
+                    {{ $users->links() }}
                 </div>
             </div>
             <div class="col-sm-4">
-                <form method="get" class="float right" action="/settings/users">
+                <form method="get" class="float right" action="{{ baseUrl("/settings/users") }}">
                     @foreach(collect($listDetails)->except('search') as $name => $val)
-                        <input type="hidden" name="{{$name}}" value="{{$val}}">
+                        <input type="hidden" name="{{ $name }}" value="{{ $val }}">
                     @endforeach
                     <input type="text" name="search" placeholder="Search Users" @if($listDetails['search']) value="{{$listDetails['search']}}" @endif>
                 </form>
@@ -47,10 +47,10 @@
             </tr>
             @foreach($users as $user)
                 <tr>
-                    <td style="line-height: 0;"><img class="avatar med" src="{{$user->getAvatar(40)}}" alt="{{$user->name}}"></td>
+                    <td style="line-height: 0;"><img class="avatar med" src="{{ $user->getAvatar(40)}}" alt="{{ $user->name }}"></td>
                     <td>
                         @if(userCan('users-manage') || $currentUser->id == $user->id)
-                            <a href="/settings/users/{{$user->id}}">
+                            <a href="{{ baseUrl("/settings/users/{$user->id}") }}">
                                 @endif
                                 {{ $user->name }}
                                 @if(userCan('users-manage') || $currentUser->id == $user->id)
@@ -59,7 +59,7 @@
                     </td>
                     <td>
                         @if(userCan('users-manage') || $currentUser->id == $user->id)
-                            <a href="/settings/users/{{$user->id}}">
+                            <a href="{{ baseUrl("/settings/users/{$user->id}") }}">
                                 @endif
                                 {{ $user->email }}
                                 @if(userCan('users-manage') || $currentUser->id == $user->id)
@@ -68,7 +68,7 @@
                     </td>
                     <td>
                         @foreach($user->roles as $index => $role)
-                            <small><a href="/settings/roles/{{$role->id}}">{{$role->display_name}}</a>@if($index !== count($user->roles) -1),@endif</small>
+                            <small><a href="{{ baseUrl("/settings/roles/{$role->id}") }}">{{$role->display_name}}</a>@if($index !== count($user->roles) -1),@endif</small>
                         @endforeach
                     </td>
                 </tr>
@@ -76,7 +76,7 @@
         </table>
 
         <div>
-            {!! $users->links() !!}
+            {{ $users->links() }}
         </div>
     </div>