From 0c8c14ed8c22887f682cef4ee7a4681ec93a0b25 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Sun, 10 Feb 2019 22:47:57 +0000 Subject: [PATCH] Bootstrap Updates --- application/controllers/Awards.php | 28 +++++++------- application/controllers/Qsl.php | 18 --------- application/views/awards/index.php | 2 +- application/views/dxcluster/custom.php | 53 -------------------------- application/views/dxcluster/main.php | 53 -------------------------- application/views/qsl/main.php | 6 --- 6 files changed, 15 insertions(+), 145 deletions(-) delete mode 100644 application/controllers/Qsl.php delete mode 100644 application/views/dxcluster/custom.php delete mode 100644 application/views/dxcluster/main.php delete mode 100644 application/views/qsl/main.php diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index 3ae33a37d..47eb32783 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -12,9 +12,9 @@ class Awards extends CI_Controller { { // Render Page $data['page_title'] = "Awards"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('awards/index'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } public function dxcc () @@ -25,9 +25,9 @@ class Awards extends CI_Controller { // Render Page $data['page_title'] = "Awards - DXCC"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('awards/dxcc/index'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } @@ -61,9 +61,9 @@ class Awards extends CI_Controller { // Render Page $data['page_title'] = "Log View - DXCC"; $data['filter'] = str_replace("(and)", ", ", $q);//implode(", ", array_keys($a)); - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('awards/dxcc/details'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } /* @@ -78,9 +78,9 @@ class Awards extends CI_Controller { // Render Page $data['page_title'] = "Awards - WAB"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('awards/wab/index'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } /* @@ -95,9 +95,9 @@ class Awards extends CI_Controller { // Render page $data['page_title'] = "Awards - SOTA"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('awards/sota/index'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } /* @@ -112,9 +112,9 @@ class Awards extends CI_Controller { // Render page $data['page_title'] = "Awards - WACRAL Members"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('awards/wacral/index'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } public function cq(){ @@ -127,8 +127,8 @@ class Awards extends CI_Controller { // Render page $data['page_title'] = "Awards - CQ Magazine"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('awards/cq/index'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } } diff --git a/application/controllers/Qsl.php b/application/controllers/Qsl.php deleted file mode 100644 index 67e28221e..000000000 --- a/application/controllers/Qsl.php +++ /dev/null @@ -1,18 +0,0 @@ -load->view('layout/header'); - $this->load->view('qsl/main'); - $this->load->view('layout/footer'); - } -} \ No newline at end of file diff --git a/application/views/awards/index.php b/application/views/awards/index.php index 71b98e51b..2b0e21ae5 100644 --- a/application/views/awards/index.php +++ b/application/views/awards/index.php @@ -1,4 +1,4 @@ -
+

    diff --git a/application/views/dxcluster/custom.php b/application/views/dxcluster/custom.php deleted file mode 100644 index a321b2e3d..000000000 --- a/application/views/dxcluster/custom.php +++ /dev/null @@ -1,53 +0,0 @@ -
    - -

    DX Cluster - m

    - -
    -
    - -
    - - - - - - - - - -
    DateCallsignFreqDX CallsignComment
    -
    -
    -
    - All Spots - 160m - 80m - 40m - 30m - 20m - 17m - 15m - 12m - 10m - 6m
    - 4m
    - 2m - 70cm - 23cm -
    -
    - -
    \ No newline at end of file diff --git a/application/views/dxcluster/main.php b/application/views/dxcluster/main.php deleted file mode 100644 index 50153f87e..000000000 --- a/application/views/dxcluster/main.php +++ /dev/null @@ -1,53 +0,0 @@ -
    - -

    DX Cluster

    - -
    -
    - -
    - - - - - - - - - -
    DateCallsignFreqDX CallsignComment
    -
    -
    -
    - All Spots - 160m - 80m - 40m - 30m - 20m - 17m - 15m - 12m - 10m - 6m
    - 4m
    - 2m - 70cm - 23cm -
    -
    - -
    \ No newline at end of file diff --git a/application/views/qsl/main.php b/application/views/qsl/main.php deleted file mode 100644 index 60d3ccd0b..000000000 --- a/application/views/qsl/main.php +++ /dev/null @@ -1,6 +0,0 @@ -

    QSLing

    -
    - -

    QSLing functions.

    - -
    \ No newline at end of file