mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-05 00:15:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source 
# Conflicts:
#	public/css/build/app.css
#	public/css/build/app.css.map
#	public/css/build/overrides.css
#	public/css/build/overrides.css.map
#	public/css/dist/all.css
#	public/js/dist/all.js
#	public/js/dist/all.js.map
#	public/mix-manifest.json
This commit is contained in:
snipe
2025-12-06 00:59:47 +00:00
parent c73c2b003a 9ae68f0000
commit 3adf8847b0
37 changed files with 281 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Api/ManufacturersController.php
View File

@ -78,10 +78,16 @@ class ManufacturersController extends Controller
$manufacturers->onlyTrashed();
}
if ($request->input('status') == 'deleted') {
$manufacturers->onlyTrashed();
}
if ($request->filled('search')) {
$manufacturers = $manufacturers->TextSearch($request->input('search'));
}
if ($request->filled('name')) {
$manufacturers->where('name', '=', $request->input('name'));
}

4
resources/assets/js/snipeit_modals.js
View File

@ -11,14 +11,14 @@
Create a Button looking like this:
<a href='{{ route('modal.show', 'user') }}' data-toggle="modal" data-target="#createModal" data-select='assigned_to' class="btn btn-sm btn-primary">New</a>
<a href='{{ route('modal.show', 'user') }}' data-toggle="modal" data-target="#createModal" data-select='assigned_to' class="btn btn-sm btn-theme">New</a>
If you don't have access to Blade commands (like {{ and }}, etc), you can hard-code a URL as the 'href'
data-toggle="modal" - required for Bootstrap Modals
data-target="#createModal" - fixed ID for the modal, do not change
data-select="assigned_to" - What is the *ID* of the select-dropdown that you're going to be adding to, if the modal-create was a success? Be on the lookout for duplicate ID's, it will confuse this library!
class="btn btn-sm btn-primary" - makes it look button-ey, feel free to change :)
class="btn btn-sm btn-theme" - makes it look button-ey, feel free to change :)
If you want to pass additional variables to the modal (In the Category Create one, for example, you can pass category_id), you can encode them as URL variables in the href

5
resources/assets/less/app.less
View File

