Logbook interface updated

magicbug · May 14, 2019 · e2ff5d7 · e2ff5d7
1 parent 1ce6fdb
commit e2ff5d7
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 90 deletions.
diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
@@ -2,13 +2,6 @@
 
 class Dashboard extends CI_Controller {
 
-	/*
-		TODO
-			- DXCLuster Spots
-			- Breakdown of QSOs per band/mode
-			- Countries worked
-	*/
-
 	public function index()
 	{
 		// Check our version and run any migrations

diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
@@ -47,9 +47,9 @@ function index()
 		// load the view
 		$data['page_title'] = "Logbook";
 
-		$this->load->view('layout/header', $data);
+		$this->load->view('interface_assets/header', $data);
 		$this->load->view('view_log/index');
-		$this->load->view('layout/footer');
+		$this->load->view('interface_assets/footer');
 
 	}
 

diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
@@ -87,5 +87,25 @@
 </script>
 <?php } ?>
 
+<?php if ($this->uri->segment(1) == "logbook") { ?>
+    <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('logbook/qso_map/25/'.$this->uri->segment(3)); ?>';
+        var q_zoom = 2;
+
+        initmap();
+
+    </script>
+<?php } ?>
+
   </body>
 </html>
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php
@@ -1,55 +1,6 @@
-	<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" />
+<div class="container logbook">
-
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$(".qsobox").fancybox({
-				'autoDimensions'	: false,
-				'width'         	: 700,
-				'height'        	: 300,
-				'transitionIn'		: 'fade',
-				'transitionOut'		: 'fade',
-				'type'				: 'iframe'
-			});
-
-			$(".editbox").fancybox({
-				'autoDimensions'	: false,
-				'width'         	: 600,
-				'height'        	: 550,
-				'transitionIn'		: 'fade',
-				'transitionOut'		: 'fade',
-				'type'				: 'iframe',
-				onCleanup   : function() {
-                return window.location.reload();
-            	}
-			});
-
-		});
-	</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('logbook/qso_map/25/'.$this->uri->segment(3)); ?>';
-		var q_zoom = 2;
-
-	  $(document).ready(function(){
-			initmap();
-	  });
-	</script>
-
-<div id="container">
 
 	<h2>Logbook</h2>
 

diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
@@ -89,39 +89,32 @@
 	</table>
 
     <?php if (isset($this->pagination)){ ?>
-	<div class="pagination">
+    	<?php
+$config['full_tag_open'] = '<ul class="pagination">';
+$config['full_tag_close'] = '</ul>';
+$config['attributes'] = ['class' => 'page-link'];
+$config['first_link'] = false;
+$config['last_link'] = false;
+$config['first_tag_open'] = '<li class="page-item">';
+$config['first_tag_close'] = '</li>';
+$config['prev_link'] = '&laquo';
+$config['prev_tag_open'] = '<li class="page-item">';
+$config['prev_tag_close'] = '</li>';
+$config['next_link'] = '&raquo';
+$config['next_tag_open'] = '<li class="page-item">';
+$config['next_tag_close'] = '</li>';
+$config['last_tag_open'] = '<li class="page-item">';
+$config['last_tag_close'] = '</li>';
+$config['cur_tag_open'] = '<li class="page-item active"><a href="#" class="page-link">';
+$config['cur_tag_close'] = '<span class="sr-only">(current)</span></a></li>';
+$config['num_tag_open'] = '<li class="page-item">';
+$config['num_tag_close'] = '</li>';
+    	$this->pagination->initialize($config);
+    	?>
+
 		<?php echo $this->pagination->create_links(); ?>
-	</div>
+
 	<?php } ?>
 
 </div>
 </div>
-
-<style>
-TD.qsl{
-    width: 20px;
-}
-TD.eqsl{
-    width: 33px;
-}
-.eqsl-green{
-    color: #00A000;
-    font-size: 1.1em;
-}
-.eqsl-red{
-    color: #F00;
-    font-size: 1.1em;
-}
-TD.lotw{
-    width: 33px;
-}
-.lotw-green{
-    color: #00A000;
-    font-size: 1.1em;
-}
-.lotw-red{
-    color: #F00;
-    font-size: 1.1em;
-}
-
-</style>
diff --git a/assets/css/general.css b/assets/css/general.css
@@ -28,4 +28,34 @@
 
 .search {
 	padding-top: 15px;
+}
+
+.logbook {
+	padding-top: 15px;
+}
+
+TD.qsl{
+    width: 20px;
+}
+TD.eqsl{
+    width: 33px;
+}
+.eqsl-green{
+    color: #00A000;
+    font-size: 1.1em;
+}
+.eqsl-red{
+    color: #F00;
+    font-size: 1.1em;
+}
+TD.lotw{
+    width: 33px;
+}
+.lotw-green{
+    color: #00A000;
+    font-size: 1.1em;
+}
+.lotw-red{
+    color: #F00;
+    font-size: 1.1em;
 }