From 6b0e9b5eeb22eb9e1190bb8f03bcf5b870cf6c15 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Fri, 11 Feb 2022 11:23:33 +0000
Subject: [PATCH] [Station Logbooks] Swapped layout so that it made more sense
 visually.

---
 application/controllers/Logbooks.php | 27 +++++++++++----
 application/views/logbooks/edit.php  | 49 ++++++++++++++--------------
 2 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/application/controllers/Logbooks.php b/application/controllers/Logbooks.php
index 0c24a4fd..02459948 100644
--- a/application/controllers/Logbooks.php
+++ b/application/controllers/Logbooks.php
@@ -132,14 +132,27 @@ class Logbooks extends CI_Controller {
 	public function save_publicslug() {
 		$this->load->model('logbooks_model');
 
-		$this->load->model('logbooks_model');
-		$result = $this->logbooks_model->is_public_slug_available($this->input->post('public_slug'));
-		
-		if($result == true) {
-			$returndata = $this->logbooks_model->save_public_slug($this->input->post('public_slug'), $this->input->post('logbook_id'));
-			echo "<div class=\"alert alert-success\" role=\"alert\">Public Slug Saved</div>";
-		} else {
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('public_slug', 'Public Slug', 'required|alpha_numeric');
+
+		if ($this->form_validation->run() == FALSE)
+		{
 			echo "<div class=\"alert alert-danger\" role=\"alert\">Oops! This Public Slug is unavailable</div>";
+			echo validation_errors();
+		}
+		else
+		{
+			$this->load->model('logbooks_model');
+			$result = $this->logbooks_model->is_public_slug_available($this->input->post('public_slug'));
+			
+	
+			if($result == true) {
+				$returndata = $this->logbooks_model->save_public_slug($this->input->post('public_slug'), $this->input->post('logbook_id'));
+				echo "<div class=\"alert alert-success\" role=\"alert\">Public Slug Saved</div>";
+			} else {
+				echo "<div class=\"alert alert-danger\" role=\"alert\">Oops! This Public Slug is unavailable</div>";
+			}
 		}
 		
 	}
diff --git a/application/views/logbooks/edit.php b/application/views/logbooks/edit.php
index 78d1a014..22a0358e 100644
--- a/application/views/logbooks/edit.php
+++ b/application/views/logbooks/edit.php
@@ -40,7 +40,30 @@
 			</div>
 		</div>
 
-		
+		<div class="col-md">
+			<div class="card">
+				<div class="card-header">Public Slug</div>
+				<div class="card-body">
+					<p>Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only.</p>
+					
+					<form hx-post="<?php echo site_url('logbooks/save_publicslug/'); ?>" hx-target="#publicSlugForm">
+					<div id="publicSlugForm">
+					</div>
+					<div class="form-group">
+						<input type="hidden" name="logbook_id" value="<?php echo $station_logbook_details->logbook_id; ?>">
+						<label for="publicSlugInput">Type in Public Slug choice</label>
+						<div hx-target="this" hx-swap="outerHTML">
+							<input class="form-control" name="public_slug" id="publicSlugInput" pattern="[a-zA-Z0-9-]+" value="<?php echo $station_logbook_details->public_slug; ?>" hx-post="<?php echo site_url('logbooks/publicslug_validate/'); ?>"  hx-trigger="keyup changed delay:500ms" required>
+						</div>
+					</div>
+					<button type="submit" class="btn btn-primary"><i class="fas fa-plus-square"></i> Save</button>
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row">
 		<div class="col-md">
 			<div class="card">
 				<div class="card-header">Station Locations</div>
@@ -66,30 +89,6 @@
 		</div>
 	</div>
 
-	<div class="row">
-		<div class="col-md">
-			<div class="card">
-				<div class="card-header">Public Slug</div>
-				<div class="card-body">
-					<p>Setting a public slug allows you to share your logbook with anyone via a custom website address, this slug can contain letters & numbers only.</p>
-					
-					<form hx-post="<?php echo site_url('logbooks/save_publicslug/'); ?>" hx-target="#publicSlugForm">
-					<div id="publicSlugForm">
-					</div>
-					<div class="form-group">
-						<input type="hidden" name="logbook_id" value="<?php echo $station_logbook_details->logbook_id; ?>">
-						<label for="publicSlugInput">Type in Public Slug choice</label>
-						<div hx-target="this" hx-swap="outerHTML">
-							<input class="form-control" name="public_slug" id="publicSlugInput" pattern="[a-zA-Z0-9-]+" value="<?php echo $station_logbook_details->public_slug; ?>" hx-post="<?php echo site_url('logbooks/publicslug_validate/'); ?>"  hx-trigger="keyup changed delay:500ms" required>
-						</div>
-					</div>
-					<button type="submit" class="btn btn-primary"><i class="fas fa-plus-square"></i> Save</button>
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
-
 	<div class="card">
 		<div class="card-header">
 			Linked Locations