diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php
index 0b15fb58c..fae318064 100644
--- a/application/controllers/Radio.php
+++ b/application/controllers/Radio.php
@@ -11,9 +11,9 @@
// load the view
$data['page_title'] = "Radio Status";
- $this->load->view('layout/header', $data);
+ $this->load->view('interface_assets/header', $data);
$this->load->view('radio/index');
- $this->load->view('layout/footer');
+ $this->load->view('interface_assets/footer');
}
function status() {
diff --git a/application/controllers/Social.php b/application/controllers/Social.php
deleted file mode 100644
index 845b074ca..000000000
--- a/application/controllers/Social.php
+++ /dev/null
@@ -1,67 +0,0 @@
-load->model('logbook_model');
-
- $map_date = date('Y-m-d', strtotime($day));
- $formated_date = date('d-m-Y', strtotime($day));
-
- $data['qsos'] = $this->logbook_model->get_date_qsos($map_date);
-
- $data['date'] = $map_date;
- $data['formated_date'] = $formated_date;
-
- $this->load->view('layout/header');
- $this->load->view('social/map', $data);
- $this->load->view('layout/footer');
- }
-
- function json_map($date) {
- $this->load->model('logbook_model');
- $this->load->library('qra');
-
- $qsos = $this->logbook_model->map_day($date);
-
- echo "{\"markers\": [";
- $count = 1;
- foreach ($qsos->result() as $row) {
- //print_r($row);
- if($row->COL_GRIDSQUARE != null) {
- $stn_loc = qra2latlong($row->COL_GRIDSQUARE);
- if($count != 1) {
- echo ",";
- }
-
- echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
-
- $count++;
-
- } else {
- $query = $this->db->query('
- SELECT *
- FROM dxcc
- WHERE prefix = SUBSTRING( \''.$row->COL_CALL.'\', 1, LENGTH( prefix ) )
- ORDER BY LENGTH( prefix ) DESC
- LIMIT 1
- ');
-
- foreach ($query->result() as $dxcc) {
- if($count != 1) {
- echo ",";
- }
- echo "{\"lat\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
Band: ".$row->COL_BAND."
Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
- $count++;
- }
- }
-
- }
- echo "]";
- echo "}";
-
- }
-}
\ No newline at end of file
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index e24a8590d..d87eb1aa3 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -1,8 +1,8 @@
-
+
-
+
+
+
+uri->segment(1) == "radio") { ?>
+
+
+
+