From f7cf107febd6a28c8a4aac73617361b66e296a91 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Tue, 28 Nov 2023 20:34:18 +0100
Subject: [PATCH 1/2] Fixing some classes for correct styling

---
 application/views/oqrs/index.php | 6 +++---
 assets/js/sections/oqrs.js       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/oqrs/index.php b/application/views/oqrs/index.php
index ba76c94d..5d0ed50a 100644
--- a/application/views/oqrs/index.php
+++ b/application/views/oqrs/index.php
@@ -46,7 +46,7 @@
 
                 <form class="d-flex align-items-center" enctype="multipart/form-data">
                     <label class="my-1 me-2" for="station">Select station: </label>
-                    <select id="station" class="form-select my-1 me-sm-2" name="station">
+                    <select id="station" class="form-select w-auto my-1 me-sm-2" name="station">
                         <?php foreach($stations->result() as $station) {
 									echo '<option value="' . $station->station_id . '">' . $station->station_profile_name . ' - ' . $station->station_callsign . '</option>'."\n";
 								} ?>
@@ -57,7 +57,7 @@
 			<div class="resulttable"></div>
 
             <div class="searchinfo"></div>
-            <?php 
+            <?php
 		}
 
 		else {
@@ -68,4 +68,4 @@
 
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/assets/js/sections/oqrs.js b/assets/js/sections/oqrs.js
index 67d57197..7e763312 100644
--- a/assets/js/sections/oqrs.js
+++ b/assets/js/sections/oqrs.js
@@ -11,7 +11,7 @@ function loadStationInfo() {
         success: function (data) {
             if (data.count > 0) {
                 $(".resulttable").append('<br />' + data.count + ' Qsos logged between ' + data.mindate + ' and ' + data.maxdate + '.<br /><br />');
-                $(".resulttable").append('<form class="form-inline" onsubmit="return false;"><label class="my-1 mr-2" for="oqrssearch">Enter your callsign: </label><input class="form-control mr-sm-2" id="oqrssearch" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search" required="required"><button onclick="searchOqrs();" class="btn btn-sm btn-primary" id="stationbuttonsubmit" type="button"><i class="fas fa-search"></i> Search</button></form>');
+                $(".resulttable").append('<form class="form-inline" onsubmit="return false;"><label class="my-1 mr-2" for="oqrssearch">Enter your callsign: </label><input class="form-control mr-sm-2 w-auto" id="oqrssearch" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search" required="required"><button onclick="searchOqrs();" class="btn btn-sm btn-primary" id="stationbuttonsubmit" type="button"><i class="fas fa-search"></i> Search</button></form>');
                 // Get the input field
                 var input = document.getElementById("oqrssearch");
 

From 8354ae3638ada84121704300b08b3c747c23d501 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Tue, 28 Nov 2023 21:10:30 +0100
Subject: [PATCH 2/2] fixed some bs5 layouts

---
 application/views/oqrs/notinlogform.php     |  2 +-
 application/views/oqrs/request.php          |  2 +-
 application/views/oqrs/request_grouped.php  |  2 +-
 application/views/oqrs/result.php           |  2 ++
 application/views/visitor/layout/header.php | 26 +++++++++++----------
 assets/js/sections/oqrs.js                  |  4 ++--
 6 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/application/views/oqrs/notinlogform.php b/application/views/oqrs/notinlogform.php
index 2f6cd8d5..8367873b 100644
--- a/application/views/oqrs/notinlogform.php
+++ b/application/views/oqrs/notinlogform.php
@@ -16,7 +16,7 @@ checked.<br />
         <tr>
             <td>1</td>
             <td><input class="form-control" type="date" name="date" value="" id="date"></td>
-            <td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="HH:MM"></td>
+            <td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="hh:mm"></td>
 			<td><input class="form-control" type="text" name="band" value="" id="band"></td>
             <td><input class="form-control" type="text" name="mode" value="" id="mode"></td>
         </tr>
diff --git a/application/views/oqrs/request.php b/application/views/oqrs/request.php
index 93e44dc8..3f7b2953 100644
--- a/application/views/oqrs/request.php
+++ b/application/views/oqrs/request.php
@@ -25,7 +25,7 @@ The following QSO(s) were found. Please fill out the date and time and submit yo
                 echo '<tr>';
                     echo '<td>'. $i++ .'</td>';
                     echo '<td><input class="form-control" type="date" name="date" value="" id="date"></td>';
-                    echo '<td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="HH:MM"></td>';
+                    echo '<td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="hh:mm"></td>';
                     echo '<td id="band">'. $qso->col_band .'</td>';
                     echo '<td id="mode">'; echo $qso->col_submode == null ? strtoupper($qso->col_mode) : strtoupper($qso->col_submode);  echo '</td>';
                 echo '</tr>';
diff --git a/application/views/oqrs/request_grouped.php b/application/views/oqrs/request_grouped.php
index 1b1bf31e..b110706f 100644
--- a/application/views/oqrs/request_grouped.php
+++ b/application/views/oqrs/request_grouped.php
@@ -20,7 +20,7 @@ The following QSO(s) were found. Please fill out the date and time and submit yo
                 echo '<tr stationid="'. $qso->station_id.'">';
                     echo '<td>'. $i++ .'</td>';
                     echo '<td><input class="form-control" type="date" name="date" value="" id="date"></td>';
-                    echo '<td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="HH:MM"></td>';
+                    echo '<td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="hh:mm"></td>';
                     echo '<td id="band">'. $qso->col_band .'</td>';
                     echo '<td id="mode">'; echo $qso->col_submode == null ? strtoupper($qso->col_mode) : strtoupper($qso->col_submode);  echo '</td>';      
                     echo '<td>'. $qso->station_callsign .'</td>';
diff --git a/application/views/oqrs/result.php b/application/views/oqrs/result.php
index 814e3123..23e64b06 100644
--- a/application/views/oqrs/result.php
+++ b/application/views/oqrs/result.php
@@ -29,8 +29,10 @@ echo '</tbody></table>';
 echo strtoupper($callsign) . ' has ' . $count . ' band slot(s) and has ' . $qsocount . ' QSO(s) in the log.<br /><br />';
 ?>
 <button onclick="requestOqrs();" class="btn btn-primary btn-sm" type="button"> Request QSL</button>
+<br>
 <?php } else {
 	echo '<br />No QSOs found in the log.<br />';
 }
 	?>
+<br>
 <button onclick="notInLog();" class="btn btn-primary btn-sm" type="button"> Not in log?</button>
\ No newline at end of file
diff --git a/application/views/visitor/layout/header.php b/application/views/visitor/layout/header.php
index 3ac04413..718252a5 100644
--- a/application/views/visitor/layout/header.php
+++ b/application/views/visitor/layout/header.php
@@ -72,18 +72,20 @@
 		</li>
 		<?php } ?>
 		</ul>
-
-		<div style="paddling-left: 0.5rem; padding-right: 0.5rem"></div>
-		<?php if (!empty($slug)) {
-			$this->CI =& get_instance();
-			if ($this->CI->public_search_enabled($slug) || $this->session->userdata('user_type') >= 2) { ?>
-				<form method="post" name="searchForm" action="<?php echo site_url('visitor/search'); ?>" onsubmit="return validateForm()" class="form-inline">
-            <input class="form-control me-sm-2" id="searchcall" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" <?php if (isset($callsign) && $callsign != '') { echo 'value="'.strtoupper($callsign).'"'; } ?> aria-label="Search" data-toogle="tooltip" data-bs-placement="bottom" title="Please enter a callsign!">
-					<input type="hidden" name="public_slug" value="<?php echo $slug; ?>">
-					<button class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> <?php echo lang('menu_search_button'); ?></button>
-				</form>
-			<?php }
-		} ?>
+		<div class="m-2">
+			<?php if (!empty($slug)) {
+				$this->CI =& get_instance();
+				if ($this->CI->public_search_enabled($slug) || $this->session->userdata('user_type') >= 2) { ?>
+					<form method="post" name="searchForm" action="<?php echo site_url('visitor/search'); ?>" onsubmit="return validateForm()" class="d-flex align-items-center">
+						<input class="form-control me-sm-2" id="searchcall" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" <?php if (isset($callsign) && $callsign != '') { echo 'value="'.strtoupper($callsign).'"'; } ?> aria-label="Search" data-toogle="tooltip" data-bs-placement="bottom" title="Please enter a callsign!">
+						<input type="hidden" name="public_slug" value="<?php echo $slug; ?>">
+						<button title="<?php echo lang('menu_search_button'); ?>" class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i>
+							<div class="d-inline d-lg-none" style="padding-left: 10px"><?php echo lang('menu_search_button'); ?></div>
+						</button>
+					</form>
+				<?php }
+			} ?>
+		</div>
 	</div>
 </div>
 </nav>
diff --git a/assets/js/sections/oqrs.js b/assets/js/sections/oqrs.js
index 7e763312..23a85d36 100644
--- a/assets/js/sections/oqrs.js
+++ b/assets/js/sections/oqrs.js
@@ -11,7 +11,7 @@ function loadStationInfo() {
         success: function (data) {
             if (data.count > 0) {
                 $(".resulttable").append('<br />' + data.count + ' Qsos logged between ' + data.mindate + ' and ' + data.maxdate + '.<br /><br />');
-                $(".resulttable").append('<form class="form-inline" onsubmit="return false;"><label class="my-1 mr-2" for="oqrssearch">Enter your callsign: </label><input class="form-control mr-sm-2 w-auto" id="oqrssearch" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search" required="required"><button onclick="searchOqrs();" class="btn btn-sm btn-primary" id="stationbuttonsubmit" type="button"><i class="fas fa-search"></i> Search</button></form>');
+                $(".resulttable").append('<form class="d-flex align-items-center" onsubmit="return false;"><label for="oqrssearch">Enter your callsign: </label><input class="form-control m-2 w-auto" id="oqrssearch" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search" required="required"><button onclick="searchOqrs();" class="btn btn-sm btn-primary" id="stationbuttonsubmit" type="button"><i class="fas fa-search"></i> Search</button></form>');
                 // Get the input field
                 var input = document.getElementById("oqrssearch");
 
@@ -160,7 +160,7 @@ function oqrsAddLine() {
 
     var $iterator = $('<td></td>').html(rowCount);
     var $date = $('<td></td>').html('<input class="form-control" type="date" name="date" value="" id="date" placeholder="YYYY-MM-DD">');
-    var $time = $('<td></td>').html('<input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="HH:MM">');
+    var $time = $('<td></td>').html('<input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="hh:mm">');
     var $band = $('<td></td>').html('<input class="form-control" type="text" name="band" value="" id="band">');
     var $mode = $('<td></td>').html('<input class="form-control" type="text" name="mode" value="" id="mode">');