Merge branch 'magicbug:dev' into dev

application/models/Logbook_model.php

@@ -1777,7 +1777,10 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
 
     $this->db->select('COL_GRIDSQUARE');
     $this->db->where_in('station_id', $logbooks_locations_array);
+    $this->db->group_start();
     $this->db->like('COL_GRIDSQUARE', $grid);
+    $this->db->or_like('COL_VUCC_GRIDS', $grid);
+    $this->db->group_end();
 
     if($band != null && $band != 'SAT') {
       $this->db->where('COL_BAND', $band);

application/views/interface_assets/header.php

@@ -218,8 +218,7 @@
 				<?php if ($this->optionslib->get_option('global_search') != "false" || $this->session->userdata('user_type') >= 2) { ?>
 					<form method="post" action="<?php echo site_url('search'); ?>" class="form-inline">
 						<input class="form-control mr-sm-2" id="nav-bar-search-input" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" aria-label="Search">
-
+						<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>
-						<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></button>
 					</form>
 				<?php } ?>