Merge pull request pterodactyl#267 from hammerdawn/ThemeFixes

Theme Changes

Author: DaneEveritt

app/Models/Node.php

@@ -132,8 +132,8 @@ public function getConfigurationAsJson($pretty = false)
                 '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' => [

resources/themes/pterodactyl/layouts/master.blade.php

@@ -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">

resources/views/admin/nodes/view.blade.php

@@ -505,7 +505,7 @@
                     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
                 })
             })