From 3d354596cae2cc807eb3d5af9885e9e2942fd4e6 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 21 Sep 2011 23:29:38 +0100
Subject: [PATCH] Fixed error in Gridsquare to Lat/Lng

---
 application/views/layout/header.php    | 219 +++++++++++--------------
 application/views/qso/index.php        |   4 +-
 application/views/statistics/index.php |   2 +-
 application/views/view_log/qso.php     |   2 +-
 4 files changed, 102 insertions(+), 125 deletions(-)

diff --git a/application/views/layout/header.php b/application/views/layout/header.php
index 04d76623..f7ba4a1d 100644
--- a/application/views/layout/header.php
+++ b/application/views/layout/header.php
@@ -24,131 +24,108 @@
 	});
 </script>
 	<style type="text/css" media="screen" >
-body { background-color: #e6e6e6; font-size: 15px; font-family: Arial, "Trebuchet MS", sans-serif; }
-td { padding: 1px;}
-.tr1 td { background:none repeat scroll 0 0 #F0FFFF; }
-.partial td, .logbook td, .users td { padding: 5px; }
-#subnav { height: 30px; color:#ffffff; clear: both; }
-#submenu { height: 30px; color:#ffffff; clear: both; <?php
+		/* Base CSS */
+		body { background-color: #e6e6e6; font-size: 15px; font-family: Arial, "Trebuchet MS", sans-serif; }
+		td { padding: 1px;}
+		.tr1 td { background:none repeat scroll 0 0 #F0FFFF; }
+		.partial td, .logbook td, .users td { padding: 5px; }
+		#subnav { height: 30px; color:#ffffff; clear: both; }
+		#submenu { height: 30px; color:#ffffff; clear: both; <?php
+	
+		if($this->session->userdata('user_type') == 99) {
+			switch ($this->uri->segment(1)) {
+				case "user":
+					?> display: normal; <?php
+					break;
+				default:
+					?> display: none; <?php
+			}
+		} else {
+					?> display: none; visibility: hidden; <?php
+		}?> }
+		#nav { background-image: url('<?php echo base_url(); ?>/images/nav_bg.gif'); height: 39px; color:#ffffff; border-bottom: 1px solid #9bc9ed; }
+		.log_title { background-image: url('<?php echo base_url(); ?>/images/grey_bg.png'); background-repeat: repeat-x; color: #439bf6; }
+		.auth_title { background-image: url('<?php echo base_url(); ?>/images/grey_bg.png'); background-repeat: repeat-x; color: #439bf6; }
+		.small { font-size: 9px; }
+		.error { color: #a00; }
+		p { line-height: 1.7; margin: 0px 0; }
+		.wrap_content { margin: 0 auto; width: 780px; border: 1px solid #d7d7d7; background-color: #ffffff; padding-bottom: 5px; }
+		#footer { margin: 0 auto; width: 780px; text-align: center; padding-top: 5px; padding-bottom: 5px; font-size: 12px; }
+		#message { margin: 0 auto; width: 770px; border: 1px solid #fcefa1; background-color: #fbfaf3; padding: 5px; margin-top: 5px; margin-bottom: 5px; font-weight: bold; font-size: 12px; }
+		#message p { line-height: 1.7; margin: 0px 0; }
+		.clear { clear: both; }
+		h2 { margin: 0 auto; width: 780px; font-weight: bold; font-size: 23px; margin-top: 5px; margin-bottom: 10px; }
+		h3 { font-weight: bold; font-size: 16px; margin: 5px; margin-left: 0px; }
+		table .titles { font-weight: bold; }
+		#tabs { margin: 5px; }
+		a { text-decoration: none; color: #000; } 
+		a:hover { text-decoration: underline; }
+	
+		/* Nav List CSS */
+		ul#navlist { font: bold 15px "Trebuchet MS", sans-serif; list-style-type: none; margin: 0; margin-left: 10px; }
+		ul#navlist li.active { float: left; background-image: none; background-color: #fff; margin: 2px 2px 0 3px; height:34px; text-align:center; }
+		ul#navlist li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: none; text-align:center; }
+		#navlist .active a{ color: #ebebeb ; }
+		#navlist a { float: left; display: block; color: #ebebeb; text-decoration: none; padding-top: 7px; padding-left: 6px; padding-right: 5px; text-align:center; }
+		#navlist a:hover {  }
+	
+		/* Submenu List CSS */
+		ul#sublist { font: bold 15px "Trebuchet MS", sans-serif; list-style-type: none; margin: 0; margin-left: 10px; }
+		ul#sublist li.active { float: left; background-image: none; background-color: #fff; margin: 2px 2px 0 3px; height:34px; text-align:center; }
+		ul#sublist li { float: left; margin: 2px 2px 0 3px; height:20px; border-bottom: none; text-align:center; background-color: #fff; padding: 3px;}
+		#sublist .active a{ color: #ebebeb ; }
+		#sublist a { float: left; display: block; color: #000; text-decoration: none; padding-top: 0px; padding-left: 6px; padding-right: 5px; text-align:center; }
+		#sublist a:hover {  }
+	
+		/* User CSS */
+		ul#user { float: right; font: bold 15px "Trebuchet MS", sans-serif; list-style-type: none; margin: 0; margin-left: 10px; }
+		ul#user li.active { background-image: none; background-color: #fff; margin: 2px 2px 0 3px; height:34px; text-align:center; }
+		ul#user li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: none; text-align:center; }
+		#user .active a{ color: #ebebeb ; }
+		#user a { float: left; display: block; color: #ebebeb; text-decoration: none; padding-top: 7px; padding-left: 6px; padding-right: 5px; text-align:center; }
+		#user a:hover {  }
+		.user { padding: 5px; }
+	
+		/* QSO Logging CSS */
+		#callsign { text-transform: uppercase; }
+		.controls { margin: 5px; }
+		.title { padding-top: 5px; padding-bottom: 5px; color: #0073EA; font-weight: bold; }
+		#qso_input { border: 1px solid #dddddd; margin: 5px; padding: 2px; }
+		.input_date { width: 70px; }
+		.input_time { width: 54px; }
+		#locator { width: 55px; text-transform: uppercase; }
+		#country { border: none; }
+		#locator_info { font-size: 13px; }
+		#name { width: 145px; }
+		#comment { width: 89.5%; }
+	
+		/* Note CSS */
+		.note { padding: 5px; }
+		.auth { padding: 5px; }
+		#notes_add { padding: 5px; }
+		#search_box { padding: 5px; }
+		ul.notes_list {list-style-type: circle; padding-left: 20px; }
 
-if($this->session->userdata('user_type') == 99) {
-	switch ($this->uri->segment(1)) {
-		case "user":
-			?> display: normal; <?php
-			break;
-		default:
-			?> display: none; <?php
-	}
-} else {
-			?> display: none; visibility: hidden; <?php
-}?> }
-#nav { background-image: url('<?php echo base_url(); ?>/images/nav_bg.gif'); height: 39px; color:#ffffff; border-bottom: 1px solid #9bc9ed; }
-.log_title { background-image: url('<?php echo base_url(); ?>/images/grey_bg.png'); background-repeat: repeat-x; color: #439bf6; }
-.auth_title { background-image: url('<?php echo base_url(); ?>/images/grey_bg.png'); background-repeat: repeat-x; color: #439bf6; }
-.small { font-size: 9px; }
-.error { color: #a00; }
+		/* Contest CSS */
+		.contest_wrap { margin: 0 auto; width: 95%; }
+		.contest_wrap h2 { margin: 0; width: 100%; font-weight: bold; font-size: 23px; margin-top: 5px; margin-bottom: 10px; }
+		.contest_view { margin: 0 auto; width: 100%; border: 1px solid #d7d7d7; background-color: #ffffff; padding: 5px; }
+		.contest_sidebar { width: 30%; float: right; margin: 0 auto; }
+		.contest_qso_box { width: 695px; margin: 5px; padding: 5px; border: 1px solid #dddddd; border-radius: 10px; -moz-border-radius: 10px; -webkit-border-radius: 10px; }
+		.contest_qso_box table { width: 695px; }
 
-/* Nav List CSS */
-ul#navlist { font: bold 15px "Trebuchet MS", sans-serif; list-style-type: none; margin: 0; margin-left: 10px; }
-ul#navlist li.active { float: left; background-image: none; background-color: #fff; margin: 2px 2px 0 3px; height:34px; text-align:center; }
-ul#navlist li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: none; text-align:center; }
-#navlist .active a{ color: #ebebeb ; }
-#navlist a { float: left; display: block; color: #ebebeb; text-decoration: none; padding-top: 7px; padding-left: 6px; padding-right: 5px; text-align:center; }
-#navlist a:hover {  }
+		/* Dashboard CSS */
+		.dashboard { padding: 5px; }
+		.dashboard_top { margin-top: 5px; }
+		.dashboard_log { float: left; width: 440px; }
+		.dashboard_breakdown { float: right; width: 310px; }
+		.dashboard_bottom .chart { float: left; }
+		td.item { padding-bottom: 5px; }
 
-/* Submenu List CSS */
-ul#sublist { font: bold 15px "Trebuchet MS", sans-serif; list-style-type: none; margin: 0; margin-left: 10px; }
-ul#sublist li.active { float: left; background-image: none; background-color: #fff; margin: 2px 2px 0 3px; height:34px; text-align:center; }
-ul#sublist li { float: left; margin: 2px 2px 0 3px; height:20px; border-bottom: none; text-align:center; background-color: #fff; padding: 3px;}
-#sublist .active a{ color: #ebebeb ; }
-#sublist a { float: left; display: block; color: #000; text-decoration: none; padding-top: 0px; padding-left: 6px; padding-right: 5px; text-align:center; }
-#sublist a:hover {  }
+		/* Tabs CSS */
+		.ui-widget-content { border: none; }
+		.ui-widget-header { background: none; border: none; border-bottom: 1px solid #DDD; }
 
-ul#user { float: right; font: bold 15px "Trebuchet MS", sans-serif; list-style-type: none; margin: 0; margin-left: 10px; }
-ul#user li.active { background-image: none; background-color: #fff; margin: 2px 2px 0 3px; height:34px; text-align:center; }
-ul#user li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: none; text-align:center; }
-#user .active a{ color: #ebebeb ; }
-#user a { float: left; display: block; color: #ebebeb; text-decoration: none; padding-top: 7px; padding-left: 6px; padding-right: 5px; text-align:center; }
-#user a:hover {  }
-
-.user { padding: 5px; }
-
-
-.wrap_content { margin: 0 auto; width: 780px; border: 1px solid #d7d7d7; background-color: #ffffff; padding-bottom: 5px; }
-
-#footer { margin: 0 auto; width: 780px; text-align: center; padding-top: 5px; padding-bottom: 5px; font-size: 12px; }
-
-#message { margin: 0 auto; width: 770px; border: 1px solid #fcefa1; background-color: #fbfaf3; padding: 5px; margin-top: 5px; margin-bottom: 5px; font-weight: bold; font-size: 12px; }
-#message p { line-height: 1.7; margin: 0px 0; }
-.clear { clear: both; }
-h2 { margin: 0 auto; width: 780px; font-weight: bold; font-size: 23px; margin-top: 5px; margin-bottom: 10px; }
-h3 { font-weight: bold; font-size: 16px; margin: 5px; margin-left: 0px; }
-table .titles { font-weight: bold; }
-#tabs { margin: 5px; }
-
-/* QSO Logging CSS */
-#callsign { text-transform: uppercase; }
-.controls { margin: 5px; }
-.title { padding-top: 5px; padding-bottom: 5px; color: #0073EA; font-weight: bold; }
-#qso_input { border: 1px solid #dddddd; margin: 5px; padding: 2px; }
-.input_date { width: 70px; }
-.input_time { width: 54px; }
-#locator { width: 55px; text-transform: uppercase; }
-#country { border: none; }
-#locator_info { font-size: 13px; }
-#name { width: 145px; }
-#comment { width: 89.5%; }
-
-.note { padding: 5px; }
-.auth { padding: 5px; }
-#notes_add { padding: 5px; }
-#search_box { padding: 5px; }
-
-a { text-decoration: none; color: #000; } 
-a:hover { text-decoration: underline; }
-
-
-ul.notes_list {list-style-type: circle; padding-left: 20px; }
-
-p {
-line-height: 1.7;
-margin: 0px 0;
-}
-
-.contest_wrap { margin: 0 auto; width: 95%; }
-.contest_wrap h2 { margin: 0; width: 100%; font-weight: bold; font-size: 23px; margin-top: 5px; margin-bottom: 10px; }
-.contest_view { margin: 0 auto; width: 100%; border: 1px solid #d7d7d7; background-color: #ffffff; padding: 5px; }
-.contest_sidebar {
-	width: 30%;
-	float: right;
-	margin: 0 auto;
-}
-.contest_qso_box {
-width: 695px;
-margin: 5px;
-padding: 5px;
-border: 1px solid #dddddd;
-border-radius: 10px;
--moz-border-radius: 10px;
--webkit-border-radius: 10px;
-}
-
-.contest_qso_box table {
-	width: 695px;
-}
-
-td.item {
-	padding-bottom: 5px;
-}
-
-.dashboard {
-	padding: 5px;
-}
-
-.dashboard_top { margin-top: 5px; }
-.dashboard_log { float: left; width: 440px; }
-.dashboard_breakdown { float: right; width: 310px; }
-.dashboard_bottom .chart { float: left; }
 	</style>
 	
 	<script src="http://maps.google.com/maps?file=api&amp;v=3&amp;key=<?php echo $this->config->item('google_maps_api'); ?>&sensor=true"
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 71f3e4dc..1d3ffea9 100644
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -196,12 +196,12 @@ function settime () {
 			<div id="tabs-2">
 				<table>
 					<tr>
-						<td class="title">Sat Name</td>
+						<td>Sat Name</td>
 						<td><input type="text" name="sat_name" value="<?php echo $this->session->userdata('sat_name'); ?>" /></td>
 					</tr>
 	
 					<tr>
-						<td class="title">Sat Mode</td>
+						<td>Sat Mode</td>
 						<td><input type="text" name="sat_mode" value="<?php echo $this->session->userdata('sat_mode'); ?>" /></td>
 					</tr>
 				</table>
diff --git a/application/views/statistics/index.php b/application/views/statistics/index.php
index f4b08597..102d850f 100644
--- a/application/views/statistics/index.php
+++ b/application/views/statistics/index.php
@@ -78,7 +78,7 @@
 
 <h2><?php echo $page_title; ?></h2>
 
-<div class="wrap_content note">
+<div class="wrap_content note stats">
 
 <p>Statistics built using information from the logbook.</p>
 
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 32175c24..6a53a0b9 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -152,7 +152,7 @@ margin: 10px 0;
 <?php
 
 	if($row->COL_GRIDSQUARE != null) {
-				$stn_loc = qra2latlong($row->COL_GRIDSQUARE);
+				$stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE);
 				
 				$lat = $stn_loc[0];
 				$lng = $stn_loc[1];