diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 87825a4491..bd527f7643 100755 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -34,7 +34,7 @@ class DashboardController extends Controller $counts['license'] = \App\Models\License::assetcount(); $counts['consumable'] = \App\Models\Consumable::count(); $counts['component'] = \App\Models\Component::count(); - $counts['users'] = \App\Models\User::count(); + $counts['user'] = \App\Models\User::count(); $counts['grand_total'] = $counts['asset'] + $counts['accessory'] + $counts['license'] + $counts['consumable']; if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) { diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 9bb3f84e44..5c79f227e6 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -246,4 +246,5 @@ 'clear_signature' => 'Clear Signature', 'show_help' => 'Show help', 'hide_help' => 'Hide help', + 'view_all' => 'view all', ]; diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 235b55ff9c..dd64ef56ae 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -29,78 +29,115 @@
-
+ -
-
+