MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-24 17:23:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/option-scripts

Browse Source 
# Conflicts:
#	app/Http/Routes/AdminRoutes.php
#	app/Http/Routes/DaemonRoutes.php
#	app/Models/ServiceOption.php
This commit is contained in:
Dane Everitt
2017-04-20 17:08:08 -04:00
parent 03e0de28d9 d695532aa2
commit 8d24e5f168
683 changed files with 8854 additions and 12362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/themes/pterodactyl/admin/services/functions.blade.php
View File

@@ -68,8 +68,8 @@
@section('footer-scripts')
@parent
{!! Theme::js('js/vendor/ace/ace.js') !!}
{!! Theme::js('js/vendor/ace/ext-modelist.js') !!}
{!! Theme::js('vendor/ace/ace.js') !!}
{!! Theme::js('vendor/ace/ext-modelist.js') !!}
<script>
$(document).ready(function () {
const Editor = ace.edit('editor_index');

6
resources/themes/pterodactyl/admin/services/index.blade.php
View File

@@ -37,6 +37,9 @@
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">Configured Services</h3>
<div class="box-tools">
<a href="{{ route('admin.services.new') }}"><button class="btn btn-primary btn-sm">Create New</button></a>
</div>
</div>
<div class="box-body table-responsive no-padding">
<table class="table table-hover">
@@ -58,9 +61,6 @@
@endforeach
</table>
</div>
<div class="box-footer">
<a href="{{ route('admin.services.new') }}"><button class="btn btn-primary btn-sm pull-right">Create Service</button></a>
</div>
</div>
</div>
</div>