Merge branch 'master' of https://github.com/magicbug/Cloudlog

application/views/view_log/partial/log.php

@@ -42,8 +42,30 @@
 			<td><?php echo $row->COL_COUNTRY; ?></td>
 			<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
 			<td class="qsl">
-				<span class="qsl-<?php echo ($row->COL_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
-				<span class="qsl-<?php echo ($row->COL_QSL_RCVD=='Y')?'green':'red'?>">&#9660;</span>
+				<span class="qsl-<?php
+				switch ($row->COL_QSL_SENT) {
+					case "Y":
+						echo "green";
+						break;
+					case "R":
+						echo "yellow";
+						break;
+					default:
+					   echo "red";
+				}
+				?>">&#9650;</span>
+				<span class="qsl-<?php
+				switch ($row->COL_QSL_RCVD) {
+					case "Y":
+						echo "green";
+						break;
+					case "R":
+						echo "yellow";
+						break;
+					default:
+					   echo "red";
+				}
+				?>">&#9660;</span>
 			</td>
 			
 			<?php if ($this->session->userdata('user_eqsl_name') != ""){ ?>

assets/css/general.css

@@ -122,6 +122,10 @@ TD.eqsl{
     color: #F00;
     font-size: 1.1em;
 }
+.qsl-yellow{
+    color: #d39e00;
+    font-size: 1.1em;
+}
 TD.lotw{
     width: 33px;
 }
@@ -165,4 +169,4 @@ TD.lotw{
 
 #nav-bar-search-input:focus {
     text-transform: uppercase;
-}
+}