diff --git a/resources/lang/en-US/admin/users/general.php b/resources/lang/en-US/admin/users/general.php index fa0f478d4bb0..1851733bd097 100644 --- a/resources/lang/en-US/admin/users/general.php +++ b/resources/lang/en-US/admin/users/general.php @@ -7,6 +7,7 @@ 'bulk_update_warn' => 'You are about to edit the properties of :user_count users. Please note that you cannot change your own user attributes using this form, and must make edits to your own user individually.', 'bulk_update_help' => 'This form allows you to update multiple users at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged.', 'current_assets' => 'Assets currently checked out to this user', + 'current_items' => ':item currently checked out to this user', 'clone' => 'Clone User', 'contact_user' => 'Contact :name', 'edit' => 'Edit User', diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php index c033acf0f410..8ac008443e18 100755 --- a/resources/views/licenses/checkout.blade.php +++ b/resources/views/licenses/checkout.blade.php @@ -15,7 +15,7 @@ @section('content')
-
+
{{csrf_field()}} @@ -115,6 +115,21 @@
+ +
- @stop + +@section('moar_scripts') + @include('partials.licenses-assigned') +@endsection \ No newline at end of file diff --git a/resources/views/partials/licenses-assigned.blade.php b/resources/views/partials/licenses-assigned.blade.php new file mode 100644 index 000000000000..7218c346d6e9 --- /dev/null +++ b/resources/views/partials/licenses-assigned.blade.php @@ -0,0 +1,68 @@ + +