From da4dc1bf271b0a123a1a9edb473cd19f9e6f8933 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Sat, 25 May 2019 18:43:32 +0100 Subject: [PATCH] Fixed CSS/HTML for the qso information popup --- application/controllers/Logbook.php | 8 ++- application/views/interface_assets/footer.php | 22 ++++++- application/views/interface_assets/header.php | 3 +- .../views/interface_assets/mini_header.php | 23 +++++++ application/views/view_log/qso.php | 65 ++++--------------- 5 files changed, 63 insertions(+), 58 deletions(-) create mode 100644 application/views/interface_assets/mini_header.php diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index b2faa6cb..3182bb4e 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -189,7 +189,7 @@ class Logbook extends CI_Controller { echo "]"; echo "}"; } - + function view($id) { $this->load->model('user_model'); if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; } @@ -198,8 +198,10 @@ class Logbook extends CI_Controller { $this->db->where('COL_PRIMARY_KEY', $id); $data['query'] = $this->db->get($this->config->item('table_name')); - - $this->load->view('view_log/qso', $data); + + $this->load->view('interface_assets/mini_header', $data); + $this->load->view('view_log/qso'); + $this->load->view('interface_assets/footer'); } function partial($id) { diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 941bde61..d2b986e1 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -89,7 +89,7 @@ $(document).ready(function(){ -uri->segment(1) == "logbook") { ?> +uri->segment(1) == "logbook" && $this->uri->segment(2) != "view") { ?> + + uri->segment(1) == "update") { ?> - - - - num_rows() > 0) { foreach ($query->result() as $row) { ?> -

QSO with COL_CALL; ?> on the COL_TIME_ON); echo date('d/m/y', $timestamp); $timestamp = strtotime($row->COL_TIME_ON); echo " at ".date('H:i', $timestamp); ?>

+

QSO with COL_CALL; ?> on the COL_TIME_ON); echo date('d/m/y', $timestamp); $timestamp = strtotime($row->COL_TIME_ON); echo " at ".date('H:i', $timestamp); ?>

-
-
+ +
+
+ @@ -145,11 +121,11 @@ margin: 10px 0;

LoTW

This QSO is confirmed on Lotw

- - -
-
+
+
+ +
COL_GRIDSQUARE != null) { @@ -172,30 +148,13 @@ margin: 10px 0; } ?> - -
- - -
Date/Time