mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-02 08:21:09 -08:00
Fix cancel button style and translate title
This commit is contained in:
parent
8496e64e16
commit
85e717bc4e
|
@ -436,6 +436,7 @@ return [
|
||||||
'errors_importing' => 'Some Errors occurred while importing: ',
|
'errors_importing' => 'Some Errors occurred while importing: ',
|
||||||
'warning' => 'WARNING: :warning',
|
'warning' => 'WARNING: :warning',
|
||||||
'success_redirecting' => '"Success... Redirecting.',
|
'success_redirecting' => '"Success... Redirecting.',
|
||||||
|
'cancel_request' => 'Cancel this item request',
|
||||||
'setup_successful_migrations' => 'Your database tables have been created',
|
'setup_successful_migrations' => 'Your database tables have been created',
|
||||||
'setup_migration_output' => 'Migration output:',
|
'setup_migration_output' => 'Migration output:',
|
||||||
'setup_migration_create_user' => 'Next: Create User',
|
'setup_migration_create_user' => 'Next: Create User',
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
'id' => 'bulkForm']) }}
|
'id' => 'bulkForm']) }}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
{{ Form::close() }}
|
|
||||||
@if ($requestedItems->count() > 0)
|
@if ($requestedItems->count() > 0)
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table
|
<table
|
||||||
|
@ -108,7 +108,7 @@
|
||||||
'method' => 'POST',
|
'method' => 'POST',
|
||||||
'route' => ['account/request-item', $request->itemType(), $request->requestable->id, true, $request->requestingUser()->id],
|
'route' => ['account/request-item', $request->itemType(), $request->requestable->id, true, $request->requestingUser()->id],
|
||||||
]) }}
|
]) }}
|
||||||
<button class="btn btn-danger btn-sm" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button>
|
<button class="btn btn-warning btn-sm" data-tooltip="true" title="{{ trans('general.cancel_request') }}">{{ trans('button.cancel') }}</button>
|
||||||
{{ Form::close() }}
|
{{ Form::close() }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
|
@ -143,6 +143,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{{ Form::close() }}
|
||||||
</div> <!-- .col-md-12> -->
|
</div> <!-- .col-md-12> -->
|
||||||
</div> <!-- .row -->
|
</div> <!-- .row -->
|
||||||
@stop
|
@stop
|
||||||
|
|
Loading…
Reference in a new issue