Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #267 from hammerdawn/ThemeFixes

Browse source 
Theme Changes
This commit is contained in:
Dane Everitt 2017-01-22 19:59:37 -05:00 committed by GitHub
commit d21e6b8c90
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Models/Node.php
View file

@ -132,8 +132,8 @@ class Node extends Model
'listen' => $this->daemonListen,
'ssl' => [
'enabled' => $this->scheme === 'https',
'certificate' => '/etc/letsencrypt/live/localhost/fullchain.pem',
'key' => '/etc/letsencrypt/live/localhost/privkey.pem',
'certificate' => '/etc/letsencrypt/live/' . $this->fqdn . '/fullchain.pem',
'key' => '/etc/letsencrypt/live/' . $this->fqdn . '/privkey.pem',
],
],
'docker' => [

6
resources/themes/pterodactyl/layouts/master.blade.php
View file

@ -58,11 +58,13 @@
<ul class="nav navbar-nav">
<li class="dropdown user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<img src="https://www.gravatar.com/avatar/{{ md5(Auth::user()->email) }}?s=160" class="user-image" alt="User Image">
<img src="https://www.gravatar.com/avatar/{{ md5(strtolower(Auth::user()->email)) }}?s=160" class="user-image" alt="User Image">
<span class="hidden-xs">{{ Auth::user()->name_first }} {{ Auth::user()->name_last }}</span> <span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ route('admin.index') }}">@lang('strings.admin_control')</a></li>
@if(Auth::user()->isRootAdmin())
<li><a href="{{ route('admin.index') }}">@lang('strings.admin_control')</a></li>
@endif
<li><a href="{{ route('auth.logout') }}">@lang('strings.sign_out')</a></li>
</ul>
{{-- <ul class="dropdown-menu">

2
resources/views/admin/nodes/view.blade.php
View file

@ -505,7 +505,7 @@ $(document).ready(function () {
type: 'success',
title: 'Token created.',
text: 'Your token will expire at ' + data.expires_at + '<br /><br />' +
'<p>To auto-configure your node run<br /><small><pre>npm run configure -- --panel-url '+window.location.protocol+'//{{ config('app.url') }} --token '+data.token+'</pre></small></p>',
'<p>To auto-configure your node run<br /><small><pre>npm run configure -- --panel-url {{ config('app.url') }} --token '+data.token+'</pre></small></p>',
html: true
})
})