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

Merge branch 'develop' into develop

Browse source
This commit is contained in:
Caleb 2020-10-13 15:35:38 -04:00 • committed by GitHub
commit ea778e9345
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
159 changed files with 3400 additions and 3896 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/views/admin/locations/index.blade.php
View file

@ -70,7 +70,7 @@
<div class="col-md-12">
<label for="pLongModal" class="form-label">Description</label>
<textarea name="long" id="pLongModal" class="form-control" rows="4"></textarea>
<p class="text-muted small">A longer description of this location. Must be less than 255 characters.</p>
<p class="text-muted small">A longer description of this location. Must be less than 191 characters.</p>
</div>
</div>
</div>

2
resources/views/admin/mounts/index.blade.php
View file

@ -84,7 +84,7 @@
<div class="col-md-12">
<label for="pDescription" class="form-label">Description</label>
<textarea id="pDescription" name="description" class="form-control" rows="4"></textarea>
<p class="text-muted small">A longer description for this mount, must be less than 255 characters.</p>
<p class="text-muted small">A longer description for this mount, must be less than 191 characters.</p>
</div>
<div class="col-md-6">

4
resources/views/admin/servers/new.blade.php
View file

@ -158,7 +158,7 @@
</div>
<div class="form-group col-xs-6">
<label for="pThreads">CPU Threads</label>
<label for="pThreads">CPU Pinning</label>
<div>
<input type="text" id="pThreads" name="threads" class="form-control" value="{{ old('threads') }}" />
@ -327,7 +327,7 @@
// END Persist 'Service Variables'
</script>
{!! Theme::js('js/admin/new-server.js?v=20200913') !!}
{!! Theme::js('js/admin/new-server.js?v=20201003') !!}
<script type="application/javascript">
$(document).ready(function() {

2
resources/views/admin/servers/view/build.blade.php
View file

@ -38,7 +38,7 @@
<p class="text-muted small">Each <em>physical</em> core on the system is considered to be <code>100%</code>. Setting this value to <code>0</code> will allow a server to use CPU time without restrictions.</p>
</div>
<div class="form-group">
<label for="threads" class="control-label">CPU Threads</label>
<label for="threads" class="control-label">CPU Pinning</label>
<div>
<input type="text" name="threads" class="form-control" value="{{ old('threads', $server->threads) }}"/>
</div>

18
resources/views/admin/servers/view/details.blade.php
View file

@ -66,6 +66,12 @@
@section('footer-scripts')
@parent
<script>
function escapeHtml(str) {
var div = document.createElement('div');
div.appendChild(document.createTextNode(str));
return div.innerHTML;
}
$('#pUserId').select2({
ajax: {
url: '/admin/users/accounts.json',
@ -85,14 +91,14 @@
escapeMarkup: function (markup) { return markup; },
minimumInputLength: 2,
templateResult: function (data) {
if (data.loading) return data.text;
if (data.loading) return escapeHtml(data.text);
return '<div class="user-block"> \
<img class="img-circle img-bordered-xs" src="https://www.gravatar.com/avatar/' + data.md5 + '?s=120" alt="User Image"> \
<img class="img-circle img-bordered-xs" src="https://www.gravatar.com/avatar/' + escapeHtml(data.md5) + '?s=120" alt="User Image"> \
<span class="username"> \
<a href="#">' + data.name_first + ' ' + data.name_last +'</a> \
<a href="#">' + escapeHtml(data.name_first) + ' ' + escapeHtml(data.name_last) +'</a> \
</span> \
<span class="description"><strong>' + data.email + '</strong> - ' + data.username + '</span> \
<span class="description"><strong>' + escapeHtml(data.email) + '</strong> - ' + escapeHtml(data.username) + '</span> \
</div>';
},
templateSelection: function (data) {
@ -108,10 +114,10 @@
return '<div> \
<span> \
<img class="img-rounded img-bordered-xs" src="https://www.gravatar.com/avatar/' + data.md5 + '?s=120" style="height:28px;margin-top:-4px;" alt="User Image"> \
<img class="img-rounded img-bordered-xs" src="https://www.gravatar.com/avatar/' + escapeHtml(data.md5) + '?s=120" style="height:28px;margin-top:-4px;" alt="User Image"> \
</span> \
<span style="padding-left:5px;"> \
' + data.name_first + ' ' + data.name_last + ' (<strong>' + data.email + '</strong>) \
' + escapeHtml(data.name_first) + ' ' + escapeHtml(data.name_last) + ' (<strong>' + escapeHtml(data.email) + '</strong>) \
</span> \
</div>';
}

2
resources/views/admin/servers/view/index.blade.php
View file

@ -68,7 +68,7 @@
</td>
</tr>
<tr>
<td>CPU Threads</td>
<td>CPU Pinning</td>
<td>
@if($server->threads != null)
<code>{{ $server->threads }}</code>