DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Moved warning to be consistent with other FCOs

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2025-02-24 13:38:47 +00:00
parent e60462b751
commit ba49fc554d
1 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
resources/views/users/view.blade.php
View file

@ -12,7 +12,21 @@
<div class="row"> <div class="row">
@if ($user->deleted_at!='')
<div class="col-md-12">
<div class="callout callout-warning">
<x-icon type="warning" />
{{ trans('admin/users/message.user_deleted_warning') }}
</div>
</div>
@endif
<div class="col-md-12"> <div class="col-md-12">
<div class="nav-tabs-custom"> <div class="nav-tabs-custom">
<ul class="nav nav-tabs hidden-print"> <ul class="nav nav-tabs hidden-print">
@ -115,27 +129,6 @@
@can('update', $user) @can('update', $user)
<li class="dropdown pull-right">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<span class="hidden-xs"><x-icon type="cog" /></span>
<span class="hidden-lg hidden-md hidden-xl"><x-icon type="cog" class="fa-2x" /></span>
<span class="hidden-xs hidden-sm">
{{ trans('button.actions') }}
</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a href="{{ route('users.edit', $user->id) }}">{{ trans('admin/users/general.edit') }}</a></li>
<li><a href="{{ route('users.clone.show', $user->id) }}">{{ trans('admin/users/general.clone') }}</a></li>
@if ((Auth::user()->id !== $user->id) && (!config('app.lock_passwords')) && ($user->deleted_at=='') && ($user->isDeletable()))
<li><a href="{{ route('users.destroy', $user->id) }}">{{ trans('button.delete') }}</a></li>
@endif
</ul>
</li>
@endcan
@can('update', \App\Models\User::class)
<li class="pull-right"> <li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal"> <a href="#" data-toggle="modal" data-target="#uploadFileModal">
<span class="hidden-xs"><x-icon type="paperclip" /></span> <span class="hidden-xs"><x-icon type="paperclip" /></span>
@ -150,15 +143,6 @@
<div class="tab-pane active" id="details"> <div class="tab-pane active" id="details">
<div class="row"> <div class="row">
@if ($user->deleted_at!='')
<div class="col-md-12">
<div class="callout callout-warning">
<x-icon type="warning" />
{{ trans('admin/users/message.user_deleted_warning') }}
</div>
</div>
@endif
<div class="info-stack-container"> <div class="info-stack-container">
<!-- Start button column --> <!-- Start button column -->
<div class="col-md-3 col-xs-12 col-sm-push-9 info-stack"> <div class="col-md-3 col-xs-12 col-sm-push-9 info-stack">
@ -180,7 +164,7 @@
@can('update', $user) @can('update', $user)
<div class="col-md-12"> <div class="col-md-12">
<a href="{{ route('users.edit', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print"> <a href="{{ ($user->deleted_at=='') ? route('users.edit', $user->id) : '#' }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print{{ ($user->deleted_at!='') ? ' disabled' : '' }}">
<x-icon type="edit" /> <x-icon type="edit" />
{{ trans('admin/users/general.edit') }} {{ trans('admin/users/general.edit') }}
</a> </a>