DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-03-18 00:16:34 -07:00
parent d7363a41c8 c7f4a93c17
commit 03b4a87a65
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/lang/en/general.php
View file

@ -45,7 +45,7 @@ return [
'bulk_edit' => 'Bulk Edit', 'bulk_edit' => 'Bulk Edit',
'bulk_delete' => 'Bulk Delete', 'bulk_delete' => 'Bulk Delete',
'bulk_actions' => 'Bulk Actions', 'bulk_actions' => 'Bulk Actions',
'bulk_checkin_delete' => 'Bulk Checkin Items from Users', 'bulk_checkin_delete' => 'Bulk Checkin / Delete Users',
'byod' => 'BYOD', 'byod' => 'BYOD',
'byod_help' => 'This device is owned by the user', 'byod_help' => 'This device is owned by the user',
'bystatus' => 'by Status', 'bystatus' => 'by Status',

2
resources/views/partials/asset-bulk-actions.blade.php
View file

@ -12,7 +12,7 @@
{{ trans('button.bulk_actions') }} {{ trans('button.bulk_actions') }}
</span> </span>
</label> </label>
<select name="bulk_actions" class="form-control select2" aria-label="bulk_actions"> <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="min-width: 350px;">
@can('update', \App\Models\Asset::class) @can('update', \App\Models\Asset::class)
<option value="edit">{{ trans('button.edit') }}</option> <option value="edit">{{ trans('button.edit') }}</option>
@endcan @endcan

2
resources/views/partials/users-bulk-actions.blade.php
View file

@ -9,7 +9,7 @@
@can('delete', \App\Models\User::class) @can('delete', \App\Models\User::class)
<div id="users-toolbar"> <div id="users-toolbar">
<label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label> <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
<select name="bulk_actions" class="form-control select2" style="width: 200px;" aria-label="bulk_actions"> <select name="bulk_actions" class="form-control select2" style="min-width:300px;" aria-label="bulk_actions">
<option value="edit">{{ trans('general.bulk_edit') }}</option> <option value="edit">{{ trans('general.bulk_edit') }}</option>
<option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option> <option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option>
<option value="merge">{!! trans('general.merge_users') !!}</option> <option value="merge">{!! trans('general.merge_users') !!}</option>

6
resources/views/users/confirm-bulk-delete.blade.php
View file

@ -106,8 +106,10 @@
</div><!--/col-md-12--> </div><!--/col-md-12-->
</div> <!--/box-body--> </div> <!--/box-body-->
<div class="box-footer text-right"> <div class="box-footer text-right">
<a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
<button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.submit') }}</button>
<button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }} disabled="disabled"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.submit') }}</button>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->
</form> </form>
</div> </div>