From b3ce2c9a27cb720fd31b6234a37221f95227d099 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 20 Mar 2019 16:58:06 +0000
Subject: [PATCH] Changed Dashboard page to latest bootstrap and fixed Awards
 page

---
 application/controllers/Dashboard.php         |  4 +-
 application/models/Dxcc.php                   |  3 +-
 application/views/awards/cq/index.php         |  3 +-
 application/views/awards/dxcc/details.php     |  4 +-
 application/views/awards/dxcc/index.php       |  7 +-
 application/views/awards/index.php            | 19 ++--
 application/views/awards/nav_bar.php          | 28 ++----
 application/views/awards/sota/index.php       |  6 +-
 application/views/awards/wab/index.php        |  7 +-
 application/views/dashboard/index.php         | 94 +++++++------------
 application/views/interface_assets/footer.php | 23 +++++
 application/views/interface_assets/header.php |  5 +-
 12 files changed, 96 insertions(+), 107 deletions(-)

diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index 2226f9b0..bb5d9137 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -62,9 +62,9 @@ class Dashboard extends CI_Controller {
 
 		$data['page_title'] = "Dashboard";
 
-		$this->load->view('layout/header', $data);
+		$this->load->view('interface_assets/header', $data);
 		$this->load->view('dashboard/index');
-		$this->load->view('layout/footer');
+		$this->load->view('interface_assets/footer');
 	}
 	
 	function map() {
diff --git a/application/models/Dxcc.php b/application/models/Dxcc.php
index 514407d5..4f07166e 100644
--- a/application/models/Dxcc.php
+++ b/application/models/Dxcc.php
@@ -33,7 +33,8 @@ class DXCC extends CI_Model {
                                                 "6m" =>0,
                                                 "4m" =>0, 
                                                 "2m" =>0,
-                                                "70cm"=>0);
+                                                "70cm"=>0,
+                                            	"23cm"=>0);
                 $last_country = $row->COL_COUNTRY;
             }
 
diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php
index 27b667c3..5c14e8ff 100644
--- a/application/views/awards/cq/index.php
+++ b/application/views/awards/cq/index.php
@@ -1,4 +1,5 @@
-<div id="container">
+<div class="container">
+  <br><br><br>
   <h1><?php echo $page_title?></h1>
 
   <?php $this->load->view("awards/nav_bar")?>
diff --git a/application/views/awards/dxcc/details.php b/application/views/awards/dxcc/details.php
index 2a16433e..16b26ae0 100644
--- a/application/views/awards/dxcc/details.php
+++ b/application/views/awards/dxcc/details.php
@@ -31,8 +31,8 @@
 	</script>
 	
 
-<div id="container">
-
+<div class="container">
+	<br><br><br>
 	<h2>Logbook</h2>
 
 	<h3>Filtering on <?php echo $filter ?></h3>
diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php
index 4bd1424d..4a0f5d15 100644
--- a/application/views/awards/dxcc/index.php
+++ b/application/views/awards/dxcc/index.php
@@ -1,14 +1,14 @@
 
-<div id="container">
+<div class="container">
+    <br><br><br>
 	<h1><?php echo $page_title; ?></h1>
 
 	<!-- Sub Nav for Awards -->
 	
     <?php $this->load->view("awards/nav_bar")?>
     
-    <table id="table-fixed"></table>
 
-	<table width="100%" class="zebra-striped">
+	<table class="table table-striped table-hover">
 	<thead>
         <tr>
         <td style="width:225px">Country (<?php echo count($dxcc)?>)</td>
@@ -25,6 +25,7 @@
         <td>4m</td>
         <td>2m</td>
         <td>70cm</td>
+        <td>23cm</td>
         </tr>
     </thead>
     <tbody>
diff --git a/application/views/awards/index.php b/application/views/awards/index.php
index 2b0e21ae..86848491 100644
--- a/application/views/awards/index.php
+++ b/application/views/awards/index.php
@@ -1,13 +1,14 @@
 <div class="container">
-	<h2><?php echo $page_title; ?></h2>
 
-	<ul class="tabs">
-	  <li class="active"><a href="<?php echo site_url('awards'); ?>">Home</a></li>
-	  <li><a href="<?php echo site_url('awards/dxcc'); ?>">DXCC</a></li>
-	  <li><a href="<?php echo site_url('awards/wab'); ?>">WAB</a></li>
-	  <li><a href="<?php echo site_url('awards/sota'); ?>">SOTA</a></li>
-	  <li><a href="<?php echo site_url('awards/wacral'); ?>">WACRAL</a></li>
-	  <li><a href="<?php echo site_url('awards/cq'); ?>">CQ</a></li>
-	</ul>
+<br><br><br>
+<h2><?php echo $page_title; ?></h2>
+
+
+<nav class="nav">
+  <a class="nav-link" href="<?php echo site_url('awards/dxcc'); ?>">DXCC</a>
+  <a class="nav-link" href="<?php echo site_url('awards/wab'); ?>">WAB</a>
+  <a class="nav-link" href="<?php echo site_url('awards/sota'); ?>">SOTA</a>
+  <a class="nav-link" href="<?php echo site_url('awards/cq'); ?>">CQ</a>
+</nav>
 
 </div>
