lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-10-02 11:01:05 +01:00
commit 0470a7c946
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/views/hardware/bulk-delete.blade.php
View file

@ -60,8 +60,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" href="{{ URL::previous() }}">
<button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('button.delete') }}</button> {{ trans('button.cancel') }}
</a>
<button type="submit" class="btn btn-success" id="submit-button">
<x-icon type="checkmark" /> {{ trans('button.delete') }}
</button>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->
</div><!-- /.box --> </div><!-- /.box -->
</form> </form>

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

@ -673,7 +673,7 @@
{{ trans('admin/users/general.two_factor_active') }} {{ trans('admin/users/general.two_factor_active') }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if ($user->two_factor_active()) == '1') @if ($user->two_factor_active() == '1')
<x-icon type="checkmark" class="fa-fw text-success" /> <x-icon type="checkmark" class="fa-fw text-success" />
{{ trans('general.yes') }} {{ trans('general.yes') }}
@else @else
@ -690,7 +690,7 @@
{{ trans('admin/users/general.two_factor_enrolled') }} {{ trans('admin/users/general.two_factor_enrolled') }}
</div> </div>
<div class="col-md-9" id="two_factor_reset_toggle"> <div class="col-md-9" id="two_factor_reset_toggle">
@if ($user->two_factor_active_and_enrolled()) == '1') @if ($user->two_factor_active_and_enrolled() == '1')
<x-icon type="checkmark" class="fa-fw text-success" /> <x-icon type="checkmark" class="fa-fw text-success" />
{{ trans('general.yes') }} {{ trans('general.yes') }}
@else @else