@ -423,10 +423,7 @@ img.navbar-brand-img,
border-radius: 0px;
}
.btn.bg-maroon,
.btn.bg-purple {
min-width: 90px;
}
[hidden] {
display: none !important;

3
resources/assets/less/overrides.less
View File

@ -503,10 +503,11 @@ img.navbar-brand-img, .navbar-brand>img {
border-radius: 0px !important;
}
.btn.bg-maroon, .btn.bg-purple{
.btn-checkin, .btn-checkout {
min-width:90px;
}
[hidden] {
display: none !important;
}

1
resources/lang/en-US/general.php
View File

@ -648,6 +648,7 @@ return [
'set_password' => 'Set a Password',
'upload_deleted' => 'Upload Deleted',
'child_locations' => 'Child Locations',
'append' => 'Append',
// Add form placeholders here
'placeholders' => [

2
resources/views/account/accept/create.blade.php
View File

@ -101,7 +101,7 @@
<input type="hidden" name="signature_output" id="signature_output">
</div>
<div class="col-md-12 col-sm-12 col-lg-12 col-xs-12 text-left">
<button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">{{trans('general.clear_signature')}}</button>
<button type="button" class="btn btn-sm btn-theme clear" data-action="clear" id="clear_button">{{trans('general.clear_signature')}}</button>
</div>
</div>
</div>

9
resources/views/account/profile.blade.php
View File

@ -257,6 +257,15 @@
// This takes the color from the color picker to show a live preview
$(function() {
/**
* 5. Add an event listener to toggle the reset
*/
clearButton.addEventListener("click", (event) => {
localStorage.removeItem("theme");
});
$('#nav-link-color').colorpicker().on('changeColor', function(e) {
var color = e.color.toString('rgba');
// $('.navbar-nav > li > a').css('background-color', header_color);

2
resources/views/blade/input/location-select.blade.php
View File

@ -55,7 +55,7 @@
<div class="col-md-1 col-sm-1 text-left">
@unless($hideNewButton)
@can('create', Location::class)
<a href='{{ route('modal.show', 'location') }}' data-toggle="modal" data-target="#createModal" data-select='{{ $name }}_location_select' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
<a href='{{ route('modal.show', 'location') }}' data-toggle="modal" data-target="#createModal" data-select='{{ $name }}_location_select' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
@endcan
@endunless
</div>

2
resources/views/components/tables/bulk-actions.blade.php
View File

@ -29,7 +29,7 @@
{{ $slot }}
</select>
<button class="btn btn-primary" id="{{ $id_button }}"
<button class="btn btn-theme" id="{{ $id_button }}"
disabled>{{ trans('button.go') }}</button>
</form>
</div>

4
resources/views/custom_fields/index.blade.php
View File

@ -21,7 +21,7 @@
<h2 class="box-title">{{ trans('admin/custom_fields/general.fieldsets') }}</h2>
<div class="box-tools pull-right">
@can('create', \App\Models\CustomFieldset::class)
<a href="{{ route('fieldsets.create') }}" class="btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('admin/custom_fields/general.create_fieldset_title') }}">{{ trans('admin/custom_fields/general.create_fieldset') }}</a>
<a href="{{ route('fieldsets.create') }}" class="btn btn-sm btn-theme" data-tooltip="true" title="{{ trans('admin/custom_fields/general.create_fieldset_title') }}">{{ trans('admin/custom_fields/general.create_fieldset') }}</a>
@endcan
</div>
</div><!-- /.box-header -->
@ -115,7 +115,7 @@
<h2 class="box-title">{{ trans('admin/custom_fields/general.custom_fields') }}</h2>
<div class="box-tools pull-right">
@can('create', \App\Models\CustomField::class)
<a href="{{ route('fields.create') }}" class="btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('admin/custom_fields/general.create_field_title') }}">{{ trans('admin/custom_fields/general.create_field') }}</a>
<a href="{{ route('fields.create') }}" class="btn btn-sm btn-theme" data-tooltip="true" title="{{ trans('admin/custom_fields/general.create_field_title') }}">{{ trans('admin/custom_fields/general.create_field') }}</a>
@endcan
</div>

2
resources/views/departments/view.blade.php
View File

@ -9,7 +9,7 @@
@stop
@section('header_right')
<a href="{{ route('departments.edit', ['department' => $department->id]) }}" class="btn btn-sm btn-primary pull-right">{{ trans('admin/departments/table.update') }} </a>
<a href="{{ route('departments.edit', ['department' => $department->id]) }}" class="btn btn-sm btn-theme pull-right">{{ trans('admin/departments/table.update') }} </a>
@stop
{{-- Page content --}}

2
resources/views/hardware/bulk.blade.php
View File

@ -8,7 +8,7 @@
@section('header_right')
<a href="{{ URL::previous() }}" class="btn btn-sm btn-primary pull-right">
<a href="{{ URL::previous() }}" class="btn btn-sm btn-theme pull-right">
{{ trans('general.back') }}</a>
@stop

6
resources/views/hardware/edit.blade.php
View File

@ -46,7 +46,7 @@
{!! $errors->first('asset_tag', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
</div>
<div class="col-md-2 col-sm-12">
<button class="add_field_button btn btn-default btn-sm" name="add_field_button">
<button class="add_field_button btn btn-sm btn-theme" name="add_field_button">
<x-icon type="plus" />
<span class="sr-only">
{{ trans('general.new') }}
@ -86,7 +86,7 @@
{!! $errors->first('asset_tags.'.$i, '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
</div>
<div class="col-md-2 col-sm-12">
<a href="#" class="remove_field btn btn-default btn-sm"><x-icon type="minus"/></a>
<a href="#" class="remove_field btn btn-sm btn-theme"><x-icon type="minus"/></a>
</div>
</div>
@include ('partials.forms.edit.serial', ['fieldname'=> 'serials['.$i.']', 'old_val_name' => 'serials.'.$i, 'translated_serial' => trans('admin/hardware/form.serial')])
@ -357,7 +357,7 @@
box_html += '<input type="text" class="form-control" name="asset_tags[' + x + ']" value="{{ (($snipeSettings->auto_increment_prefix!='') && ($snipeSettings->auto_increment_assets=='1')) ? $snipeSettings->auto_increment_prefix : '' }}'+ auto_tag +'" required>';
box_html += '</div>';
box_html += '<div class="col-md-2 col-sm-12">';
box_html += '<a href="#" class="remove_field btn btn-default btn-sm"><x-icon type="minus" /></a>';
box_html += '<a href="#" class="remove_field btn btn-sm btn-theme"><x-icon type="minus" /></a>';
box_html += '</div>';
// box_html += '</div>';
box_html += '</div>';

6
resources/views/hardware/view.blade.php
View File

@ -231,7 +231,7 @@
@can('checkin', $asset)
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
<span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
<a role="button" href="{{ route('hardware.checkin.create', $asset->id) }}" class="btn btn-sm btn-primary bg-purple btn-social btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
<a role="button" href="{{ route('hardware.checkin.create', $asset->id) }}" class="btn btn-sm btn-theme bg-purple btn-social btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
<x-icon type="checkin" />
{{ trans('admin/hardware/general.checkin') }}
</a>
@ -255,7 +255,7 @@
<!-- Add notes -->
@can('update', \App\Models\Asset::class)
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
<a href="#" style="width: 100%" data-toggle="modal" data-target="#createNoteModal" class="btn btn-sm btn-primary btn-block btn-social hidden-print">
<a href="#" style="width: 100%" data-toggle="modal" data-target="#createNoteModal" class="btn btn-sm btn-theme btn-block btn-social hidden-print">
<x-icon type="note" />
{{ trans('general.add_note') }}
</a>
@ -269,7 +269,7 @@
@can('audit', \App\Models\Asset::class)
<div class="col-md-12 hidden-print" style="padding-top: 5px;">
<span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
<a href="{{ route('asset.audit.create', $asset->id) }}" class="btn btn-sm btn-primary btn-block btn-social hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
<a href="{{ route('asset.audit.create', $asset->id) }}" class="btn btn-sm btn-theme btn-block btn-social hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
<x-icon type="audit" />
{{ trans('general.audit') }}
</a>

240
resources/views/kits/edit.blade.php
View File

@ -13,24 +13,30 @@
@section('content')
@parent
{{-- Assets by model --}}
<div class="row">
<div class="col-md-12">
<div class="col-md-8 col-md-offset-2">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title"><span>{{ trans('general.asset_models') }}</span></h3>
<div class="row">
<div class="col-md-8">
<h3 class="box-title" style="padding-top: 8px; padding-left: 15px;">
{{ trans('general.asset_models') }}
</h3>
</div>
<div class="col-md-4 text-right">
<a href="{{ route('modal.show', ['type' => 'kit-model', 'itemId' => $item->id]) }}" data-refresh="kitModelsTable" data-toggle="modal" data-target="#createModal" class="btn btn-theme btn-sm pull-right"><i class="fas fa-plus icon-white"></i> {{ trans('button.append')}}</a>
</div>
</div>
</div>
<div class="box-body">
<div class="table-responsive">
<table
data-cookie-id-table="kitModelsTable"
data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableModels() }}"
data-side-pagination="server"
data-sort-order="asc"
data-sort-name="name"
id="kitModelsTable"
@ -41,114 +47,128 @@
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}'>
</table>
<a href="{{ route('modal.show', ['type' => 'kit-model', 'itemId' => $item->id]) }}" data-refresh="kitModelsTable" data-toggle="modal" data-target="#createModal" class="btn btn-primary pull-right"><i class="fas fa-plus icon-white"></i> {{ trans('button.append')}}</a>
</div>
</div> <!--.box-body-->
</div> <!-- /.box.box-default-->
</div> <!-- .col-md-12-->
</div>
{{-- Licenses --}}
{{--<div class="row">--}}
{{-- <div class="col-md-12">--}}
{{-- <div class="box box-default">--}}
{{-- <div class="box-header with-border">--}}
{{-- <h3 class="box-title">Licenses--}}{{-- TODO: trans --}}{{--</h3>--}}
{{-- </div>--}}
{{-- <div class="box-body">--}}
{{-- <div class="table-responsive">--}}
{{-- <table--}}
{{-- data-cookie-id-table="kitLicensesTable"--}}
{{-- data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableLicenses() }}"--}}
{{-- --}}
{{-- --}}
{{-- data-side-pagination="server"--}}
{{-- --}}
{{-- --}}
{{-- --}}
{{-- data-sort-order="asc"--}}
{{-- data-sort-name="name"--}}
{{-- id="kitLicensesTable"--}}
{{-- class="table table-striped snipe-table"--}}
{{-- data-url="{{ route('api.kits.licenses.index', $item->id) }}"--}}
{{-- data-export-options='{--}}
{{-- "fileName": "export-kit-models-{{ date('Y-m-d') }}",--}}
{{-- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]--}}
{{-- }'>--}}
{{-- </table>--}}
{{-- <a href="{{ route('modal.show', [ 'type' => 'kit-license', 'itemId' => $item->id]) }}" data-refresh="kitLicensesTable" data-toggle="modal" data-target="#createModal" class="btn btn-primary pull-right"><i class="fas fa-plus icon-white"></i> Append--}}{{-- TODO: trans --}}{{--</a>--}}
{{-- </div>--}}
{{-- </div> <!--.box-body-->--}}
{{-- </div> <!-- /.box.box-default-->--}}
{{-- </div> <!-- .col-md-12-->--}}
{{-- </div>--}}
{{-- Consumables --}}
{{--<div class="row">--}}
{{-- <div class="col-md-12">--}}
{{-- <div class="box box-default">--}}
{{-- <div class="box-header with-border">--}}
{{-- <h3 class="box-title">Consumables--}}{{-- TODO: trans --}}{{--</h3>--}}
{{-- </div>--}}
{{-- <div class="box-body">--}}
{{-- <div class="table-responsive">--}}
{{-- <table--}}
{{-- data-cookie-id-table="kitConsumablesTable"--}}
{{-- data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableConsumables() }}"--}}
{{-- --}}
{{-- --}}
{{-- data-side-pagination="server"--}}
{{-- --}}
{{-- --}}
{{-- --}}
{{-- data-sort-order="asc"--}}
{{-- data-sort-name="name"--}}
{{-- id="kitConsumablesTable"--}}
{{-- class="table table-striped snipe-table"--}}
{{-- data-url="{{ route('api.kits.consumables.index', $item->id) }}"--}}
{{-- data-export-options='{--}}
{{-- "fileName": "export-kit-models-{{ date('Y-m-d') }}",--}}
{{-- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]--}}
{{-- }'>--}}
{{-- </table>--}}
{{-- <a href="{{ route('modal.show', ['type' => 'kit-consumable', 'itemId' => $item->id]) }}" data-refresh="kitConsumablesTable" data-toggle="modal" data-target="#createModal" class="btn btn-primary pull-right"><i class="fas fa-plus icon-white"></i> Append--}}{{-- TODO: trans --}}{{--</a>--}}
{{-- </div>--}}
{{-- </div> <!--.box-body-->--}}
{{-- </div> <!-- /.box.box-default-->--}}
{{-- </div> <!-- .col-md-12-->--}}
{{-- </div>--}}
{{-- Accessories --}}
{{--<div class="row">--}}
{{-- <div class="col-md-12">--}}
{{-- <div class="box box-default">--}}
{{-- <div class="box-header with-border">--}}
{{-- <h3 class="box-title">Accessories--}}{{-- TODO: trans --}}{{--</h3>--}}
{{-- </div>--}}
{{-- <div class="box-body">--}}
{{-- <div class="table-responsive">--}}
{{-- <table--}}
{{-- data-cookie-id-table="kitAccessoriesTable"--}}
{{-- data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableAccessories() }}"--}}
{{-- --}}
{{-- --}}
{{-- data-side-pagination="server"--}}
{{-- --}}
{{-- --}}
{{-- --}}
{{-- data-sort-order="asc"--}}
{{-- data-sort-name="name"--}}
{{-- id="kitAccessoriesTable"--}}
{{-- class="table table-striped snipe-table"--}}
{{-- data-url="{{ route('api.kits.accessories.index', $item->id) }}"--}}
{{-- data-export-options='{--}}
{{-- "fileName": "export-kit-models-{{ date('Y-m-d') }}",--}}
{{-- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]--}}
{{-- }'>--}}
{{-- </table>--}}
{{-- <a href="{{ route('modal.show', ['type' => 'kit-accessory', 'itemId' => $item->id]) }}" data-refresh="kitAccessoriesTable" data-toggle="modal" data-target="#createModal" class="btn btn-primary pull-right"><i class="fas fa-plus icon-white"></i> Append--}}{{-- TODO: trans --}}{{--</a>--}}
{{-- </div>--}}
{{-- </div> <!--.box-body-->--}}
{{-- </div> <!-- /.box.box-default-->--}}
{{-- </div> <!-- .col-md-12-->--}}
{{-- </div>--}}
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="box box-default">
<div class="box-header with-border">
<div class="row">
<div class="col-md-8">
<h3 class="box-title" style="padding-top: 8px; padding-left: 15px;">
{{ trans('general.licenses') }}
</h3>
</div>
<div class="col-md-4 text-right">
<a href="{{ route('modal.show', [ 'type' => 'kit-license', 'itemId' => $item->id]) }}" data-refresh="kitLicensesTable" data-toggle="modal" data-target="#createModal" class="btn btn-theme btn-sm pull-right"><i class="fas fa-plus icon-white"></i> {{ trans('general.append') }} </a>
</div>
</div>
</div>
<div class="box-body">
<div class="table-responsive">
<table
data-cookie-id-table="kitLicensesTable"
data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableLicenses() }}"
data-side-pagination="server"
data-sort-order="asc"
data-sort-name="name"
id="kitLicensesTable"
class="table table-striped snipe-table"
data-url="{{ route('api.kits.licenses.index', $item->id) }}"
data-export-options='{
"fileName": "export-kit-models-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}'>
</table>
</div>
</div> <!--.box-body-->
</div> <!-- /.box.box-default-->
</div> <!-- .col-md-12-->
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="box box-default">
<div class="box-header with-border">
<div class="row">
<div class="col-md-8">
<h3 class="box-title" style="padding-top: 8px; padding-left: 15px;">
{{ trans('general.consumables') }}
</h3>
</div>
<div class="col-md-4 text-right">
<a href="{{ route('modal.show', ['type' => 'kit-consumable', 'itemId' => $item->id]) }}" data-refresh="kitConsumablesTable" data-toggle="modal" data-target="#createModal" class="btn btn-theme btn-sm pull-right"><i class="fas fa-plus icon-white"></i> {{ trans('general.append') }}</a>
</div>
</div>
</div>
<div class="box-body">
<div class="table-responsive">
<table
data-cookie-id-table="kitConsumablesTable"
data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableConsumables() }}"
data-side-pagination="server"
data-sort-order="asc"
data-sort-name="name"
id="kitConsumablesTable"
class="table table-striped snipe-table"
data-url="{{ route('api.kits.consumables.index', $item->id) }}"
data-export-options='{
"fileName": "export-kit-models-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}'>
</table>
</div>
</div> <!--.box-body-->
</div> <!-- /.box.box-default-->
</div> <!-- .col-md-12-->
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="box box-default">
<div class="box-header with-border">
<div class="row">
<div class="col-md-8">
<h3 class="box-title" style="padding-top: 8px; padding-left: 15px;">
{{ trans('general.accessories') }}
</h3>
</div>
<div class="col-md-4 text-right">
<a href="{{ route('modal.show', ['type' => 'kit-accessory', 'itemId' => $item->id]) }}" data-refresh="kitAccessoriesTable" data-toggle="modal" data-target="#createModal" class="btn btn-theme btn-sm pull-right"><i class="fas fa-plus icon-white"></i> {{ trans('general.append') }}</a>
</div>
</div>
</div>
<div class="box-body">
<div class="table-responsive">
<table
data-cookie-id-table="kitAccessoriesTable"
data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableAccessories() }}"
data-side-pagination="server"
data-sort-order="asc"
data-sort-name="name"
id="kitAccessoriesTable"
class="table table-striped snipe-table"
data-url="{{ route('api.kits.accessories.index', $item->id) }}"
data-export-options='{
"fileName": "export-kit-models-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
}'>
</table>
</div>
</div> <!--.box-body-->
</div> <!-- /.box.box-default-->
</div> <!-- .col-md-12-->
</div>
@stop
@section('moar_scripts')

6
resources/views/kits/index.blade.php
View File

@ -8,11 +8,6 @@
@parent
@stop
@section('header_right')
<a href="{{ route('kits.create') }}" class="btn btn-primary text-right">{{ trans('general.create') }}</a>
@stop
{{-- Content --}}
@section('content')
<div class="row">
@ -27,6 +22,7 @@
data-sort-name="name"
id="kitsTable"
class="table table-striped snipe-table"
data-buttons="kitButtons"
data-url="{{ route('api.kits.index') }}"
data-export-options='{
"fileName": "export-kits-{{ date('Y-m-d') }}",

22
resources/views/layouts/default.blade.php
View File

@ -304,10 +304,26 @@
.modal-danger h2,
.modal-header h2,
.modal-warning h2
.bg-maroon,
.bg-maroon:hover,
.bg-maroon:focus,
.bg-purple,
.bg-purple:hover,
.bg-purple:focus
{
color: white !important;
}
.btn-selected,
.btn-selected a,
.btn-selected:hover,
.btn-selected:focus {
background-color: var(--table-stripe-bg) !important;
border-color: var(--table-stripe-bg) !important;
color: light-dark(hsl(from var(--color-fg) h s calc(l - 10)),hsl(from var(--color-fg) h s calc(l - 10))) !important;
}
.btn-default,
.btn-default:hover
{
@ -1902,12 +1918,6 @@
currentThemeSetting = newTheme;
});
/**
* 5. Add an event listener to toggle the reset
*/
clearButton.addEventListener("click", (event) => {
localStorage.removeItem("theme");
});

7
resources/views/layouts/edit-form.blade.php
View File

@ -10,13 +10,6 @@
@parent
@stop
@section('header_right')
<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
{{ trans('general.back') }}</a>
@stop
{{-- Page content --}}
@section('content')

6
resources/views/livewire/importer.blade.php
View File

@ -131,11 +131,11 @@
<td>{{ ($currentFile->adminuser) ? $currentFile->adminuser->present()->fullName : '--'}}</td>
<td>{{ Helper::formatFilesizeUnits($currentFile->filesize) }}</td>
<td class="col-md-1 text-right" style="white-space: nowrap;">
<button class="btn btn-sm btn-info" wire:click="selectFile({{ $currentFile->id }})" data-tooltip="true" title="{{ trans('general.import_this_file') }}">
<button class="btn btn-sm btn-info" wire:click="selectFile({{ $currentFile->id }})" data-tooltip="true" data-title="{{ trans('general.import_this_file') }}">
<i class="fa-solid fa-list-check" aria-hidden="true"></i>
<span class="sr-only">{{ trans('general.import') }}</span>
</button>
<a href="#" wire:click.prevent="$set('activeFileId',null)">
<a href="#" wire:click.prevent="$set('activeFileId',null)" data-tooltip="true" data-title="{{ trans('general.delete') }}">
<button class="btn btn-sm btn-danger" wire:click="destroy({{ $currentFile->id }})">
<i class="fas fa-trash icon-white" aria-hidden="true"></i>
<span class="sr-only">{{ trans('general.delete') }}</span>
@ -145,7 +145,7 @@
</tr>
@if( $currentFile && $this->activeFile && ($currentFile->id == $this->activeFile->id))
<tr class="callout" style="padding-left: 10px;">
<tr>
<td colspan="5">
<div class="form-group">

2
resources/views/livewire/location-scope-check.blade.php
View File

@ -11,5 +11,5 @@
<strong>{{ trans('admin/settings/general.scope_locations_fmcs_test_needed') }}</strong>
@endif
</p>
<button class="btn btn-sm btn-default" wire:click.prevent="check_locations">{{ trans('admin/settings/general.scope_locations_fmcs_check_button') }}</button>
<button class="btn btn-sm btn-theme" wire:click.prevent="check_locations">{{ trans('admin/settings/general.scope_locations_fmcs_check_button') }}</button>
</div>

4
resources/views/locations/view.blade.php
View File

@ -542,13 +542,13 @@
@if ($location->deleted_at=='')
<div class="col-md-12" style="padding-top: 5px;">
<a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
<a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-theme btn-social hidden-print">
<x-icon type="print" />
{{ trans('admin/locations/table.print_inventory') }}
</a>
</div>
<div class="col-md-12" style="padding-top: 5px;">
<a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
<a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-theme btn-social hidden-print">
<x-icon type="print" />
{{ trans('admin/locations/table.print_all_assigned') }}
</a>

4
resources/views/manufacturers/index.blade.php
View File

@ -22,7 +22,7 @@
<div class="callout callout-info">
<p>
{{ trans('general.seeding.manufacturers.prompt') }}
<button class="btn btn-sm btn-primary hidden-print" rel="noopener">
<button class="btn btn-sm btn-theme hidden-print" rel="noopener">
{{ trans('general.seeding.manufacturers.button') }}
</button>
</p>
@ -57,7 +57,7 @@
{{-- end stuff for bulk dropdown --}}
data-buttons="manufacturerButtons"
class="table table-striped snipe-table"
data-url="{{route('api.manufacturers.index', ['deleted' => (request('deleted')=='true') ? 'true' : 'false' ]) }}"
data-url="{{route('api.manufacturers.index', ['status' => e(request()->input('status')) ]) }}"
data-export-options='{
"fileName": "export-manufacturers-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]

2
resources/views/models/bulk-edit.blade.php
View File

@ -8,7 +8,7 @@
@section('header_right')
<a href="{{ URL::previous() }}" class="btn btn-sm btn-primary pull-right">
<a href="{{ URL::previous() }}" class="btn btn-sm btn-theme pull-right">
{{ trans('general.back') }}</a>
@stop

129
resources/views/partials/bootstrap-table.blade.php
View File

@ -253,7 +253,7 @@
},
attributes: {
title: '{{ trans('general.show_admins') }}',
class: '{{ (request()->input('admins') == "true") ? ' btn-danger' : '' }}'
class: '{{ (request()->input('admins') == "true") ? ' btn-selected text-danger' : '' }}'
}
},
@ -264,7 +264,7 @@
window.location.href = '{{ (request()->input('status') == "deleted") ? route('users.index') : route('users.index', ['status' => 'deleted']) }}';
},
attributes: {
class: '{{ (request()->input('status') == "deleted") ? ' btn-danger' : '' }}',
class: '{{ (request()->input('status') == "deleted") ? ' btn-selected text-danger ' : '' }}',
title: '{{ (request()->input('status') == "deleted") ? trans('admin/users/table.show_current') : trans('admin/users/table.show_deleted') }}',
}
@ -283,7 +283,7 @@
window.location.href = '{{ route('companies.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -305,7 +305,7 @@
window.location.href = '{{ route('groups.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -328,7 +328,7 @@
},
attributes: {
title: '{{ trans('general.create') }}',
class: 'btn-info',
class: 'btn-warning',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@endif
@ -368,7 +368,7 @@
window.location.href = '{{ (request()->input('status') == "Deleted") ? route('hardware.index') : route('hardware.index', ['status' => 'Deleted']) }}';
},
attributes: {
class: '{{ (request()->input('status') == "Deleted") ? ' btn-danger' : '' }}',
class: '{{ (request()->input('status') == "Deleted") ? 'btn-selected text-danger' : '' }}',
title: '{{ (request()->input('status') == "Deleted") ? trans('general.list_all') : trans('general.deleted') }}',
}
@ -385,7 +385,7 @@
window.location.href = '{{ route('locations.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -400,6 +400,7 @@
window.location.href = '{{ (request()->input('status') == "deleted") ? route('locations.index') : route('locations.index', ['status' => 'deleted']) }}';
},
attributes: {
class: '{{ (request()->input('status') == "deleted") ? 'btn-selected text-danger' : '' }}',
title: '{{ (request()->input('status') == "deleted") ? trans('admin/users/table.show_current') : trans('admin/users/table.show_deleted') }}',
}
@ -417,7 +418,7 @@
window.location.href = '{{ route('accessories.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -437,7 +438,7 @@
window.location.href = '{{ route('depreciations.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -457,7 +458,7 @@
window.location.href = '{{ route('fields.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -478,7 +479,7 @@
window.location.href = '{{ route('fieldsets.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -498,7 +499,7 @@
window.location.href = '{{ route('components.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -518,7 +519,7 @@
window.location.href = '{{ route('consumables.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -529,7 +530,7 @@
@endcan
@can('create', \App\Models\Manufacturer::class)
// Consumable table buttons
// Manufacturer table buttons
window.manufacturerButtons = () => ({
btnAdd: {
text: '{{ trans('general.create') }}',
@ -538,25 +539,25 @@
window.location.href = '{{ route('manufacturers.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@endif
},
},
btnShowDeleted: {
text: '{{ (request()->input('status') == "Deleted") ? trans('general.list_all') : trans('general.deleted') }}',
icon: 'fa-solid fa-trash',
event () {
window.location.href = '{{ (request()->input('status') == "deleted") ? route('manufacturers.index') : route('manufacturers.index', ['status' => 'deleted']) }}';
},
attributes: {
class: '{{ (request()->input('status') == "Deleted") ? ' btn-danger' : '' }}',
title: '{{ (request()->input('status') == "Deleted") ? trans('general.list_all') : trans('general.deleted') }}',
}
btnShowDeleted: {
text: '{{ (request()->input('status') == "Deleted") ? trans('general.list_all') : trans('general.deleted') }}',
icon: 'fa-solid fa-trash',
event () {
window.location.href = '{{ (request()->input('status') == "deleted") ? route('manufacturers.index') : route('manufacturers.index', ['status' => 'deleted']) }}';
},
attributes: {
class: '{{ (request()->input('status') == "deleted") ? 'btn-selected text-danger' : '' }}',
title: '{{ (request()->input('status') == "deleted") ? trans('general.list_all') : trans('general.deleted') }}',
}
},
});
@endcan
@ -571,7 +572,7 @@
window.location.href = '{{ route('suppliers.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -591,7 +592,7 @@
window.location.href = '{{ route('departments.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -611,7 +612,7 @@
window.location.href = '{{ route('departments.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -631,7 +632,7 @@
window.location.href = '{{ route('maintenances.create', ['asset_id' => (isset($asset)) ? $asset->id :'' ]) }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('button.add_maintenance') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -651,7 +652,27 @@
window.location.href = '{{ route('categories.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@endif
}
},
});
@endcan
@can('create', \App\Models\PredefinedKit::class)
// Custom Field table buttons
window.kitButtons = () => ({
btnAdd: {
text: '{{ trans('general.create') }}',
icon: 'fa fa-plus',
event () {
window.location.href = '{{ route('kits.create') }}';
},
attributes: {
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -671,7 +692,7 @@
window.location.href = '{{ route('models.create') }}';
},
attributes: {
class: 'btn-info',
class: 'btn-warning',
title: '{{ trans('general.create') }}',
@if ($snipeSettings->shortcuts_enabled == 1)
accesskey: 'n'
@ -685,7 +706,7 @@
window.location.href = '{{ (request()->input('status') == "deleted") ? route('models.index') : route('models.index', ['status' => 'deleted']) }}';
},
attributes: {
class: '{{ (request()->input('status') == "deleted") ? ' btn-danger' : '' }}',
class: '{{ (request()->input('status') == "deleted") ? ' btn-selected text-danger' : '' }}',
title: '{{ (request()->input('status') == "deleted") ? trans('general.list_all') : trans('general.deleted') }}',
}
@ -740,7 +761,7 @@
window.location.href = '{{ route('licenses.export', ['category_id' => (isset($category)) ? $category->id :'' ]) }}';
},
attributes: {
class: 'btn-primary',
class: 'btn-warning',
title: '{{ trans('general.export_all_to_csv') }}',
}
},
@ -1020,7 +1041,7 @@
function hardwareAuditFormatter(value, row) {
return '<a href="{{ config('app.url') }}/hardware/' + row.id + '/audit" class="actions btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" /><span class="sr-only">{{ trans('general.audit') }}</span></a>&nbsp;';
return '<a href="{{ config('app.url') }}/hardware/' + row.id + '/audit" class="actions btn btn-sm btn-theme" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" /><span class="sr-only">{{ trans('general.audit') }}</span></a>&nbsp;';
}
@ -1053,7 +1074,7 @@
}
if ((row.available_actions) && (row.available_actions.audit === true)) {
actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/audit" class="actions btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" class="fa-fw" /><span class="sr-only">{{ trans('general.audit') }}</span></a>&nbsp;';
actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/audit" class="actions btn btn-sm btn-theme" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" class="fa-fw" /><span class="sr-only">{{ trans('general.audit') }}</span></a>&nbsp;';
}
if ((row.available_actions) && (row.available_actions.update === true)) {
@ -1191,14 +1212,14 @@
// check that checkin is not disabled
if (row.user_can_checkout === false) {
return '<span class="btn btn-sm bg-maroon disabled" data-tooltip="true" title="{{ trans('admin/licenses/message.checkout.unavailable') }}">{{ trans('general.checkout') }}</span>';
return '<span class="btn btn-sm bg-maroon btn-checkout disabled" data-tooltip="true" title="{{ trans('admin/licenses/message.checkout.unavailable') }}">{{ trans('general.checkout') }}</span>';
} else if (row.disabled === true) {
return '<span class="btn btn-sm bg-maroon disabled" data-tooltip="true" title="{{ trans('admin/licenses/message.checkout.license_is_inactive') }}">{{ trans('general.checkout') }}</span>';
return '<span class="btn btn-sm bg-maroon btn-checkout disabled" data-tooltip="true" title="{{ trans('admin/licenses/message.checkout.license_is_inactive') }}">{{ trans('general.checkout') }}</span>';
} else
// The user is allowed to check the license seat out and it's available
if ((row.available_actions.checkout === true) && (row.user_can_checkout === true) && (row.disabled === false)) {
return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkout/" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkout/" class="btn btn-sm bg-maroon btn-checkout" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
}
}
// We need a special formatter for license seats, since they don't work exactly the same
@ -1209,16 +1230,16 @@
return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
}
if (row.disabled) {
return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkin" class="btn btn-sm bg-maroon disabled" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkout') }}</a>';
return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkin" class="btn btn-sm bg-maroon btn-checkout disabled" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkout') }}</a>';
}
// The user is allowed to check the license seat out and it's available
if ((row.available_actions.checkout === true) && (row.user_can_checkout === true) && ((!row.assigned_asset) && (!row.assigned_user))) {
return '<a href="{{ config('app.url') }}/licenses/' + row.license_id + '/checkout/'+row.id+'" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
return '<a href="{{ config('app.url') }}/licenses/' + row.license_id + '/checkout/'+row.id+'" class="btn btn-sm bg-maroon btn-checkout" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
}
// The user is allowed to check the license seat in and it's available
if ((row.available_actions.checkin === true) && ((row.assigned_asset) || (row.assigned_user))) {
return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkin/" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkin/" class="btn btn-sm bg-purple btn-checkin" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
}
}
@ -1229,7 +1250,7 @@
// The user is allowed to check items out, AND the item is deployable
if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) {
return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm bg-maroon btn-checkout" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
// The user is allowed to check items out, but the item is not able to be checked out
} else if (((row.user_can_checkout == false)) && (row.available_actions.checkout == true) && (!row.assigned_to)) {
@ -1237,17 +1258,17 @@
// We use slightly different language for assets versus other things, since they are the only
// item that has a status label
if (destination =='hardware') {
return '<span data-tooltip="true" title="{{ trans('admin/hardware/general.undeployable_tooltip') }}"><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></span>';
return '<span data-tooltip="true" title="{{ trans('admin/hardware/general.undeployable_tooltip') }}"><a class="btn btn-sm bg-maroon btn-checkout disabled">{{ trans('general.checkout') }}</a></span>';
} else {
return '<span data-tooltip="true" title="{{ trans('general.undeployable_tooltip') }}"><a class="btn btn-sm bg-maroon disabled">{{ trans('general.checkout') }}</a></span>';
return '<span data-tooltip="true" title="{{ trans('general.undeployable_tooltip') }}"><a class="btn btn-sm bg-maroon btn-checkout disabled">{{ trans('general.checkout') }}</a></span>';
}
// The user is allowed to check items in
} else if (row.available_actions.checkin == true) {
if (row.assigned_to) {
return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm bg-purple btn-checkin" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
} else if (row.assigned_pivot_id) {
return '<a href="{{ config('app.url') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
return '<a href="{{ config('app.url') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple btn-checkin" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
}
}
@ -1603,7 +1624,7 @@
// This is users in the user accounts section for EULAs
function downloadFormatter(value) {
if (value) {
return '<a href="' + value + '" class="btn btn-sm btn-default"><x-icon type="download" /></a>';
return '<a href="' + value + '" class="btn btn-sm btn-theme"><x-icon type="download" /></a>';
}
}
@ -1624,10 +1645,10 @@
return '';
}
var download_button = '<a href="' + download_url + '" class="btn btn-sm btn-default" data-tooltip="true" title="{{ trans('general.download') }}"><x-icon type="download" /></a>';
var download_button_disabled = '<span data-tooltip="true" title="{{ trans('general.file_does_not_exist') }}"><a class="btn btn-sm btn-default disabled"><x-icon type="download" /></a></span>';
var inline_button = '<a href="'+ download_url +'?inline=true" class="btn btn-sm btn-default" target="_blank" data-tooltip="true" title="{{ trans('general.open_new_window') }}"><x-icon type="external-link" /></a>';
var inline_button_disabled = '<span data-tooltip="true" title="{{ trans('general.file_not_inlineable') }}"><a class="btn btn-sm btn-default disabled" target="_blank" data-tooltip="true" title="{{ trans('general.file_does_not_exist') }}"><x-icon type="external-link" /></a></span>';
var download_button = '<a href="' + download_url + '" class="btn btn-sm btn-theme" data-tooltip="true" title="{{ trans('general.download') }}"><x-icon type="download" /></a>';
var download_button_disabled = '<span data-tooltip="true" title="{{ trans('general.file_does_not_exist') }}"><a class="btn btn-sm btn-theme disabled"><x-icon type="download" /></a></span>';
var inline_button = '<a href="'+ download_url +'?inline=true" class="btn btn-sm btn-theme" target="_blank" data-tooltip="true" title="{{ trans('general.open_new_window') }}"><x-icon type="external-link" /></a>';
var inline_button_disabled = '<span data-tooltip="true" title="{{ trans('general.file_not_inlineable') }}"><a class="btn btn-sm btn-theme disabled" target="_blank" data-tooltip="true" title="{{ trans('general.file_does_not_exist') }}"><x-icon type="external-link" /></a></span>';
if (exists_on_disk === true) {
if (inlinable === true) {
@ -1725,8 +1746,8 @@
.replace('%NOTE%', (row.note) ? row.note : '')
.replace('%PANEL_CLASS%', (row.exists_on_disk === true) ? 'default' : 'danger')
.replace('%FILE_EMBED%', embed_code)
.replace('%DOWNLOAD_BUTTON%', (row.exists_on_disk === true) ? '<a href="'+ row.url +'" class="btn btn-sm btn-default"><x-icon type="download" /></a> ' : '<span class="btn btn-sm btn-default disabled" data-tooltip="true" title="{{ trans('general.file_upload_status.file_not_found') }}"><x-icon type="download" /></span>')
.replace('%NEW_WINDOW_BUTTON%', (row.exists_on_disk === true) ? '<a href="'+ row.url +'?inline=true" class="btn btn-sm btn-default" target="_blank"><x-icon type="external-link" /></a> ' : '<span class="btn btn-sm btn-default disabled" data-tooltip="true" title="{{ trans('general.file_upload_status.file_not_found') }}"><x-icon type="external-link"/></span>')
.replace('%DOWNLOAD_BUTTON%', (row.exists_on_disk === true) ? '<a href="'+ row.url +'" class="btn btn-sm btn-theme"><x-icon type="download" /></a> ' : '<span class="btn btn-sm btn-theme disabled" data-tooltip="true" title="{{ trans('general.file_upload_status.file_not_found') }}"><x-icon type="download" /></span>')
.replace('%NEW_WINDOW_BUTTON%', (row.exists_on_disk === true) ? '<a href="'+ row.url +'?inline=true" class="btn btn-sm btn-theme" target="_blank"><x-icon type="external-link" /></a> ' : '<span class="btn btn-sm btn-theme disabled" data-tooltip="true" title="{{ trans('general.file_upload_status.file_not_found') }}"><x-icon type="external-link"/></span>')
.replace('%DELETE_BUTTON%', (row.available_actions.delete === true) ?
'<a href="'+delete_url+'" class="delete-asset btn btn-danger btn-sm" data-icon="fa-trash" data-toggle="modal" data-content="{{ trans('general.file_upload_status.confirm_delete') }} '+ row.filename +'?" data-title="{{ trans('general.delete') }}" onClick="return false;" data-target="#dataConfirmModal"><x-icon type="delete" /><span class="sr-only">{{ trans('general.delete') }}</span></a>' :
'<a class="btn btn-sm btn-danger disabled" data-tooltip="true" title="{{ trans('general.file_upload_status.file_not_found') }}"><x-icon type="delete" /><span class="sr-only">{{ trans('general.delete') }}</span></a>'

2
resources/views/partials/forms/edit/category-select.blade.php
View File

@ -28,7 +28,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Category::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.show',['type' => 'category', 'category_type' => isset($category_type) ? $category_type : 'assets' ]) }}' data-toggle="modal" data-target="#createModal" data-select='category_select_id' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
<a href='{{ route('modal.show',['type' => 'category', 'category_type' => isset($category_type) ? $category_type : 'assets' ]) }}' data-toggle="modal" data-target="#createModal" data-select='category_select_id' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
@endif
@endcan
</div>

2
resources/views/partials/forms/edit/image-upload.blade.php
View File

@ -53,7 +53,7 @@
<input type="file" id="{{ (isset($fieldname) ? $fieldname : 'image') }}" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="sr-only">
<label class="btn btn-default" aria-hidden="true">
<label class="btn btn-sm btn-theme" aria-hidden="true">
{{ trans('button.select_file') }}
<input type="file" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml,image/avif" style="display:none; max-width: 90%" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-hidden="true">
</label>

2
resources/views/partials/forms/edit/kit-select.blade.php
View File

@ -17,7 +17,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\PredefinedKit::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
{{-- <a href='{{ route('modal.show, 'kit') }}' data-toggle="modal" data-target="#createModal" data-select='kit_id_select' class="btn btn-sm btn-default">{{ trans('buttons.new') }}</a> --}}
{{-- <a href='{{ route('modal.show, 'kit') }}' data-toggle="modal" data-target="#createModal" data-select='kit_id_select' class="btn btn-sm btn-theme">{{ trans('buttons.new') }}</a> --}}
@endif
@endcan
</div>

2
resources/views/partials/forms/edit/location-select.blade.php
View File

@ -22,7 +22,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Location::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.show', 'location') }}' data-toggle="modal" data-target="#createModal" data-select='{{ $fieldname }}_location_select' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
<a href='{{ route('modal.show', 'location') }}' data-toggle="modal" data-target="#createModal" data-select='{{ $fieldname }}_location_select' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
@endif
@endcan
</div>

2
resources/views/partials/forms/edit/manufacturer-select.blade.php
View File

@ -31,7 +31,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Manufacturer::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.show', 'manufacturer') }}' data-toggle="modal" data-target="#createModal" data-select='manufacturer_select_id' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
<a href='{{ route('modal.show', 'manufacturer') }}' data-toggle="modal" data-target="#createModal" data-select='manufacturer_select_id' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
@endif
@endcan
</div>

2
resources/views/partials/forms/edit/model-select.blade.php
View File

@ -28,7 +28,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\AssetModel::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.show', 'model') }}' data-toggle="modal" data-target="#createModal" data-select='model_select_id' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
<a href='{{ route('modal.show', 'model') }}' data-toggle="modal" data-target="#createModal" data-select='model_select_id' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
<span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;">
<i class="fas fa-spinner fa-spin" aria-hidden="true"></i>
</span>

2
resources/views/partials/forms/edit/status-select.blade.php
View File

@ -24,7 +24,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Statuslabel::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.show', 'statuslabel') }}' data-toggle="modal" data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
<a href='{{ route('modal.show', 'statuslabel') }}' data-toggle="modal" data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
@endif
@endcan
</div>

2
resources/views/partials/forms/edit/status.blade.php
View File

@ -17,7 +17,7 @@
<div class="col-md-2 col-sm-2 text-left">
@can('create', \App\Models\Statuslabel::class)
<a href='{{ route('modal.show', 'statuslabel') }}' data-toggle="modal" data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
<a href='{{ route('modal.show', 'statuslabel') }}' data-toggle="modal" data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
@endcan
<span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fas fa-spinner fa-spin" aria-hidden="true"></i> </span>

2
resources/views/partials/forms/edit/supplier-select.blade.php
View File

@ -22,7 +22,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Supplier::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.show', 'supplier') }}' data-toggle="modal" data-target="#createModal" data-select='supplier_select' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
<a href='{{ route('modal.show', 'supplier') }}' data-toggle="modal" data-target="#createModal" data-select='supplier_select' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
@endif
@endcan
</div>

2
resources/views/partials/forms/edit/user-select.blade.php
View File

@ -17,7 +17,7 @@
<div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\User::class)
@if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.show', 'user') }}' data-toggle="modal" data-target="#createModal" data-select='assigned_user_select' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
<a href='{{ route('modal.show', 'user') }}' data-toggle="modal" data-target="#createModal" data-select='assigned_user_select' class="btn btn-sm btn-theme">{{ trans('button.new') }}</a>
@endif
@endcan
</div>

