diff --git a/application/controllers/Timeline.php b/application/controllers/Timeline.php index 8bd28ed1..cb99c636 100644 --- a/application/controllers/Timeline.php +++ b/application/controllers/Timeline.php @@ -37,9 +37,9 @@ class Timeline extends CI_Controller { public function details() { $this->load->model('logbook_model'); - $adif = str_replace('"', "", $this->input->get("Adif")); + $adif = str_replace('"', "", $this->input->post("Adif")); $country = $this->logbook_model->get_entity($adif); - $band = str_replace('"', "", $this->input->get("Band")); + $band = str_replace('"', "", $this->input->post("Band")); $data['results'] = $this->logbook_model->timeline_qso_details($adif, $band); // Render Page @@ -50,9 +50,7 @@ class Timeline extends CI_Controller { $data['filter'] .= " and " . $band; } - $this->load->view('interface_assets/header', $data); - $this->load->view('timeline/details'); - $this->load->view('interface_assets/footer'); + $this->load->view('timeline/details', $data); } } \ No newline at end of file diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 5a5f248d..6f3ed7d3 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1720,6 +1720,36 @@ $(document).ready(function(){ }); } + uri->segment(1) == "timeline") { ?> + + + diff --git a/application/views/timeline/details.php b/application/views/timeline/details.php index 56394d9f..d5e85065 100644 --- a/application/views/timeline/details.php +++ b/application/views/timeline/details.php @@ -4,4 +4,4 @@

Filtering on

- load->view('view_log/partial/log') ?> + load->view('view_log/partial/log_ajax') ?> diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php index 2374cd03..2b8021c6 100644 --- a/application/views/timeline/index.php +++ b/application/views/timeline/index.php @@ -68,7 +68,7 @@ if (!empty($line->end)) echo 'Yes'; echo ' ' . $line->end . ' - adif . '"&Band="'. $bandselect . '"\'>Show + adif . '","'. $bandselect . '")>Show '; } echo '';