Merge branch 'master' into develop

This commit is contained in:
Dane Everitt 2019-12-28 11:49:08 -08:00
commit 51defae917
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
15 changed files with 140 additions and 21 deletions

View file

@ -6,15 +6,16 @@
@extends('layouts.admin')
@section('title')
Nests → Egg: {{ $egg->name }} → Scripts
Nests → Egg: {{ $egg->name }} → Install Script
@endsection
@section('content-header')
<h1>{{ $egg->name }}<small>Manage install and upgrade scripts for this Egg.</small></h1>
<h1>{{ $egg->name }}<small>Manage the install script for this Egg.</small></h1>
<ol class="breadcrumb">
<li><a href="{{ route('admin.index') }}">Admin</a></li>
<li><a href="{{ route('admin.nests') }}">Service</a></li>
<li><a href="{{ route('admin.nests') }}">Nests</a></li>
<li><a href="{{ route('admin.nests.view', $egg->nest->id) }}">{{ $egg->nest->name }}</a></li>
<li><a href="{{ route('admin.nests.egg.view', $egg->id) }}">{{ $egg->name }}</a></li>
<li class="active">{{ $egg->name }}</li>
</ol>
@endsection
@ -26,7 +27,7 @@
<ul class="nav nav-tabs">
<li><a href="{{ route('admin.nests.egg.view', $egg->id) }}">Configuration</a></li>
<li><a href="{{ route('admin.nests.egg.variables', $egg->id) }}">Variables</a></li>
<li class="active"><a href="{{ route('admin.nests.egg.scripts', $egg->id) }}">Scripts</a></li>
<li class="active"><a href="{{ route('admin.nests.egg.scripts', $egg->id) }}">Install Script</a></li>
</ul>
</div>
</div>

View file

@ -27,7 +27,7 @@
<ul class="nav nav-tabs">
<li><a href="{{ route('admin.nests.egg.view', $egg->id) }}">Configuration</a></li>
<li class="active"><a href="{{ route('admin.nests.egg.variables', $egg->id) }}">Variables</a></li>
<li><a href="{{ route('admin.nests.egg.scripts', $egg->id) }}">Scripts</a></li>
<li><a href="{{ route('admin.nests.egg.scripts', $egg->id) }}">Install Script</a></li>
</ul>
</div>
</div>

View file

@ -26,7 +26,7 @@
<ul class="nav nav-tabs">
<li class="active"><a href="{{ route('admin.nests.egg.view', $egg->id) }}">Configuration</a></li>
<li><a href="{{ route('admin.nests.egg.variables', $egg->id) }}">Variables</a></li>
<li><a href="{{ route('admin.nests.egg.scripts', $egg->id) }}">Scripts</a></li>
<li><a href="{{ route('admin.nests.egg.scripts', $egg->id) }}">Install Script</a></li>
</ul>
</div>
</div>

View file

@ -106,7 +106,7 @@
</div>
<div class="box-body">
<div class="row">
<div class="form-group col-xs-12">
<div class="form-group col-md-6">
<label for="pDaemonBase" class="form-label">Daemon Server File Directory</label>
<input type="text" name="daemonBase" id="pDaemonBase" class="form-control" value="/srv/daemon-data" />
<p class="text-muted small">Enter the directory where server files should be stored. <strong>If you use OVH you should check your partition scheme. You may need to use <code>/home/daemon-data</code> to have enough space.</strong></p>
@ -177,4 +177,4 @@
<script>
$('#pLocationId').select2();
</script>
@endsection
@endsection