diff --git a/README b/README index b9887b38..0991579d 100644 --- a/README +++ b/README @@ -1,3 +1,7 @@ -HRD Web Frontend +=HRD Web Frontend (Cloudlog) -Website front end to support Ham Radio Deluxe Logbooks MySQL backend Table to allow logging from any location. \ No newline at end of file +Website front end to support Ham Radio Deluxe Logbooks MySQL backend Table to allow logging from any location. + +==Copyright + +Copyright (c) 2011 Peter goodhall. See LICENSE.txt for further details. \ No newline at end of file diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index 35702640..1c8cdbff 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -18,6 +18,12 @@ class Logbook_model extends CI_Model { } else { $prop_mode = ""; } + + if($this->session->userdata('user_locator')){ + $locator = $this->session->userdata('user_locator'); + } else { + $locator = $this->config->item('locator'); + } // Create array with QSO Data @@ -45,6 +51,8 @@ class Logbook_model extends CI_Model { 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'), 'COL_OPERATOR' => $this->session->userdata('user_callsign'), 'COL_PROP_MODE' => $prop_mode, + 'COL_IOTA' => $this->input->post('iota_ref'), + 'COL_MY_GRIDSQUARE' => $locator, ); // Add QSO to database @@ -74,6 +82,7 @@ class Logbook_model extends CI_Model { 'COL_QSL_RCVD' => $this->input->post('qsl_recv'), 'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'), 'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'), + 'COL_IOTA' => $this->input->post('iota_ref'), ); $this->db->where('COL_PRIMARY_KEY', $this->input->post('id')); diff --git a/application/models/user_model.php b/application/models/user_model.php index 339f430c..c782fa62 100644 --- a/application/models/user_model.php +++ b/application/models/user_model.php @@ -204,6 +204,7 @@ class User_Model extends CI_Model { 'user_name' => $u->row()->user_name, 'user_type' => $u->row()->user_type, 'user_callsign' => $u->row()->user_callsign, + 'user_locator' => $u->row()->user_locator, 'user_hash' => $this->_hash($u->row()->user_id."-".$u->row()->user_type) ); diff --git a/application/views/layout/header.php b/application/views/layout/header.php index 2a0c4669..795dba0f 100644 --- a/application/views/layout/header.php +++ b/application/views/layout/header.php @@ -127,6 +127,19 @@ .ui-widget-content { border: none; } .ui-widget-header { background: none; border: none; border-bottom: 1px solid #DDD; } + .pager { + margin-top: 5px; + margin-bottom: 5px; + font-size: 12px; + } + .pager a, strong { + border: 1px solid #D7D7D7; + padding: 5px; + } + .pager a:hover { + background-color: azure; + } +