Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #15388 - Moved generate label button #15389

Merged
merged 3 commits into from
Aug 23, 2024
Merged

Fixed #15388 - Moved generate label button #15389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2631516
Moved general label button
snipe Aug 23, 2024
d3b265d
Moved button on hardware
snipe Aug 23, 2024
5c43a1f
Use proper style for buttons
snipe Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions resources/views/hardware/view.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,20 @@
</div>
@endcan

<div class="col-md-12 hidden-print" style="padding-top: 5px;">
{{ Form::open([
'method' => 'POST',
'route' => ['hardware/bulkedit'],
'class' => 'form-inline',
'id' => 'bulkForm']) }}
<input type="hidden" name="bulk_actions" value="labels" />
<input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
<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').'"' : '') !!}>
<x-icon type="assets" />
{{ trans_choice('button.generate_labels', 1) }}</button>
{{ Form::close() }}
</div>

@can('delete', $asset)
<div class="col-md-12 hidden-print" style="padding-top: 30px; padding-bottom: 30px;">
@if ($asset->deleted_at=='')
Expand Down Expand Up @@ -1052,28 +1066,6 @@
{{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }}
</div>
</div>
<div class="row hidden-print">
<div class="col-md-3">
<strong>
{{ trans('general.label') }}
</strong>
</div>
<div class="col-md-9 hidden-print">
{{ Form::open([
'method' => 'POST',
'route' => ['hardware/bulkedit'],
'class' => 'form-inline',
'id' => 'bulkForm']) }}
<input type="hidden" name="bulk_actions" value="labels" />
<input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
<button class="btn btn-sm btn-default" id="bulkEdit"{{ (!$asset->model ? ' disabled' : '') }}{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid').'"' : '') !!}>
<x-icon type="assets" />
{{ trans_choice('button.generate_labels', 1) }}</button>

{{ Form::close() }}

</div>
</div>

</div> <!--/end striped container-->
</div> <!-- end col-md-9 -->
Expand Down
36 changes: 20 additions & 16 deletions resources/views/users/view.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,18 +209,18 @@
@if(!empty($user->email) && ($user->allAssignedCount() != '0'))
<form action="{{ route('users.email',['userId'=> $user->id]) }}" method="POST">
{{ csrf_field() }}
<button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" rel="noopener">
<button class="btn-block btn btn-sm btn-primary btn-social hidden-print" rel="noopener">
<x-icon type="email" />
{{ trans('admin/users/general.email_assigned') }}
</button>
</form>
@elseif(!empty($user->email) && ($user->allAssignedCount() == '0'))
<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') }}">
<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') }}">
<x-icon type="email" />
{{ trans('admin/users/general.email_assigned') }}
</button>
@else
<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') }}">
<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') }}">
<x-icon type="email" />
{{ trans('admin/users/general.email_assigned') }}
</button>
Expand All @@ -231,16 +231,16 @@
@can('update', $user)
@if (($user->activated == '1') && ($user->ldap_import == '0'))
<div class="col-md-12" style="padding-top: 5px;">
@if($user->email != '')
@if (($user->email != '') && ($user->activated=='1'))
<form action="{{ route('users.password',['userId'=> $user->id]) }}" method="POST">
{{ csrf_field() }}
<button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
<button class="btn btn-block btn-sm btn-primary btn-social hidden-print">
<x-icon type="password" />
{{ trans('button.send_password_link') }}
</button>
</form>
@else
<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') }}">
<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') }}">
<x-icon type="email" />
{{ trans('button.send_password_link') }}
</button>
Expand All @@ -251,7 +251,7 @@

@can('create', $user)
<div class="col-md-12" style="padding-top: 5px;">
<a href="{{ route('users.clone.show', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-info btn-social hidden-print">
<a href="{{ route('users.clone.show', $user->id) }}" class="btn btn-block btn-sm btn-info btn-social hidden-print">
<x-icon type="clone" />
{{ trans('admin/users/general.clone') }}
</a>
Expand All @@ -263,16 +263,12 @@
@if ($user->deleted_at=='')
<div class="col-md-12" style="padding-top: 30px;">
@if ($user->isDeletable())
<form action="{{route('users.destroy',$user->id)}}" method="POST">
{{csrf_field()}}
{{ method_field("DELETE")}}
<button style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print">
<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">
<x-icon type="delete" />
{{ trans('button.delete')}}
</button>
</form>
</a>
@else
<button style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print disabled">
<button class="btn-block btn btn-sm btn-danger btn-social hidden-print disabled">
<x-icon type="delete" />
{{ trans('button.delete')}}
</button>
Expand All @@ -285,7 +281,7 @@
<input type="hidden" name="bulk_actions" value="delete" />

<input type="hidden" name="ids[{{ $user->id }}]" value="{{ $user->id }}" />
<button style="width: 100%;" class="btn btn-sm btn-danger btn-social hidden-print">
<button class="btn btn-block btn-sm btn-danger btn-social hidden-print">
<x-icon type="checkin-and-delete" />
{{ trans('button.checkin_and_delete') }}
</button>
Expand All @@ -295,7 +291,7 @@
<div class="col-md-12" style="padding-top: 5px;">
<form method="POST" action="{{ route('users.restore.store', $user->id) }}">
@csrf
<button style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print">
<button class="btn btn-block btn-sm btn-warning btn-social hidden-print">
<x-icon type="restore" />
{{ trans('button.restore') }}
</button>
Expand Down Expand Up @@ -1201,6 +1197,14 @@ class="table table-striped snipe-table"
<script nonce="{{ csrf_token() }}">
$(function () {

$('#dataConfirmModal').on('show.bs.modal', function (event) {
var content = $(event.relatedTarget).data('content');
var title = $(event.relatedTarget).data('title');
$(this).find(".modal-body").text(content);
$(this).find(".modal-header").text(title);
});


$("#two_factor_reset").click(function(){
$("#two_factor_resetrow").removeClass('success');
$("#two_factor_resetrow").removeClass('danger');
Expand Down
Loading