Skip to content

Commit 4c8dc78

Browse files
snipesnipe
authored
Merge pull request grokability#15389 from snipe/added_generate_label_to_button_stack
Fixed grokability#15388 - Moved generate label button
2 parents aa86e07 + 5c43a1f commit 4c8dc78

File tree

2 files changed

+34
-38
lines changed

2 files changed

+34
-38
lines changed

‎resources/views/hardware/view.blade.php

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,20 @@
237237
</div>
238238
@endcan
239239

240+
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
241+
{{ Form::open([
242+
'method' => 'POST',
243+
'route' => ['hardware/bulkedit'],
244+
'class' => 'form-inline',
245+
'id' => 'bulkForm']) }}
246+
<input type="hidden" name="bulk_actions" value="labels" />
247+
<input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
248+
<button class="btn btn-block btn-social btn-sm btn-default" id="bulkEdit"{{ (!$asset->model ? ' disabled' : '') }}{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid').'"' : '') !!}>
249+
<x-icon type="assets" />
250+
{{ trans_choice('button.generate_labels', 1) }}</button>
251+
{{ Form::close() }}
252+
</div>
253+
240254
@can('delete', $asset)
241255
<div class="col-md-12 hidden-print" style="padding-top: 30px; padding-bottom: 30px;">
242256
@if ($asset->deleted_at=='')
@@ -1052,28 +1066,6 @@
10521066
{{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }}
10531067
</div>
10541068
</div>
1055-
<div class="row hidden-print">
1056-
<div class="col-md-3">
1057-
<strong>
1058-
{{ trans('general.label') }}
1059-
</strong>
1060-
</div>
1061-
<div class="col-md-9 hidden-print">
1062-
{{ Form::open([
1063-
'method' => 'POST',
1064-
'route' => ['hardware/bulkedit'],
1065-
'class' => 'form-inline',
1066-
'id' => 'bulkForm']) }}
1067-
<input type="hidden" name="bulk_actions" value="labels" />
1068-
<input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
1069-
<button class="btn btn-sm btn-default" id="bulkEdit"{{ (!$asset->model ? ' disabled' : '') }}{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid').'"' : '') !!}>
1070-
<x-icon type="assets" />
1071-
{{ trans_choice('button.generate_labels', 1) }}</button>
1072-
1073-
{{ Form::close() }}
1074-
1075-
</div>
1076-
</div>
10771069

10781070
</div> <!--/end striped container-->
10791071
</div> <!-- end col-md-9 -->

‎resources/views/users/view.blade.php

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -209,18 +209,18 @@
209209
@if(!empty($user->email) && ($user->allAssignedCount() != '0'))
210210
<form action="{{ route('users.email',['userId'=> $user->id]) }}" method="POST">
211211
{{ csrf_field() }}
212-
<button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" rel="noopener">
212+
<button class="btn-block btn btn-sm btn-primary btn-social hidden-print" rel="noopener">
213213
<x-icon type="email" />
214214
{{ trans('admin/users/general.email_assigned') }}
215215
</button>
216216
</form>
217217
@elseif(!empty($user->email) && ($user->allAssignedCount() == '0'))
218-
<button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">
218+
<button class="btn btn-block btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">
219219
<x-icon type="email" />
220220
{{ trans('admin/users/general.email_assigned') }}
221221
</button>
222222
@else
223-
<button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">
223+
<button class="btn btn-block btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">
224224
<x-icon type="email" />
225225
{{ trans('admin/users/general.email_assigned') }}
226226
</button>
@@ -231,16 +231,16 @@
231231
@can('update', $user)
232232
@if (($user->activated == '1') && ($user->ldap_import == '0'))
233233
<div class="col-md-12" style="padding-top: 5px;">
234-
@if($user->email != '')
234+
@if (($user->email != '') && ($user->activated=='1'))
235235
<form action="{{ route('users.password',['userId'=> $user->id]) }}" method="POST">
236236
{{ csrf_field() }}
237-
<button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
237+
<button class="btn btn-block btn-sm btn-primary btn-social hidden-print">
238238
<x-icon type="password" />
239239
{{ trans('button.send_password_link') }}
240240
</button>
241241
</form>
242242
@else
243-
<button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">
243+
<button class="btn btn-block btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">
244244
<x-icon type="email" />
245245
{{ trans('button.send_password_link') }}
246246
</button>
@@ -251,7 +251,7 @@
251251

252252
@can('create', $user)
253253
<div class="col-md-12" style="padding-top: 5px;">
254-
<a href="{{ route('users.clone.show', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-info btn-social hidden-print">
254+
<a href="{{ route('users.clone.show', $user->id) }}" class="btn btn-block btn-sm btn-info btn-social hidden-print">
255255
<x-icon type="clone" />
256256
{{ trans('admin/users/general.clone') }}
257257
</a>
@@ -263,16 +263,12 @@
263263
@if ($user->deleted_at=='')
264264
<div class="col-md-12" style="padding-top: 30px;">
265265
@if ($user->isDeletable())
266-
<form action="{{route('users.destroy',$user->id)}}" method="POST">
267-
{{csrf_field()}}
268-
{{ method_field("DELETE")}}
269-
<button style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print">
266+
<a href="#" class="btn-block delete-asset btn btn-sm btn-danger btn-social hidden-print" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $user->present()->fullName]) }}" data-target="#dataConfirmModal">
270267
<x-icon type="delete" />
271268
{{ trans('button.delete')}}
272-
</button>
273-
</form>
269+
</a>
274270
@else
275-
<button style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print disabled">
271+
<button class="btn-block btn btn-sm btn-danger btn-social hidden-print disabled">
276272
<x-icon type="delete" />
277273
{{ trans('button.delete')}}
278274
</button>
@@ -285,7 +281,7 @@
285281
<input type="hidden" name="bulk_actions" value="delete" />
286282

287283
<input type="hidden" name="ids[{{ $user->id }}]" value="{{ $user->id }}" />
288-
<button style="width: 100%;" class="btn btn-sm btn-danger btn-social hidden-print">
284+
<button class="btn btn-block btn-sm btn-danger btn-social hidden-print">
289285
<x-icon type="checkin-and-delete" />
290286
{{ trans('button.checkin_and_delete') }}
291287
</button>
@@ -295,7 +291,7 @@
295291
<div class="col-md-12" style="padding-top: 5px;">
296292
<form method="POST" action="{{ route('users.restore.store', $user->id) }}">
297293
@csrf
298-
<button style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print">
294+
<button class="btn btn-block btn-sm btn-warning btn-social hidden-print">
299295
<x-icon type="restore" />
300296
{{ trans('button.restore') }}
301297
</button>
@@ -1201,6 +1197,14 @@ class="table table-striped snipe-table"
12011197
<script nonce="{{ csrf_token() }}">
12021198
$(function () {
12031199
1200+
$('#dataConfirmModal').on('show.bs.modal', function (event) {
1201+
var content = $(event.relatedTarget).data('content');
1202+
var title = $(event.relatedTarget).data('title');
1203+
$(this).find(".modal-body").text(content);
1204+
$(this).find(".modal-header").text(title);
1205+
});
1206+
1207+
12041208
$("#two_factor_reset").click(function(){
12051209
$("#two_factor_resetrow").removeClass('success');
12061210
$("#two_factor_resetrow").removeClass('danger');

0 commit comments

Comments
 (0)