diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index 3c99ad7c..61e06e58 100755
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -556,7 +556,7 @@ class Logbook extends CI_Controller {
if ($query->num_rows() > 0)
{
$data['results'] = $query;
- $this->load->view('view_log/partial/log.php', $data);
+ $this->load->view('view_log/partial/log_ajax.php', $data);
} else {
$this->load->model('search');
@@ -565,7 +565,7 @@ class Logbook extends CI_Controller {
if ($iota_search->num_rows() > 0)
{
$data['results'] = $iota_search;
- $this->load->view('view_log/partial/log.php', $data);
+ $this->load->view('view_log/partial/log_ajax.php', $data);
} else {
if ($this->config->item('callbook') == "qrz" && $this->config->item('qrz_username') != null && $this->config->item('qrz_password') != null) {
// Lookup using QRZ
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/dashboard/index.php b/application/views/dashboard/index.php
index 2cb62260..826bf343 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -71,9 +71,7 @@
|
- COL_PRIMARY_KEY; ?>" href="javascript:;">
- COL_CALL)); ?>
-
+ COL_CALL)); ?>
|
COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?> |
COL_RST_SENT; ?> COL_STX_STRING) { ?>COL_STX_STRING;?> |
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 30845cd6..52452357 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -90,8 +90,7 @@ $(".search-results-box").hide();
} else {
band = item.COL_BAND;
}
-
- var callsign = '' + item.COL_CALL + '';
+ var callsign = '' + item.COL_CALL + '';
if (item.COL_SUBMODE == '' || item.COL_SUBMODE == null) {
$('#results').append('| ' + item.COL_TIME_ON + ' | ' + callsign + ' | ' + item.COL_MODE + ' | ' + item.COL_RST_SENT + ' | ' + item.COL_RST_RCVD + ' | ' + band + ' | ' + item.COL_COUNTRY + ' | |
');
}
@@ -1433,7 +1432,7 @@ $(document).ready(function(){
var lat = $("#lat").text();
var long = $("#long").text();
var callsign = $("#callsign").text();
- var mymap = L.map('map').setView([lat,long], 5);
+ var mymap = L.map('mapqso').setView([lat,long], 5);
L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
maxZoom: 18,
@@ -1761,6 +1760,36 @@ $(document).ready(function(){
});
}
+ uri->segment(1) == "timeline") { ?>
+
+
+