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

Fixes to layout, improvements to import types, better icons for processing.

Browse source
This commit is contained in:
Brady Wetherington 2023-03-01 17:18:36 -08:00
parent c48e19d236
commit 7edec26e73
2 changed files with 54 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/views/livewire/importer-file.blade.php
View file

@ -9,7 +9,7 @@
</div> </div>
<div class="col-md-7 col-xs-12"> <div class="col-md-7 col-xs-12">
{{ Form::select('activeFile.import_type', $importTypes, $activeFile->import_type, ['id' => 'import_type', 'class' => 'livewire-select2', 'placeholder' => '', 'data-livewire-component' => $_instance->id]) }} {{ Form::select('activeFile.import_type', $importTypes, $activeFile->import_type, ['id' => 'import_type', 'class' => 'livewire-select2', 'style' => 'min-width: 350px', 'data-placeholder' => 'Select an import type...', /* TODO: translate me */ 'placeholder' => '', 'data-livewire-component' => $_instance->id]) }}
</div> </div>
</div><!-- /dynamic-form-row --> </div><!-- /dynamic-form-row -->
@ -47,6 +47,7 @@
@endif @endif
</div> <!-- /div row --> </div> <!-- /div row -->
@if($activeFile->import_type)
<div class="row"> <div class="row">
<div class="col-md-12" style="padding-top: 30px;"> <div class="col-md-12" style="padding-top: 30px;">
<div class="col-md-4 text-right"><h4>Header Field</h4></div> <div class="col-md-4 text-right"><h4>Header Field</h4></div>
@ -64,7 +65,6 @@
</div> </div>
<div class="col-md-4 form-group"> <div class="col-md-4 form-group">
<div required> <div required>
{{-- this, along with the JS glue below, is quite possibly near to the new Universal LW2 stuff? --}}
{{ Form::select('field_map.'.$index, $columnOptions[$activeFile->import_type], @$field_map[$index], {{ Form::select('field_map.'.$index, $columnOptions[$activeFile->import_type], @$field_map[$index],
[ [
'class' => 'mappings livewire-select2', 'class' => 'mappings livewire-select2',
@ -101,6 +101,7 @@
</div> </div>
@endif @endif
</div><!-- /div row --> </div><!-- /div row -->
@endif {{-- end of if ... activeFile->import_type --}}
</div><!-- /div v-show --> </div><!-- /div v-show -->

3
resources/views/livewire/importer.blade.php
View file

@ -109,7 +109,8 @@
<td class="col-md-1">{{ $currentFile->filesize }}</td> <td class="col-md-1">{{ $currentFile->filesize }}</td>
<td class="col-md-1 text-right"> <td class="col-md-1 text-right">
<button class="btn btn-sm btn-info" wire:click="toggleEvent({{ $currentFile->id }})"> <button class="btn btn-sm btn-info" wire:click="toggleEvent({{ $currentFile->id }})">
{{ trans('general.import') }} <i class="fas fa-retweet fa-fw" aria-hidden="true"></i>
<span class="sr-only">{{ trans('general.import') }}</span>
</button> </button>
<button class="btn btn-sm btn-danger" wire:click="destroy({{ $currentFile->id }})"> <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"></span></button> <i class="fas fa-trash icon-white" aria-hidden="true"></i><span class="sr-only"></span></button>