Merge branch 'user_management' into dev

resources/views/admin/userManagement/overview.blade.php

@@ -7,29 +7,27 @@
     <div class="row">
         <h2>@lang('admin/userManagement.overview')</h2>
 
+        <p>
+            @foreach($statuses as $status => $translation)
+                <a class="button tiny @if($status != $currentStatus) secondary @else primary @endif" href="{{route('users.overview', ['status' => $status])}}">{{$translation}}</a>
+            @endforeach
+        </p>
+
     </div>
 
     <div class="row" data-equalizer>
         @forelse($users as $user)
-            <div class="user-detail large-3 medium-6 small-6 columns" data-equalizer-watch>
-                <a href="{{route('users.detail', ['id' => $user->id])}}">
-                    <div class="user-img">
-                        <img src="{{$user->gravatar(350)}}" alt="" />
-
-                        <span class="badge @if($user->role == \App\Models\User::ROLE_ADMIN)
-                                alert
-                                @elseif ($user->role == \App\Models\User::ROLE_EDITOR)
-                                warning
-                                @else
-                                secondary
-                                @endif">
-                            {{strtoupper($user->role)}}
-                        </span>
-                    </div>
-                    <div class="user-info text-center">
-                        {{ $user->name}}
-                    </div>
-                </a>
+            <div class="user-detail large-2 medium-3 small-4 columns">
+                <div class="callout text-center small" data-equalizer-watch>
+                    <a href="{{route('users.detail', ['id' => $user->id])}}"  data-tooltip title="{{$roles[$user->role]}}">
+                        <div class="user-img">
+                            <img src="{{$user->gravatar(350)}}" alt="" />
+                        </div>
+                        <div class="user-info text-center">
+                            {{ $user->name}}
+                        </div>
+                    </a>
+                </div>
             </div>
         @empty
             <em>@lang('admin/userManagement.noUsers')</em>