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

footer now uses flex

Browse source
This commit is contained in:
Godfrey M 2023-04-17 11:57:35 -07:00
parent 42f198ffed
commit 0cca45d858
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/Models/User.php
View file

@ -73,13 +73,18 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
'location_id' => 'integer', 'location_id' => 'integer',
'company_id' => 'integer', 'company_id' => 'integer',
'vip' => 'boolean', 'vip' => 'boolean',
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'start_date' => 'datetime:Y-m-d',
'end_date' => 'datetime:Y-m-d',
]; ];
protected $dates = [
'created_at',
'updated_at',
'deleted_at',
'start_date' => 'date_format:Y-m-d',
'end_date' => 'date_format:Y-m-d',
];
/** /**
* Model validation rules * Model validation rules
* *
@ -267,7 +272,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
{ {
// At this point the endpoint is the same for everything. // At this point the endpoint is the same for everything.
// In the future this may want to be adapted for individual notifications. // In the future this may want to be adapted for individual notifications.
$this->endpoint = \App\Models\Setting::getSettings()->webhook_endpoint; $this->endpoint = \App\Models\Setting::getSettings()->slack_endpoint;
return $this->endpoint; return $this->endpoint;
} }

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

@ -850,13 +850,11 @@
</section> </section>
</div><!-- /.content-wrapper --> </div><!-- /.content-wrapper -->
@if ($snipeSettings->footer_text!='') @if ($snipeSettings->footer_text!='')
<footer class="main-footer hidden-print" style="height:100px;"> <footer class="main-footer hidden-print" style="display:flex;flex-direction:row;" >
@else @else
<footer class="main-footer hidden-print"> <footer class="main-footer hidden-print">
@endif @endif
<div class="pull-right hidden-xs"> <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')))
@ -884,7 +882,7 @@
</div> </div>
@if ($snipeSettings->footer_text!='') @if ($snipeSettings->footer_text!='')
<div class="pull-right"> <div class="pull-right" style="display: flex;flex-direction: row;">
{!! Helper::parseEscapedMarkedown($snipeSettings->footer_text) !!} {!! Helper::parseEscapedMarkedown($snipeSettings->footer_text) !!}
</div> </div>
@endif @endif