From f506750cfb8bd0c52150740e72349f90b26c7c7d Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Mon, 14 Jan 2019 16:29:06 +0000
Subject: [PATCH] Bootstrap Interface Updates

---
 application/controllers/Backup.php      | 12 +++++-----
 application/controllers/Eqsl.php        | 12 +++++-----
 application/controllers/Lotw.php        | 16 ++++++-------
 application/views/backup/adif_view.php  |  2 +-
 application/views/backup/main.php       | 31 ++++++++++++++++++-------
 application/views/backup/notes_view.php |  2 +-
 application/views/eqsl/analysis.php     |  2 +-
 application/views/eqsl/export.php       |  2 +-
 application/views/eqsl/import.php       |  2 +-
 application/views/lotw/analysis.php     |  2 +-
 application/views/lotw/export.php       |  2 +-
 application/views/lotw/import.php       |  2 +-
 application/views/lotw/status.php       |  2 +-
 backup/notes.xml                        |  2 ++
 14 files changed, 53 insertions(+), 38 deletions(-)
 create mode 100644 backup/notes.xml

diff --git a/application/controllers/Backup.php b/application/controllers/Backup.php
index ae779ebb..cae40257 100644
--- a/application/controllers/Backup.php
+++ b/application/controllers/Backup.php
@@ -8,9 +8,9 @@ class Backup extends CI_Controller {
 
 		$data['page_title'] = "Backup";
 
-		$this->load->view('layout/header', $data);
+		$this->load->view('interface_assets/header', $data);
 		$this->load->view('backup/main');
-		$this->load->view('layout/footer');
+		$this->load->view('interface_assets/footer');
 	}
 
 	/* Gets all QSOs and Dumps them to logbook.adi */
@@ -34,9 +34,9 @@ class Backup extends CI_Controller {
 
 		$data['page_title'] = "ADIF - Backup";
 
-		$this->load->view('layout/header', $data);
+		$this->load->view('interface_assets/header', $data);
 		$this->load->view('backup/adif_view');
-		$this->load->view('layout/footer');
+		$this->load->view('interface_assets/footer');
 
 	}
 
@@ -58,9 +58,9 @@ class Backup extends CI_Controller {
 
 		$data['page_title'] = "Notes - Backup";
 
-		$this->load->view('layout/header', $data);
+		$this->load->view('interface_assets/header', $data);
 		$this->load->view('backup/notes_view');
-		$this->load->view('layout/footer');
+		$this->load->view('interface_assets/footer');
 
 	}
 }
diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php
index 0852b6df..abdcaf84 100644
--- a/application/controllers/Eqsl.php
+++ b/application/controllers/Eqsl.php
@@ -85,9 +85,9 @@ class eqsl extends CI_Controller {
 		unlink($filepath);
 
 		$data['page_title'] = "eQSL Import Information";
-		$this->load->view('layout/header', $data);
+		$this->load->view('interface_assets/header', $data);
 		$this->load->view('eqsl/analysis');
-		$this->load->view('layout/footer');
+		$this->load->view('interface_assets/footer');
 	}
 
 	public function import() {	
@@ -224,9 +224,9 @@ class eqsl extends CI_Controller {
 			
 				$data['error'] = $this->upload->display_errors();
 
-				$this->load->view('layout/header', $data);
+				$this->load->view('interface_assets/header', $data);
 				$this->load->view('eqsl/import');
-				$this->load->view('layout/footer');
+				$this->load->view('interface_assets/footer');
 			}
 			else
 			{
@@ -517,9 +517,9 @@ class eqsl extends CI_Controller {
 			}
 		}
 		
-		$this->load->view('layout/header', $data);
+		$this->load->view('interface_assets/header', $data);
 		$this->load->view('eqsl/export');
-		$this->load->view('layout/footer');
+		$this->load->view('interface_assets/footer');
 	}
 	
 } // end class
diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php
index aa478446..780d1410 100644
--- a/application/controllers/Lotw.php
+++ b/application/controllers/Lotw.php
@@ -83,9 +83,9 @@ class Lotw extends CI_Controller {
 		unlink($filepath);
 
 		$data['page_title'] = "LoTW ADIF Information";
-		$this->load->view('layout/header', $data);
+		$this->load->view('interface_assets/header', $data);
 		$this->load->view('lotw/analysis');
-		$this->load->view('layout/footer');
+		$this->load->view('interface_assets/footer');
 	}
 
 	public function import() {
@@ -151,9 +151,9 @@ class Lotw extends CI_Controller {
 
 				$data['error'] = $this->upload->display_errors();
 
-				$this->load->view('layout/header', $data);
+				$this->load->view('interface_assets/header', $data);
 				$this->load->view('lotw/import');
-				$this->load->view('layout/footer');
+				$this->load->view('interface_assets/footer');
 			}
 			else
 			{
@@ -176,9 +176,9 @@ class Lotw extends CI_Controller {
 		{
 			$data['error'] = $this->upload->display_errors();
 
-			$this->load->view('layout/header', $data);
+			$this->load->view('interface_assets/header', $data);
 			$this->load->view('lotw/export');
-			$this->load->view('layout/footer');
+			$this->load->view('interface_assets/footer');
 		}
 		else
 		{
@@ -281,9 +281,9 @@ class Lotw extends CI_Controller {
 			unlink($cookie_file_path);
 			unlink('./uploads/'.$data['upload_data']['file_name']);
 
-			$this->load->view('layout/header', $data);
+			$this->load->view('interface_assets/header', $data);
 			$this->load->view('lotw/status');
-			$this->load->view('layout/footer');
+			$this->load->view('interface_assets/footer');
 		}
 	}
 
diff --git a/application/views/backup/adif_view.php b/application/views/backup/adif_view.php
index 67ce3c37..912b9bb9 100644
--- a/application/views/backup/adif_view.php
+++ b/application/views/backup/adif_view.php
@@ -1,4 +1,4 @@
-<div id="container">
+<div class="container">
 
 <h2>Backup - ADIF</h2>
 
diff --git a/application/views/backup/main.php b/application/views/backup/main.php
index 098f407e..f603563f 100644
--- a/application/views/backup/main.php
+++ b/application/views/backup/main.php
@@ -1,13 +1,26 @@
-<div id="container">
+<div class="container">
+<br>
+	<?php if($this->session->flashdata('message')) { ?>
+		<!-- Display Message -->
+		<div class="alert-message error">
+		  <p><?php echo $this->session->flashdata('message'); ?></p>
+		</div>
+	<?php } ?>
 
-<h2>Backup</h2>
+<div class="card">
+  <div class="card-header">
+    Backup
+  </div>
+  <div class="card-body">
+    <h5 class="card-title">You can export parts of Cloudlog like Notes</h5>
+    <p class="card-text">Backup options.</p>
+	<ul>
+		<li><a href="<?php echo site_url('backup/adif'); ?>">Backup ADIF</a></li>
+		<li><a href="<?php echo site_url('backup/notes'); ?>">Backup Notes</a></li>
+	</ul>
+  </div>
+</div>
 
 
-<p>Backup options.</p>
+</div>
 
-<ul>
-	<li><a href="<?php echo site_url('backup/adif'); ?>">Backup ADIF</a></li>
-	<li><a href="<?php echo site_url('backup/notes'); ?>">Backup Notes</a></li>
-</ul>
-
-</div>
\ No newline at end of file
diff --git a/application/views/backup/notes_view.php b/application/views/backup/notes_view.php
index 95486501..ba8d9248 100644
--- a/application/views/backup/notes_view.php
+++ b/application/views/backup/notes_view.php
@@ -1,5 +1,5 @@
 
-<div id="container">
+<div class="container">
 <h2>Backup - Notes XML</h2>
 
 
diff --git a/application/views/eqsl/analysis.php b/application/views/eqsl/analysis.php
index 808b8fd0..3fd6a98d 100644
--- a/application/views/eqsl/analysis.php
+++ b/application/views/eqsl/analysis.php
@@ -1,4 +1,4 @@
-<div id="container">
+<div class="container">
 <h2><?php echo $page_title; ?></h2>
 
 <?php $this->load->view('layout/messages'); ?>
diff --git a/application/views/eqsl/export.php b/application/views/eqsl/export.php
index 4d3c4ecc..1daa2089 100644
--- a/application/views/eqsl/export.php
+++ b/application/views/eqsl/export.php
@@ -1,4 +1,4 @@
-<div id="container">
+<div class="container">
 
 <h2><?php echo $page_title; ?></h2>
 <?php $this->load->view('layout/messages'); ?>
diff --git a/application/views/eqsl/import.php b/application/views/eqsl/import.php
index 3a13b9c8..0f74e807 100644
--- a/application/views/eqsl/import.php
+++ b/application/views/eqsl/import.php
@@ -1,4 +1,4 @@
-<div id="container">
+<div class="container">
 <h2><?php echo $page_title; ?></h2>
 <?php $this->load->view('layout/messages'); ?>
 
diff --git a/application/views/lotw/analysis.php b/application/views/lotw/analysis.php
index 984fc037..dcb3e82c 100644
--- a/application/views/lotw/analysis.php
+++ b/application/views/lotw/analysis.php
@@ -1,4 +1,4 @@
-<div id="container">
+<div class="container">
 <h2><?php echo $page_title; ?></h2>
 
 <?php echo $lotw_table_headers; ?>
diff --git a/application/views/lotw/export.php b/application/views/lotw/export.php
index ddb7e94f..18c138c0 100644
--- a/application/views/lotw/export.php
+++ b/application/views/lotw/export.php
@@ -1,4 +1,4 @@
-<div id="container">
+<div class="container">
 
 <h2><?php echo $page_title; ?></h2>
 <?php $this->load->view('layout/messages'); ?>
diff --git a/application/views/lotw/import.php b/application/views/lotw/import.php
index b0a9e445..86ba5771 100644
--- a/application/views/lotw/import.php
+++ b/application/views/lotw/import.php
@@ -1,4 +1,4 @@
-<div id="container">
+<div class="container">
 <h2><?php echo $page_title; ?></h2>
 <?php $this->load->view('layout/messages'); ?>
 
diff --git a/application/views/lotw/status.php b/application/views/lotw/status.php
index fb7fee8f..9e875614 100644
--- a/application/views/lotw/status.php
+++ b/application/views/lotw/status.php
@@ -1,4 +1,4 @@
-<div id="container">
+<div class="container">
 <h2><?php echo $page_title; ?></h2>
 
 <?php if($this->session->flashdata('warning')) { ?>
diff --git a/backup/notes.xml b/backup/notes.xml
new file mode 100644
index 00000000..0aaefed9
--- /dev/null
+++ b/backup/notes.xml
@@ -0,0 +1,2 @@
+<notes>
+</notes>
\ No newline at end of file