From cca5b0ae3b06ce2b05dcaeca03d0851457623b86 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Mon, 13 May 2019 17:37:01 +0100
Subject: [PATCH] Changed Statistics to Bootstrap 4 layout

---
 application/controllers/Statistics.php        | 19 ++++----
 application/views/statistics/custom.php       | 23 ++++++---
 .../views/statistics/custom_result.php        | 12 ++---
 application/views/statistics/index.php        | 48 ++++++++++++++-----
 assets/css/general.css                        |  8 ++++
 5 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/application/controllers/Statistics.php b/application/controllers/Statistics.php
index 48cb2089..b91638ec 100644
--- a/application/controllers/Statistics.php
+++ b/application/controllers/Statistics.php
@@ -39,11 +39,15 @@ class Statistics extends CI_Controller {
 		
 		$data['totals_year'] = $this->logbook_model->totals_year();
 	
-		$data['page_title'] = "Statistics";
+		// Render User Interface
 
-		$this->load->view('layout/header', $data);
+		// Set Page Title
+		$data['page_title'] = "Statistics";
+		
+		// Load Views
+		$this->load->view('interface_assets/header', $data);
 		$this->load->view('statistics/index');
-		$this->load->view('layout/footer');
+		$this->load->view('interface_assets/footer');
 	}
 	
 	function custom() {
@@ -72,9 +76,9 @@ class Statistics extends CI_Controller {
 
 		if ($this->form_validation->run() == FALSE)
 		{
-			$this->load->view('layout/header', $data);
+			$this->load->view('interface_assets/header', $data);
 			$this->load->view('statistics/custom', $data);
-			$this->load->view('layout/footer');
+			$this->load->view('interface_assets/footer');
 		}
 		else
 		{
@@ -83,10 +87,9 @@ class Statistics extends CI_Controller {
 	
 			$data['result'] = $this->stats->result();
 		
-			$this->load->view('layout/header', $data);
+			$this->load->view('interface_assets/header', $data);
 			$this->load->view('statistics/custom_result');
-			$this->load->view('layout/footer');
-	
+			$this->load->view('interface_assets/footer');
 		}
 	
 	}
diff --git a/application/views/statistics/custom.php b/application/views/statistics/custom.php
index 9ea33139..39c28c65 100644
--- a/application/views/statistics/custom.php
+++ b/application/views/statistics/custom.php
@@ -5,15 +5,24 @@
 	});
 </script>
 
-<div id="container">
+<div class="container statistics_custom">
 
-	<h2><?php echo $page_title; ?></h2>
+<h2>
+  <?php echo $page_title; ?>
+  <small class="text-muted">Explore the logbook.</small>
+</h2>
 
-	<ul class="tabs">
-	  <li><a href="<?php echo site_url('statistics');?>#home">General</a></li>
-	  <li><a href="<?php echo site_url('statistics');?>#space">Satellite Contacts</a></li>
-	  <li class="active"><a href="<?php echo site_url('statistics');?>/custom">Custom</a></li>
-	</ul>
+<ul class="nav nav-tabs" id="myTab" role="tablist">
+  <li class="nav-item">
+    <a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">General</a>
+  </li>
+  <li class="nav-item">
+    <a class="nav-link" id="satellite-tab" data-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false">Satellites</a>
+  </li>
+  <li class="nav-item">
+    <a href="/index.php/statistics/custom" class="nav-link" role="tab">Custom</a>
+  </li>
+</ul>
 	
 		<p>This is a work in-progress</p>
 		
diff --git a/application/views/statistics/custom_result.php b/application/views/statistics/custom_result.php
index 3673f581..e318a7f7 100644
--- a/application/views/statistics/custom_result.php
+++ b/application/views/statistics/custom_result.php
@@ -5,15 +5,13 @@
 	});
 </script>
 
-<div id="container">
+<div class="container statistics_custom">
 
-	<h2><?php echo $page_title; ?></h2>
+<h2>
+  <?php echo $page_title; ?>
+  <small class="text-muted">Explore the logbook.</small>
+</h2>
 
-	<ul class="tabs">
-	  <li><a href="<?php echo site_url('statistics');?>#home">General</a></li>
-	  <li><a href="<?php echo site_url('statistics');?>#space">Satellite Contacts</a></li>
-	  <li class="active"><a href="<?php echo site_url('statistics');?>/custom">Custom</a></li>
-	</ul>
 	
 		<p>This is a work in-progress</p>
 		
diff --git a/application/views/statistics/index.php b/application/views/statistics/index.php
index 0181c1fb..edb14a06 100644
--- a/application/views/statistics/index.php
+++ b/application/views/statistics/index.php
@@ -95,20 +95,42 @@
 	  }
 	</script>
 
-<div id="container">
+<div class="container statistics">
+
+
+<h2>
+  <?php echo $page_title; ?>
+  <small class="text-muted">Explore the logbook.</small>
+</h2>
+
+
+<br>
+
+<ul class="nav nav-tabs" id="myTab" role="tablist">
+  <li class="nav-item">
+    <a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">General</a>
+  </li>
+  <li class="nav-item">
+    <a class="nav-link" id="satellite-tab" data-toggle="tab" href="#satellite" role="tab" aria-controls="satellite" aria-selected="false">Satellites</a>
+  </li>
+  <li class="nav-item">
+    <a href="/index.php/statistics/custom" class="nav-link" role="tab">Custom</a>
+  </li>
+</ul>
+
+<div class="tab-content" id="myTabContent">
+  <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
+  	<div id="totals_year" style="width: 900px; height: 500px;"></div>
+	<div id="modechart_div"></div>
+	<div id="bandchart_div"></div>
+  </div>
+  
+  <div class="tab-pane fade" id="satellite" role="tabpanel" aria-labelledby="satellite-tab">
+  	<div id="satchart_div"></div>
+  </div>
+  
+</div>
 
-	<h2><?php echo $page_title; ?></h2>
 
-	<ul class="tabs">
-	  <li class="active"><a href="#home">General</a></li>
-	  <li><a href="#space">Satellite Contacts</a></li>
-	  <li><a href="statistics/custom">Custom</a></li>
-	</ul>
-	 
-	<div class="pill-content">
-	  <div class="active" id="home">
-	<div id="totals_year" style="width: 900px; height: 500px;"></div><div id="modechart_div"></div> <div id="bandchart_div"></div></div>
-	  <div id="space"><div id="satchart_div"></div></div>
-	</div>
 
 </div>
diff --git a/assets/css/general.css b/assets/css/general.css
index 2c804635..f6a930ec 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -12,4 +12,12 @@
 }
 .row.logdata {
 	padding-top: 15px;
+}
+
+.statistics {
+	padding-top: 15px;
+}
+
+.statistics_custom {
+	padding-top: 15px;
 }
\ No newline at end of file