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

Minor layout fixes, and link fixes. Changed notes to be optional in systems table

Browse Source
This commit is contained in:
Deon George 2021-06-19 14:40:55 +10:00
parent f4454dd5f7
commit 84df9ce811
5 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
database/migrations/2021_06_19_043425_fix_systems.php Normal file
View File

@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class FixSystems extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
DB::statement('ALTER TABLE systems ALTER COLUMN notes DROP NOT NULL');
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
// Noop
}
}

3
public/oldschool/css/main.css vendored
View File

@ -55,6 +55,9 @@ a.disabled {
padding: 10px 0 10px 0 !important;
margin-bottom: 0 !important;
}
.accordion-body > ul > li > p {
display: inline;
}
.cap {
text-transform:uppercase

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

@ -7,6 +7,7 @@
<h1>{{ $o->name }} <small class="push-right">Last Update: {{ $o->updated_at }}</small></h1>
<div class="accordion accordion-flush" id="accordion_homepage">
<!-- About -->
<div class="accordion-item">
<h3 class="accordion-header" id="about" data-bs-toggle="collapse" data-bs-target="#collapse_about" aria-expanded="true" aria-controls="collapse_about">About</h3>
@ -17,6 +18,7 @@
</div>
</div>
<!-- Echomail -->
<div class="accordion-item">
<h3 class="accordion-header" id="echoareas" data-bs-toggle="collapse" data-bs-target="#collapse_echoareas" aria-expanded="true" aria-controls="collapse_echoareas">Echo Areas</h3>
@ -30,6 +32,7 @@
</div>
</div>
<!-- File areas -->
<div class="accordion-item">
<h3 class="accordion-header" id="fileareas" data-bs-toggle="collapse" data-bs-target="#collapse_fileareas" aria-expanded="true" aria-controls="collapse_fileareas">File Areas</h3>
@ -43,6 +46,7 @@
</div>
</div>
<!-- Systems -->
<div class="accordion-item">
<h3 class="accordion-header" id="systems" data-bs-toggle="collapse" data-bs-target="#collapse_systems" aria-expanded="true" aria-controls="collapse_systems">Systems</h3>
@ -78,5 +82,23 @@
</div>
</div>
</div>
<!-- Sign up -->
<div class="accordion-item">
<h3 class="accordion-header" id="signup" data-bs-toggle="collapse" data-bs-target="#collapse_signup" aria-expanded="true" aria-controls="collapse_signup">Join Network</h3>
<div id="collapse_signup" class="accordion-collapse collapse" aria-labelledby="signup" data-bs-parent="#accordion_homepage">
<div class="accordion-body">
@guest
To start an application to join this network please <a href="{{ url('login') }}">login</a>.
@else
@if(Auth::user()->isMember($o))
@else
This website is not ready to take applications yet, check back soon!
@endif
@endguest
</div>
</div>
</div>
</div>
@endsection

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

@ -12,7 +12,7 @@
</div>
<div class="row">
<div class="col-6">
<div class="col-9">
<p>This system is aware of the following systems:</p>
@if (\App\Models\System::count() == 0)
@ -37,7 +37,7 @@
<tbody>
@can('admin',(new \App\Models\System))
<tr>
<td colspan="6"><a href="{{ url('ftn/domain/addedit') }}">Add New System</a></td>
<td colspan="6"><a href="{{ url('ftn/system/addedit') }}">Add New System</a></td>
</tr>
@endcan
@foreach (\App\Models\System::orderBy('name')->cursor() as $oo)

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

@ -50,7 +50,7 @@
</div>
</div>
<div class="col-3">
<div class="col-5">
<label for="system" class="form-label">System</label>
<div class="input-group has-validation">
<span class="input-group-text"><i class="bi bi-laptop-fill"></i></span>
@ -71,7 +71,7 @@
</div>
</div>
<div class="col-4">
<div class="col-2">
<label for="active" class="form-label">Active</label>
<div class="input-group">
<div class="btn-group" role="group">
@ -86,7 +86,7 @@
</div>
<div class="row">
<div class="col-3">
<div class="col-2">
<label for="ztid" class="form-label">ZeroTier ID</label>
<div class="input-group has-validation">
<span class="input-group-text"><i class="bi bi-shield-lock-fill"></i></span>