From 84df9ce8112820659f16a1f012f15d8604ca8431 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sat, 19 Jun 2021 14:40:55 +1000
Subject: [PATCH] Minor layout fixes, and link fixes. Changed notes to be
 optional in systems table

---
 .../2021_06_19_043425_fix_systems.php         | 28 +++++++++++++++++++
 public/oldschool/css/main.css                 |  3 ++
 resources/views/domain/view.blade.php         | 22 +++++++++++++++
 resources/views/system/home.blade.php         |  4 +--
 resources/views/zone/addedit.blade.php        |  6 ++--
 5 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 database/migrations/2021_06_19_043425_fix_systems.php

diff --git a/database/migrations/2021_06_19_043425_fix_systems.php b/database/migrations/2021_06_19_043425_fix_systems.php
new file mode 100644
index 0000000..0c40af9
--- /dev/null
+++ b/database/migrations/2021_06_19_043425_fix_systems.php
@@ -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
+    }
+}
diff --git a/public/oldschool/css/main.css b/public/oldschool/css/main.css
index 28b0e3f..d84709e 100644
--- a/public/oldschool/css/main.css
+++ b/public/oldschool/css/main.css
@@ -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
diff --git a/resources/views/domain/view.blade.php b/resources/views/domain/view.blade.php
index 88f104e..22e0414 100644
--- a/resources/views/domain/view.blade.php
+++ b/resources/views/domain/view.blade.php
@@ -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
\ No newline at end of file
diff --git a/resources/views/system/home.blade.php b/resources/views/system/home.blade.php
index e3b4c53..ba8ef30 100644
--- a/resources/views/system/home.blade.php
+++ b/resources/views/system/home.blade.php
@@ -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)
diff --git a/resources/views/zone/addedit.blade.php b/resources/views/zone/addedit.blade.php
index c54c817..38df183 100644
--- a/resources/views/zone/addedit.blade.php
+++ b/resources/views/zone/addedit.blade.php
@@ -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>