diff --git a/application/views/awards/nav_bar.php b/application/views/awards/nav_bar.php
index 4f5b6ab1..4a6d44ad 100644
--- a/application/views/awards/nav_bar.php
+++ b/application/views/awards/nav_bar.php
@@ -1,23 +1,7 @@
 
-	<ul class="tabs">
-	  <li id="tab_dxcc">
-	    <a href="<?php echo site_url('awards/dxcc'); ?>">DXCC</a>
-	  </li>
-	  <li id="tab_wab">
-	    <a href="<?php echo site_url('awards/wab'); ?>">WAB</a>
-	  </li>
-	  <li id="tab_sota">
-	    <a href="<?php echo site_url('awards/sota'); ?>">SOTA</a>
-	  </li>
-	  <li id="tab_wacral">
-	    <a href="<?php echo site_url('awards/wacral'); ?>">WACRAL</a>
-	  </li>
-	  <li id="tab_cq">
-	    <a href="<?php echo site_url('awards/cq'); ?>">CQ</a>
-	  </li>
-	</ul>
-
-    <script>
-        var tab = "<?php echo $this->router->fetch_method(); ?>";
-        $('#tab_'+tab).addClass('active');
-    </script>
+<nav class="nav">
+  <a class="nav-link" href="<?php echo site_url('awards/dxcc'); ?>">DXCC</a>
+  <a class="nav-link" href="<?php echo site_url('awards/wab'); ?>">WAB</a>
+  <a class="nav-link" href="<?php echo site_url('awards/sota'); ?>">SOTA</a>
+  <a class="nav-link" href="<?php echo site_url('awards/cq'); ?>">CQ</a>
+</nav>
\ No newline at end of file
diff --git a/application/views/awards/sota/index.php b/application/views/awards/sota/index.php
index d6a21999..51c3274a 100644
--- a/application/views/awards/sota/index.php
+++ b/application/views/awards/sota/index.php
@@ -1,11 +1,13 @@
-<div id="container">
+<div class="container">
+
+	<br><br><br>
 	<h1><?php echo $page_title; ?></h1>
 	
 	<!-- Sub Nav for Awards -->
 	
     <?php $this->load->view("awards/nav_bar")?>
 	
-	<table width="100%" class="zebra-striped">
+	<table class="table table-striped table-hover">
 		
 	<tr>
 		<td>Reference</td>
diff --git a/application/views/awards/wab/index.php b/application/views/awards/wab/index.php
index adc61458..a32ccc06 100644
--- a/application/views/awards/wab/index.php
+++ b/application/views/awards/wab/index.php
@@ -1,11 +1,14 @@
-<div id="container">
+<div class="container">
+
+	<br><br><br>
+
 	<h1><?php echo $page_title; ?></h1>
 
 	<!-- Sub Nav for Awards -->
 	
     <?php $this->load->view("awards/nav_bar")?>
 
-	<table width="100%" class="zebra-striped">
+	<table class="table table-striped table-hover">
 		
 	<tr>
 		<td>Square</td>
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index af382da2..76d0eafa 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -1,67 +1,37 @@
-	<script type="text/javascript" src="<?php echo base_url() ;?>fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
-
-	<script type="text/javascript" src="<?php echo base_url() ;?>fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url() ;?>fancybox/jquery.fancybox-1.3.4.css" media="screen" />
-
-	<script type="text/javascript">
-
-		$(document).ready(function() {
-			$(".qsobox").fancybox({
-				'autoDimensions'	: false,
-				'width'         	: 700,
-				'height'        	: 300,
-				'transitionIn'		: 'fade',
-				'transitionOut'		: 'fade',
-				'type'				: 'iframe'
-			});
-		});
-
-	</script>
-	
-	<script type="text/javascript" src="<?php echo base_url();?>js/leaflet/leafembed.js"></script>
-	<script type="text/javascript">
-	  
-	  	<?php if($qra == "set") { ?>
-		var q_lat = <?php echo $qra_lat; ?>;
-		var q_lng = <?php echo $qra_lng; ?>;	
-		<?php } else { ?>
-		var q_lat = 40.313043;
-		var q_lng = -32.695312;
-		<?php } ?>
-
-		var qso_loc = '<?php echo site_url('dashboard/map');?>';
-		var q_zoom = 2;
-
-	  $(document).ready(function(){
-			initmap();
-	  });
-	</script>
-
-<div id="container">
-
+<div class="container">
+<br><br><br>
 <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