2
resources/views/users/bulk-edit.blade.php
View File

@ -7,7 +7,7 @@
@section('header_right')
<a href="{{ URL::previous() }}" class="btn btn-sm btn-primary pull-right">
<a href="{{ URL::previous() }}" class="btn btn-sm btn-theme pull-right">
{{ trans('general.back') }}</a>
@stop

8
resources/views/users/edit.blade.php
View File

@ -11,10 +11,6 @@
@parent
@stop
@section('header_right')
<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
{{ trans('general.back') }}</a>
@stop
{{-- Page content --}}
@section('content')
@ -34,7 +30,7 @@
</style>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-6 col-md-offset-3">
<form class="form-horizontal" method="post" autocomplete="off"
action="{{ (isset($user->id)) ? route('users.update', ['user' => $user->id]) : route('users.store') }}"
enctype="multipart/form-data" id="userForm">
@ -148,7 +144,7 @@
<div class="col-md-1 pull-left">
@if (Gate::allows('editableOnDemo') && (Gate::allows('canEditAuthFields', $user)) && ($user->ldap_import!='1'))
<a href="#" class="text-left btn btn-default btn-sm" id="genPassword" data-tooltip="true" title="{{ trans('admin/users/general.generate_password') }}">
<a href="#" class="text-left btn btn-theme btn-sm" id="genPassword" data-tooltip="true" title="{{ trans('admin/users/general.generate_password') }}">
<i class="fa-solid fa-wand-magic-sparkles"></i>
</a>
@endif

6
resources/views/users/view.blade.php
View File

@ -206,12 +206,12 @@
<div class="col-md-12" style="padding-top: 5px;">
@if($user->allAssignedCount() != '0')
<a href="{{ route('users.print', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" target="_blank" rel="noopener">
<a href="{{ route('users.print', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-theme btn-social hidden-print" target="_blank" rel="noopener">
<x-icon type="print" />
{{ trans('admin/users/general.print_assigned') }}
</a>
@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_assets_assigned') }}">
<button style="width: 100%;" class="btn btn-sm btn-theme btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">
<x-icon type="print" />
{{ trans('admin/users/general.print_assigned') }}</button>
@endif
@ -223,7 +223,7 @@
@if(!empty($user->email) && ($user->allAssignedCount() != '0'))
<form action="{{ route('users.email',['userId'=> $user->id]) }}" method="POST">
{{ csrf_field() }}
<button class="btn-block btn btn-sm btn-primary btn-social hidden-print" rel="noopener">
<button class="btn-block btn btn-sm btn-theme btn-social hidden-print" rel="noopener">
<x-icon type="email" />
{{ trans('admin/users/general.email_assigned') }}
</button>