bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fixes for nodelist importing

Browse Source
This commit is contained in:
Deon George
2021-06-26 10:34:49 +10:00
parent 17a44a0945
commit aa06296963
8 changed files with 115 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/domain/home.blade.php
View File

@@ -47,7 +47,7 @@
<td>{{ $oo->name }}</td>
<td>{{ $oo->active ? 'YES' : 'NO' }}</td>
<td>{{ $oo->dnsdomain }}</td>
<td>{{ join(', ',$oo->zones->pluck('zone_id')->toArray()) }}</td>
<td>{{ join(', ',$oo->zones->pluck('zone_id')->sort()->toArray()) }}</td>
</tr>
@endforeach
</tbody>

51
resources/views/domain/view.blade.php
View File

@@ -55,13 +55,12 @@
<div id="collapse_systems" class="accordion-collapse collapse" aria-labelledby="systems" data-bs-parent="#accordion_homepage">
<div class="accordion-body">
<p>The following systems are members of this network.</p>
<table class="table monotable">
<table class="table monotable" id="network">
<thead>
<tr>
<th>System</th>
<th>Sysop</th>
<th>Location</th>
<th>Role</th>
<th>Address</th>
<th>Last Seen</th>
</tr>
@@ -74,7 +73,6 @@
<td>{{ sprintf('ZC-%s-%05d',$oz->domain->name,$oz->zone_id) }}</td>
<td>{{ $oz->system->sysop }}</td>
<td>{{ $oz->system->location }}</td>
<td>Zone</td>
<td>{{ $oz->zone_id }}:0/0.0<span>@</span>{{ $oz->domain->name }}</td>
<td>-</td>
</tr>
@@ -82,20 +80,18 @@
@foreach ($oz->addresses()->active()->FTNorder()->whereNull('hub_id')->with(['system','zone.domain'])->get() as $ao)
@if ($ao->role == 'Host')
<tr>
<td>{{ sprintf('NC-%s-%05d',$oz->domain->name,$ao->host_id) }}</td>
<td>{{ sprintf('NC-%s-%05d',$oz->domain->name,$ao->host_id) }} <span class="float-end"><small>[{{ $ao->id }}]</small></span></td>
<td>{{ $ao->system->sysop }}</td>
<td>{{ $ao->system->location }}</td>
<td>{{ $ao->role }}</td>
<td>{{ $oz->zone_id }}:{{ $ao->host_id }}/0.0<span>@</span>{{ $oz->domain->name }}</td>
<td>-</td>
</tr>
@endif
<tr>
<td>{{ $ao->system->full_name($ao) }}</td>
<td>{{ $ao->system->full_name($ao) }} <span class="float-end"><small>[{{ $ao->id }}]</small></span></td>
<td>{{ $ao->system->sysop }}</td>
<td>{{ $ao->system->location }}</td>
<td>{{ $ao->role }}</td>
<td>{{ $ao->ftn }}</td>
<td>-</td>
</tr>
@@ -104,9 +100,9 @@
@if ($ao->role == 'Hub')
@foreach ($oz->addresses()->active()->FTNorder()->where('hub_id',$ao->id)->with(['system','zone.domain'])->get() as $aoo)
<tr>
<td>{{ $aoo->system->full_name($aoo) }}</td>
<td>{{ $aoo->system->full_name($aoo) }} <span class="float-end"><small>[{{ $aoo->id }}]</small></span></td>
<td>{{ $aoo->system->sysop }}</td>
<td>{{ $ao->system->location }}</td>
<td>{{ $aoo->system->location }}</td>
<td>{{ $aoo->role }}</td>
<td>{{ $aoo->ftn }}</td>
<td>-</td>
@@ -139,4 +135,39 @@
</div>
</div>
</div>
@endsection
@endsection
@section('page-scripts')
<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.min.css" media="screen" >
<link type="text/css" rel="stylesheet" href="{{ asset('plugin/dataTables/dataTables.bootstrap5.css') }}" media="screen">
<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.min.js"></script>
<script type="text/javascript">
$('table tr').click(function() {
var href = $(this).find('a').attr('href');
if (href)
window.location = href;
});
$('#network').DataTable({
paging: true,
pageLength: 25,
searching: true,
order: [
[3,'asc'],
],
/*
columnDefs: [
{
targets: [5,6],
visible: false,
}
],
*/
});
</script>
@append

2
resources/views/zone/addedit.blade.php
View File

@@ -56,7 +56,7 @@
<span class="input-group-text"><i class="bi bi-laptop-fill"></i></span>
<select class="form-select @error('system_id') is-invalid @enderror" id="system" name="system_id" required @cannot('admin',$o)disabled @endcannot>
<option value="">&nbsp;</option>
@foreach (\App\Models\System::active()->cursor() as $oo)
@foreach (\App\Models\System::active()->orderBy('name')->cursor() as $oo)
<option value="{{ $oo->id }}" @if(old('system_id',$o->system_id)==$oo->id)selected @endif>{{ $oo->name }}</option>
@endforeach
</select>

4
resources/views/zone/home.blade.php
View File

@@ -38,12 +38,12 @@
</thead>
<tbody>
@foreach (\App\Models\Zone::with(['domain'])->get() as $oo)
@foreach (\App\Models\Zone::orderBy('zone_id')->with(['domain','addresses'])->get() as $oo)
<tr>
<td>{{ $oo->domain->name }}</td>
<td><a href="{{ url('ftn/zone/addedit',[$oo->id]) }}">{{ $oo->zone_id }}</a></td>
<td>{{ $oo->active ? 'YES' : 'NO' }}</td>
<td>-</td>
<td>{{ $oo->addresses->count() }}</td>
</tr>
@endforeach
</tbody>