-<div class="alert-message success">
-	  <p>You have had <strong><?php echo $todays_qsos; ?></strong> QSOs Today!</p>
-</div>
+
+	<?php if($todays_qsos >= 1) { ?>
+		<div class="alert alert-success" role="alert">
+			  You have had <strong><?php echo $todays_qsos; ?></strong> QSOs Today!
+		</div>
+	<?php } else { ?>
+		<div class="alert alert-danger" role="alert">
+			  You have made no QSOs today, time to turn on the radio!
+		</div>
+	<?php } ?>
 <?php } ?>
 
 <!-- Map -->
 <div id="map" style="width: 100%; height: 300px"></div>
 
 <!-- Log Data -->
-<div class="row" style="margin-top: 10px;">
-  <div class="span10" style="padding-left: 15px; padding-right: 25px; border-right: 1px solid #dfdfdf;">
-    	<table width="100%" class="zebra-striped">
-			<tr class="titles">
-				<td>Date</td>
-				<td>Time</td>
-				<td>Call</td>
-				<td>Mode</td>
-				<td>Sent</td>
-				<td>Recv</td>
-				<td>Band</td>
-			</tr>
+<div class="row">
+  <div class="col-8" style="padding-left: 15px; padding-right: 25px; border-right: 1px solid #dfdfdf;">
+    	<table class="table table-striped table-hover">
+
+    		<thead>
+				<tr class="titles">
+					<th>Date</th>
+					<th>Time</th>
+					<th>Call</th>
+					<th>Mode</th>
+					<th>Sent</th>
+					<th>Recv</th>
+					<th>Band</th>
+				</tr>
+			</thead>
 
 			<?php $i = 0; 
 			foreach ($last_five_qsos->result() as $row) { ?>
@@ -82,10 +52,10 @@
 		</table>
   </div>
 
-  <div class="span5">
-    	<table width="100%" class="zebra-striped">
+  <div class="col-4">
+    	<table class="table table-striped table-hover">
 			<tr class="titles">
-				<td colspan="2"><span class="icon_stats">QSOs</span></td>
+				<td colspan="2"><i class="fas fa-chart-bar"></i> QSOs</td>
 			</tr>
 			
 			<tr>
@@ -109,7 +79,7 @@
 			</tr>
 			
 			<tr class="titles">
-				<td colspan="2"><span class="icon_world">Countries</span></td>
+				<td colspan="2"><i class="fas fa-globe-europe"></i> Countries</td>
 			</tr>
 			
 			<tr>
@@ -128,7 +98,7 @@
 			</tr>
 					
 			<tr class="titles">
-				<td colspan="2"><span class="icon_qsl">QSL Cards</span></td>
+				<td colspan="2"><i class="fas fa-envelope"></i>QSL Cards</td>
 			</tr>
 			
 			<tr>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index d87eb1aa..ded9abd8 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -4,6 +4,8 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
     <script src="<?php echo base_url(); ?>assets/js/bootstrap.min.js"></script>
 
+    <script type="text/javascript" src="<?php echo base_url(); ?>js/leaflet/leaflet.js"></script>
+
 <script>
 $(document).ready(function() {
 	$('#create_station_profile #country').val($("#dxcc_select option:selected").text());
@@ -13,6 +15,27 @@ $(document).ready(function() {
 });
 </script>
 
+    
+    <script type="text/javascript" src="<?php echo base_url();?>js/leaflet/leafembed.js"></script>
+    <script type="text/javascript">
+      
+        <?php if($qra == "set") { ?>
+        var q_lat = <?php echo $qra_lat; ?>;
+        var q_lng = <?php echo $qra_lng; ?>;    
+        <?php } else { ?>
+        var q_lat = 40.313043;
+        var q_lng = -32.695312;
+        <?php } ?>
+
+        var qso_loc = '<?php echo site_url('dashboard/map');?>';
+        var q_zoom = 2;
+
+      $(document).ready(function(){
+            initmap();
+      });
+    </script>
+
+
 
 <?php if ($this->uri->segment(1) == "radio") { ?>
 <!-- If this is the admin/radio page run the JS -->
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index d5cd62ab..5f2b5712 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -9,11 +9,14 @@
     <link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/bootstrap.min.css">
     <link rel="stylesheet" href="<?php echo base_url(); ?>assets/fontawesome/css/all.css">
 
+    <!-- Maps -->
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>js/leaflet/leaflet.css" />
+
     <title><?php if(isset($page_title)) { echo $page_title; } ?> - Cloudlog</title>
   </head>
   <body>
 
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
+<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
 		<a class="navbar-brand" href="<?php echo site_url(); ?>">Cloudlog</a>
 
 		<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>