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

Merge branch 'develop' into feature/service-changes

Browse source
This commit is contained in:
Dane Everitt 2016-12-14 16:53:53 -05:00
commit fc38b09e1f
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
169 changed files with 2268 additions and 2289 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/views/admin/databases/index.blade.php
View file

@ -36,7 +36,7 @@
<li><a href="{{ route('admin.databases.new') }}"><i class="fa fa-plus"></i></a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab_databases">
<div class="tab-pane {{ Request::input('tab') == 'tab_dbservers' ? '' : 'active' }}" id="tab_databases">
<div class="panel panel-default">
<div class="panel-heading"></div>
<div class="panel-body">
@ -65,12 +65,12 @@
</tbody>
</table>
<div class="col-md-12 text-center">
{{ $databases->render() }}
{{ $databases->appends('tab', 'tab_databases')->render() }}
</div>
</div>
</div>
</div>
<div class="tab-pane" id="tab_dbservers">
<div class="tab-pane {{ Request::input('tab') == 'tab_dbservers' ? 'active' : '' }}" id="tab_dbservers">
<div class="panel panel-default">
<div class="panel-heading"></div>
<div class="panel-body">
@ -88,7 +88,7 @@
<tbody>
@foreach($dbh as $db)
<tr>
<td><a href="#">{{ $db->name }}</a></td>
<td>{{ $db->name }}</td>
<td><code>{{ $db->host }}:{{ $db->port }}</code></td>
<td>{{ $db->username }}</td>
<td class="text-center">{{ $db->c_databases }}</td>
@ -99,7 +99,7 @@
</tbody>
</table>
<div class="col-md-12 text-center">
{{ $dbh->render() }}
{{ $dbh->appends('tab', 'tab_dbservers')->render() }}
</div>
</div>
</div>

19
resources/views/admin/nodes/view.blade.php
View file

@ -216,6 +216,19 @@
</div>
</div>
<div class="panel-heading" style="border-top: 1px solid #ddd;"></div>
<div class="panel-body">
<div class="row">
<div class="form-group col-md-6">
<label for="disk_overallocate" class="control-label">Maximum Web Upload Filesize</label>
<div class="input-group">
<input type="text" name="upload_size" class="form-control" value="{{ old('upload_size', $node->upload_size) }}"/>
<span class="input-group-addon">MB</span>
</div>
<p class="text-muted"><small>Enter the maximum size of files that can be uploaded through the web-based file manager.</small></p>
</div>
</div>
</div>
<div class="panel-heading" style="border-top: 1px solid #ddd;"></div>
<div class="panel-body">
<div class="row">
<div class="col-xs-6">
@ -242,7 +255,7 @@
<div class="col-xs-6">
<div class="row">
<div class="form-group col-md-12">
<label for="reset_secret" class="control-label"><span class="label label-warning"><i class="fa fa-power-off"></i></span> Reset Daemon Key</label>
<label for="reset_secret" class="control-label">Reset Daemon Key</label>
<div style="padding: 7px 0;">
<input type="checkbox" name="reset_secret" id="reset_secret" /> Reset Daemon Master Key
</div>
@ -294,7 +307,7 @@
"container": "ptdl-sftp"
},
"query": {
"kill_on_fail": false,
"kill_on_fail": true,
"fail_limit": 5
},
"logger": {
@ -310,7 +323,7 @@
"installed": "{{ route('remote.install') }}"
},
"uploads": {
"maximumSize": 100000000
"size_limit": {{ $node->upload_size }}
},
"keys": [
"{{ $node->daemonSecret }}"

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

@ -50,7 +50,7 @@
<label for="owner" class="control-label">Owner Email</label>
<div>
{{-- Hacky workaround to prevent Safari and Chrome from trying to suggest emails here --}}
<input id="fake_user_name" name="fake_user[name]" style="position:absolute; top:-10000px;" type="text" value="Autofill Me">
<input id="fake_user_name" name="fake_user[name]" style="position:absolute; top:-10000px;" tabindex="5" type="text" value="Autofill Me">
<input type="text" autocomplete="off" name="owner" class="form-control" value="{{ old('owner', Input::get('email')) }}" />
</div>
</div>

33
resources/views/admin/servers/view.blade.php
View file

@ -79,17 +79,25 @@
<td>UUID</td>
<td>{{ $server->uuid }}</td>
</tr>
<tr>
<td>Docker Container ID</td>
<td data-attr="container-id"><i class="fa fa-fw fa-refresh fa-spin"></i></td>
</tr>
<tr>
<td>Docker User ID</td>
<td data-attr="container-user"><i class="fa fa-fw fa-refresh fa-spin"></i></td>
</tr>
<tr>
<td>Owner</td>
<td><a href="{{ route('admin.users.view', $server->owner) }}">{{ $server->a_ownerEmail }}</a></td>
</tr>
<tr>
<td>Location</td>
<td><a href="{{ route('admin.locations') }}">{{ $server->a_locationName }}</a></td>
<td><a href="{{ route('admin.locations') }}">{{ $node->a_locationName }}</a></td>
</tr>
<tr>
<td>Node</td>
<td><a href="{{ route('admin.nodes.view', $server->node) }}">{{ $server->a_nodeName }}</a></td>
<td><a href="{{ route('admin.nodes.view', $server->node) }}">{{ $node->name }}</a></td>
</tr>
<tr>
<td>Service</td>
@ -553,6 +561,27 @@
$(document).ready(function () {
$('[data-toggle="tooltip"]').tooltip();
$('#sidebar_links').find("a[href='/admin/servers']").addClass('active');
(function checkServerInfo() {
$.ajax({
type: 'GET',
headers: {
'X-Access-Token': '{{ $server->daemonSecret }}',
'X-Access-Server': '{{ $server->uuid }}'
},
url: '{{ $node->scheme }}://{{ $node->fqdn }}:{{ $node->daemonListen }}/server',
dataType: 'json',
timeout: 5000,
}).done(function (data) {
$('td[data-attr="container-id"]').html('<code>' + data.container.id + '</code>');
$('td[data-attr="container-user"]').html('<code>' + data.user + '</code>');
}).fail(function (jqXHR) {
$('td[data-attr="container-id"]').html('<code>error</code>');
$('td[data-attr="container-user"]').html('<code>error</code>');
console.error(jqXHR);
}).always(function () {
setTimeout(checkServerInfo, 60000);
})
})();
$('input[name="default"]').on('change', function (event) {
$('select[name="remove_additional[]"]').find('option:disabled').prop('disabled', false);
$('select[name="remove_additional[]"]').find('option[value="' + $(this).val() + '"]').prop('disabled', true).prop('selected', false);

8
resources/views/admin/users/index.blade.php
View file

@ -31,6 +31,14 @@
<li class="active">Accounts</li>
</ul>
<h3>All Registered Users</h3><hr />
<form method="GET" style="margin-bottom:20px;">
<div class="input-group">
<input type="text" name="filter" class="form-control" value="{{ urldecode(Input::get('filter')) }}" placeholder="search term" />
<div class="input-group-btn">
<button type="submit" class="btn btn-sm btn-primary">Filter Users</button>
</div>
</div>
</form>
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>