From fe54069d6e68d2360cb1aa829e33aa118ad9a313 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 4 Sep 2019 22:11:55 +0100
Subject: [PATCH] Cleaned up search bugs

---
 application/views/interface_assets/footer.php | 28 +++++++++++++++----
 application/views/search/main.php             |  5 +++-
 assets/css/general.css                        |  4 ++-
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index a87ef206..57773f2b 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -79,19 +79,35 @@ $(document).ready(function() {
 <?php if ($this->uri->segment(1) == "search") { ?>
 <script type="text/javascript">
 i=0;
+
+function searchButtonPress(){
+    event.preventDefault()
+    if ($('#callsign').val()) {
+      $('#partial_view').load("logbook/search_result/" + $('#callsign').val(), function() {});
+    }
+}
+
 $(document).ready(function(){
 
+  <?php if($this->input->post('callsign') != "") { ?>
     $('#partial_view').load("logbook/search_result/<?php echo $this->input->post('callsign'); ?>", function() {
     });
+  <?php } ?>
+    
+$(document).on('keypress',function(e) { 
+  if(e.which == 13) {
 
-  $("#callsign").keyup(function(){
-    if ($(this).val()) {
-
-        $('#partial_view').load("logbook/search_result/" + $(this).val(), function() {
-        });
+    if ($('#callsign').val()) {
+      $('#partial_view').load("logbook/search_result/" + $('#callsign').val(), function() {});
     }
 
-  });
+
+     event.preventDefault();
+        return false;
+  }
+});
+
+
 });
 </script>
 <?php } ?>
diff --git a/application/views/search/main.php b/application/views/search/main.php
index 91b8130e..68707d6c 100644
--- a/application/views/search/main.php
+++ b/application/views/search/main.php
@@ -5,9 +5,12 @@
 	<form method="post" action="" id="search_box" name="test">
 	  <div class="form-group row">
 	    <label for="callsign" class="col-sm-2 col-form-label">Callsign</label>
-	    <div class="col-sm-10">
+	    <div class="col-sm-8">
 	      <input type="text" class="form-control" id="callsign" value="">
 	    </div>
+	    <div class="col-sm-2">
+	    	<button onclick="searchButtonPress()" class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> Search</button>
+	    </div>
 	  </div>
 	</form>
 
diff --git a/assets/css/general.css b/assets/css/general.css
index 2cf991a5..db3ced71 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -159,4 +159,6 @@ TD.lotw{
 }
 
 
-
+#search_box #callsign {
+    text-transform: uppercase;
+}
\ No newline at end of file