DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-31 16:37:27 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-09-15 15:43:48 +01:00
parent 9bd357e2d4 eb406547c4
commit 341f711385
2 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Presenters/AssetPresenter.php
View file

@ -142,8 +142,8 @@ class AssetPresenter extends Presenter
'formatter' => 'dateDisplayFormatter', 'formatter' => 'dateDisplayFormatter',
], [ ], [
'field' => 'age', 'field' => 'age',
'searchable' => true, 'searchable' => false,
'sortable' => true, 'sortable' => false,
'visible' => false, 'visible' => false,
'title' => trans('general.age'), 'title' => trans('general.age'),
], [ ], [

32
resources/views/layouts/default.blade.php
View file

@ -849,9 +849,15 @@
</section> </section>
</div><!-- /.content-wrapper --> </div><!-- /.content-wrapper -->
<footer class="main-footer hidden-print"> <footer class="main-footer hidden-print" style="display:grid;flex-direction:column;">
<div class="pull-right hidden-xs"> <div class="1hidden-xs pull-left">
<div class="pull-left" >
<a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,
made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
</div>
<div class="pull-right">
@if ($snipeSettings->version_footer!='off') @if ($snipeSettings->version_footer!='off')
@if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1'))) @if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
&nbsp; <strong>Version</strong> {{ config('version.app_version') }} - &nbsp; <strong>Version</strong> {{ config('version.app_version') }} -
@ -874,23 +880,15 @@
href="{{ $snipeSettings->privacy_policy_link }}" href="{{ $snipeSettings->privacy_policy_link }}"
target="_new">{{ trans('admin/settings/general.privacy_policy') }}</a> target="_new">{{ trans('admin/settings/general.privacy_policy') }}</a>
@endif @endif
</div>
@if ($snipeSettings->footer_text!='')
<div class="pull-right">
{!! Helper::parseEscapedMarkedown($snipeSettings->footer_text) !!}
</div> </div>
@endif <br>
@if ($snipeSettings->footer_text!='')
<div class="pull-left">
<a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software, {!! Helper::parseEscapedMarkedown($snipeSettings->footer_text) !!}
made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span </div>
class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>. @endif
</div>
</footer> </footer>
</div><!-- ./wrapper --> </div><!-- ./wrapper -->