StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Browse source
This commit is contained in:
Dane Everitt 2018-03-08 21:30:22 -06:00
commit 7c037e28fc
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
9 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
resources/themes/pterodactyl/admin/settings/advanced.blade.php
View file

@ -34,6 +34,12 @@
<p class="text-muted small">If enabled, login forms and password reset forms will do a silent captcha check and display a visible captcha if needed.</p>
</div>
</div>
<div class="form-group col-md-4">
<label class="control-label">Site Key</label>
<div>
<input type="text" required class="form-control" name="recaptcha:website_key" value="{{ old('recaptcha:website_key', config('recaptcha.website_key')) }}">
</div>
</div>
<div class="form-group col-md-4">
<label class="control-label">Secret Key</label>
<div>
@ -41,12 +47,6 @@
<p class="text-muted small">Used for communication between your site and Google. Be sure to keep it a secret.</p>
</div>
</div>
<div class="form-group col-md-4">
<label class="control-label">Website Key</label>
<div>
<input type="text" required class="form-control" name="recaptcha:website_key" value="{{ old('recaptcha:website_key', config('recaptcha.website_key')) }}">
</div>
</div>
</div>
@if($showRecaptchaWarning)
<div class="row">

2
resources/themes/pterodactyl/layouts/admin.blade.php
View file

@ -19,7 +19,7 @@
<link rel="mask-icon" href="/favicons/safari-pinned-tab.svg" color="#bc6e3c">
<link rel="shortcut icon" href="/favicons/favicon.ico">
<meta name="msapplication-config" content="/favicons/browserconfig.xml">
<meta name="theme-color" content="#367fa9">
<meta name="theme-color" content="#0e4688">
@include('layouts.scripts')

2
resources/themes/pterodactyl/layouts/auth.blade.php
View file

@ -18,7 +18,7 @@
<link rel="mask-icon" href="/favicons/safari-pinned-tab.svg" color="#bc6e3c">
<link rel="shortcut icon" href="/favicons/favicon.ico">
<meta name="msapplication-config" content="/favicons/browserconfig.xml">
<meta name="theme-color" content="#367fa9">
<meta name="theme-color" content="#0e4688">
@section('scripts')
{!! Theme::css('vendor/bootstrap/bootstrap.min.css?t={cache-version}') !!}

2
resources/themes/pterodactyl/layouts/error.blade.php
View file

@ -19,7 +19,7 @@
<link rel="mask-icon" href="/favicons/safari-pinned-tab.svg" color="#bc6e3c">
<link rel="shortcut icon" href="/favicons/favicon.ico">
<meta name="msapplication-config" content="/favicons/browserconfig.xml">
<meta name="theme-color" content="#367fa9">
<meta name="theme-color" content="#0e4688">
@section('scripts')
{!! Theme::css('vendor/bootstrap/bootstrap.min.css?t={cache-version}') !!}

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

@ -19,7 +19,7 @@
<link rel="mask-icon" href="/favicons/safari-pinned-tab.svg" color="#bc6e3c">
<link rel="shortcut icon" href="/favicons/favicon.ico">
<meta name="msapplication-config" content="/favicons/browserconfig.xml">
<meta name="theme-color" content="#367fa9">
<meta name="theme-color" content="#0e4688">
@include('layouts.scripts')