mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
fix for footer
This commit is contained in:
parent
a84a9a8dec
commit
f15b0d8591
|
@ -267,7 +267,7 @@
|
||||||
@can('admin')
|
@can('admin')
|
||||||
@if ($snipeSettings->show_alerts_in_menu=='1')
|
@if ($snipeSettings->show_alerts_in_menu=='1')
|
||||||
<!-- Tasks: style can be found in dropdown.less -->
|
<!-- Tasks: style can be found in dropdown.less -->
|
||||||
<?php $alert_items = Helper::checkLowInventory(); ?>
|
<?php $alert_items = Helper::checkLowInventory(); ?>
|
||||||
|
|
||||||
<li class="dropdown tasks-menu">
|
<li class="dropdown tasks-menu">
|
||||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
||||||
|
@ -442,7 +442,7 @@
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<?php $status_navs = \App\Models\Statuslabel::where('show_in_nav', '=', 1)->withCount('assets as asset_count')->get(); ?>
|
<?php $status_navs = \App\Models\Statuslabel::where('show_in_nav', '=', 1)->withCount('assets as asset_count')->get(); ?>
|
||||||
@if (count($status_navs) > 0)
|
@if (count($status_navs) > 0)
|
||||||
@foreach ($status_navs as $status_nav)
|
@foreach ($status_navs as $status_nav)
|
||||||
<li{!! (Request::is('statuslabels/'.$status_nav->id) ? ' class="active"' : '') !!}>
|
<li{!! (Request::is('statuslabels/'.$status_nav->id) ? ' class="active"' : '') !!}>
|
||||||
|
@ -850,9 +850,8 @@
|
||||||
</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 pull-left">
|
||||||
<div class="pull-right hidden-xs">
|
|
||||||
@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')))
|
||||||
<strong>Version</strong> {{ config('version.app_version') }} -
|
<strong>Version</strong> {{ config('version.app_version') }} -
|
||||||
|
@ -875,23 +874,19 @@
|
||||||
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 class="pull-right" >
|
||||||
|
<a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,
|
||||||
</div>
|
made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
|
||||||
@if ($snipeSettings->footer_text!='')
|
class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
|
||||||
<div class="pull-right">
|
|
||||||
{!! Helper::parseEscapedMarkedown($snipeSettings->footer_text) !!}
|
|
||||||
</div>
|
</div>
|
||||||
@endif
|
<br>
|
||||||
|
@if ($snipeSettings->footer_text!='')
|
||||||
|
<div class="pull-left" style="margin-left:7px;">
|
||||||
<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 -->
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue