diff --git a/application/controllers/Statistics.php b/application/controllers/Statistics.php index 48cb2089..b91638ec 100644 --- a/application/controllers/Statistics.php +++ b/application/controllers/Statistics.php @@ -39,11 +39,15 @@ class Statistics extends CI_Controller { $data['totals_year'] = $this->logbook_model->totals_year(); - $data['page_title'] = "Statistics"; + // Render User Interface - $this->load->view('layout/header', $data); + // Set Page Title + $data['page_title'] = "Statistics"; + + // Load Views + $this->load->view('interface_assets/header', $data); $this->load->view('statistics/index'); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } function custom() { @@ -72,9 +76,9 @@ class Statistics extends CI_Controller { if ($this->form_validation->run() == FALSE) { - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('statistics/custom', $data); - $this->load->view('layout/footer'); + $this->load->view('interface_assets/footer'); } else { @@ -83,10 +87,9 @@ class Statistics extends CI_Controller { $data['result'] = $this->stats->result(); - $this->load->view('layout/header', $data); + $this->load->view('interface_assets/header', $data); $this->load->view('statistics/custom_result'); - $this->load->view('layout/footer'); - + $this->load->view('interface_assets/footer'); } } diff --git a/application/views/statistics/custom.php b/application/views/statistics/custom.php index 9ea33139..39c28c65 100644 --- a/application/views/statistics/custom.php +++ b/application/views/statistics/custom.php @@ -5,15 +5,24 @@ }); -
This is a work in-progress
diff --git a/application/views/statistics/custom_result.php b/application/views/statistics/custom_result.php index 3673f581..e318a7f7 100644 --- a/application/views/statistics/custom_result.php +++ b/application/views/statistics/custom_result.php @@ -5,15 +5,13 @@ }); -This is a work in-progress
diff --git a/application/views/statistics/index.php b/application/views/statistics/index.php index 0181c1fb..edb14a06 100644 --- a/application/views/statistics/index.php +++ b/application/views/statistics/index.php @@ -95,20 +95,42 @@ } -