DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-13 06:47:46 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

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

37
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
* *
@ -117,7 +122,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
/** /**
* The relations and their attributes that should be included when searching the model. * The relations and their attributes that should be included when searching the model.
* *
* @var array * @var array
*/ */
protected $searchableRelations = [ protected $searchableRelations = [
@ -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;
} }
@ -349,11 +354,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
$licensesCount = $this->licenses()->count(); $licensesCount = $this->licenses()->count();
$accessoriesCount = $this->accessories()->count(); $accessoriesCount = $this->accessories()->count();
$consumablesCount = $this->consumables()->count(); $consumablesCount = $this->consumables()->count();
$totalCount = $assetsCount + $licensesCount + $accessoriesCount + $consumablesCount; $totalCount = $assetsCount + $licensesCount + $accessoriesCount + $consumablesCount;
return (int) $totalCount; return (int) $totalCount;
} }
/** /**
* Establishes the user -> actionlogs relationship * Establishes the user -> actionlogs relationship
@ -507,7 +512,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
/** /**
* Generate email from full name * Generate email from full name
* *
* @author A. Gianotto <snipe@snipe.net> * @author A. Gianotto <snipe@snipe.net>
* @since [v2.0] * @since [v2.0]
* *
@ -555,7 +560,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
$username = str_slug($first_name).str_slug($last_name); $username = str_slug($first_name).str_slug($last_name);
} elseif ($format == 'firstnamelastinitial') { } elseif ($format == 'firstnamelastinitial') {
$username = str_slug(($first_name.substr($last_name, 0, 1))); $username = str_slug(($first_name.substr($last_name, 0, 1)));
} }
} }
$user['first_name'] = $first_name; $user['first_name'] = $first_name;
@ -652,9 +657,9 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function scopeSimpleNameSearch($query, $search) public function scopeSimpleNameSearch($query, $search)
{ {
$query = $query->where('first_name', 'LIKE', '%'.$search.'%') $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
->orWhere('last_name', 'LIKE', '%'.$search.'%') ->orWhere('last_name', 'LIKE', '%'.$search.'%')
->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]); ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]);
return $query; return $query;
} }
@ -765,4 +770,4 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
{ {
return $this->locale; return $this->locale;
} }
} }

8
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="display:flex;flex-direction:row;" >
<footer class="main-footer hidden-print" style="height:100px;">
@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