From 499d1804d239e2cacd1f73bc57dac06eca8dbec3 Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Mon, 19 Oct 2020 19:24:11 +0200
Subject: [PATCH] Awards cleanup. Several details_ajax.php removed, and
 directed awards to use awards/details.php instead.

---
 application/controllers/Awards.php                 | 14 ++++++--------
 application/views/awards/cq/details_ajax.php       |  3 ---
 .../awards/{dok/details_ajax.php => details.php}   |  0
 application/views/awards/dxcc/details_ajax.php     |  3 ---
 application/views/awards/iota/details_ajax.php     |  3 ---
 application/views/awards/vucc/details_ajax.php     |  3 ---
 application/views/awards/was/details_ajax.php      |  3 ---
 7 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 application/views/awards/cq/details_ajax.php
 rename application/views/awards/{dok/details_ajax.php => details.php} (100%)
 delete mode 100644 application/views/awards/dxcc/details_ajax.php
 delete mode 100644 application/views/awards/iota/details_ajax.php
 delete mode 100644 application/views/awards/vucc/details_ajax.php
 delete mode 100644 application/views/awards/was/details_ajax.php

diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php
index 1fb865c5..6b5364fc 100644
--- a/application/controllers/Awards.php
+++ b/application/controllers/Awards.php
@@ -70,9 +70,7 @@ class Awards extends CI_Controller {
         // Render Page
         $data['page_title'] = "Log View - DOK";
         $data['filter'] = str_replace("&#40;and&#41;", ", ", $q);//implode(", ", array_keys($a));
-        //$this->load->view('interface_assets/header', $data);
-        $this->load->view('awards/dok/details_ajax', $data);
-        //$this->load->view('interface_assets/footer');
+        $this->load->view('awards/details', $data);
     }
 	
 	public function dxcc ()	{
@@ -147,7 +145,7 @@ class Awards extends CI_Controller {
         // Render Page
         $data['page_title'] = "Log View - DXCC";
         $data['filter'] = "country ".$country. " and ".$band;
-        $this->load->view('awards/dxcc/details_ajax', $data);
+        $this->load->view('awards/details', $data);
     }
 
     public function vucc()	{
@@ -187,7 +185,7 @@ class Awards extends CI_Controller {
         // Render Page
         $data['page_title'] = "Log View - VUCC";
         $data['filter'] = "vucc " . $gridsquare . " and band ".$band;
-        $this->load->view('awards/vucc/details_ajax', $data);
+        $this->load->view('awards/details', $data);
     }
 
 	/*
@@ -302,7 +300,7 @@ class Awards extends CI_Controller {
         // Render Page
         $data['page_title'] = "Log View - DXCC";
         $data['filter'] = "CQZone ".$cqzone. " and ".$band;;
-        $this->load->view('awards/cq/details_ajax', $data);
+        $this->load->view('awards/details', $data);
     }
 
     public function was() {
@@ -360,7 +358,7 @@ class Awards extends CI_Controller {
         // Render Page
         $data['page_title'] = "Log View - WAS";
         $data['filter'] = "state ".$state. " and ".$band;
-        $this->load->view('awards/was/details_ajax', $data);
+        $this->load->view('awards/details', $data);
     }
 
     public function iota ()	{
@@ -431,6 +429,6 @@ class Awards extends CI_Controller {
         // Render Page
         $data['page_title'] = "Log View - IOTA";
         $data['filter'] = "iota ".$iota. " and ".$band;
-        $this->load->view('awards/iota/details_ajax', $data);
+        $this->load->view('awards/details', $data);
     }
 }
diff --git a/application/views/awards/cq/details_ajax.php b/application/views/awards/cq/details_ajax.php
deleted file mode 100644
index e1c2be62..00000000
--- a/application/views/awards/cq/details_ajax.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h5>Filtering on <?php echo $filter ?></h5>
-
-<?php $this->load->view('view_log/partial/log_ajax') ?>
diff --git a/application/views/awards/dok/details_ajax.php b/application/views/awards/details.php
similarity index 100%
rename from application/views/awards/dok/details_ajax.php
rename to application/views/awards/details.php
diff --git a/application/views/awards/dxcc/details_ajax.php b/application/views/awards/dxcc/details_ajax.php
deleted file mode 100644
index 59ba1c0e..00000000
--- a/application/views/awards/dxcc/details_ajax.php
+++ /dev/null
@@ -1,3 +0,0 @@
-    <h5>Filtering on <?php echo $filter ?></h5>
-
-    <?php $this->load->view('view_log/partial/log_ajax') ?>
diff --git a/application/views/awards/iota/details_ajax.php b/application/views/awards/iota/details_ajax.php
deleted file mode 100644
index 13783720..00000000
--- a/application/views/awards/iota/details_ajax.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h5>Filtering on <?php echo $filter ?></h5>
-
-<?php $this->load->view('view_log/partial/log_ajax') ?>
\ No newline at end of file
diff --git a/application/views/awards/vucc/details_ajax.php b/application/views/awards/vucc/details_ajax.php
deleted file mode 100644
index e1c2be62..00000000
--- a/application/views/awards/vucc/details_ajax.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h5>Filtering on <?php echo $filter ?></h5>
-
-<?php $this->load->view('view_log/partial/log_ajax') ?>
diff --git a/application/views/awards/was/details_ajax.php b/application/views/awards/was/details_ajax.php
deleted file mode 100644
index 59ba1c0e..00000000
--- a/application/views/awards/was/details_ajax.php
+++ /dev/null
@@ -1,3 +0,0 @@
-    <h5>Filtering on <?php echo $filter ?></h5>
-
-    <?php $this->load->view('view_log/partial/log_ajax') ?>