diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php index 4907a592..98db45f9 100644 --- a/application/controllers/Adif.php +++ b/application/controllers/Adif.php @@ -19,9 +19,9 @@ class adif extends CI_Controller { $data['page_title'] = "ADIF Export"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('adif/main'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } // Export all QSO Data in ASC Order of Date. diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index daf2e2cf..438eb2e6 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -172,10 +172,7 @@ class eqsl extends CI_Controller { if (stristr($input, "You have no log entries")) { $this->session->set_flashdata('success', 'There are no QSLs waiting for download at eQSL.cc.'); redirect('eqsl/import'); - /*$data['page_title'] = "eQSL Up to Date"; - $this->load->view('layout/header', $data); - $this->load->view('eqsl/import'); - $this->load->view('layout/footer');*/ + } else { diff --git a/application/controllers/Export.php b/application/controllers/Export.php index e1dabc94..9d2c4bf4 100644 --- a/application/controllers/Export.php +++ b/application/controllers/Export.php @@ -10,9 +10,9 @@ class Export extends CI_Controller { $data['page_title'] = "Data Export"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('export/index'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } } diff --git a/application/controllers/Setup.php b/application/controllers/Setup.php deleted file mode 100644 index 7da7e2b8..00000000 --- a/application/controllers/Setup.php +++ /dev/null @@ -1,15 +0,0 @@ -load->model('user_model'); - if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - - $this->load->view('layout/header'); - $this->load->view('setup/index'); - $this->load->view('layout/footer'); - } -} \ No newline at end of file diff --git a/application/controllers/User.php b/application/controllers/User.php index 97807714..cc1560b0 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -2,7 +2,7 @@ class User extends CI_Controller { - /* Displays all notes in a list */ + public function index() { $this->load->model('user_model'); @@ -346,9 +346,10 @@ class User extends CI_Controller { if ($this->form_validation->run() == FALSE) { $data['page_title'] = "Login"; - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('user/login'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); + } else { diff --git a/application/views/layout/footer.php b/application/views/layout/footer.php deleted file mode 100644 index 9720a3d4..00000000 --- a/application/views/layout/footer.php +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/application/views/layout/header.php b/application/views/layout/header.php deleted file mode 100644 index 35c325ae..00000000 --- a/application/views/layout/header.php +++ /dev/null @@ -1,128 +0,0 @@ - - - - <?php echo $page_title; ?> - Cloudlog - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- Cloudlog - - - - - -
- - config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> - -
-
- - -
- - - - -
- -
-
- -
- -
- -
diff --git a/application/views/layout/mini_footer.php b/application/views/layout/mini_footer.php deleted file mode 100644 index 691287b6..00000000 --- a/application/views/layout/mini_footer.php +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/application/views/layout/mini_header.php b/application/views/layout/mini_header.php deleted file mode 100644 index 86859aae..00000000 --- a/application/views/layout/mini_header.php +++ /dev/null @@ -1,18 +0,0 @@ - - - - Web Logbook - - - - - - - - - - - - - diff --git a/application/views/setup/index.php b/application/views/setup/index.php deleted file mode 100644 index 83626bbc..00000000 --- a/application/views/setup/index.php +++ /dev/null @@ -1,6 +0,0 @@ -
-

Setup

- -

Options coming soon.

- -
\ No newline at end of file