From 1f0a04f05ff440b98920c3862335ac3ab038daa7 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Sun, 20 May 2012 15:24:27 +0100
Subject: [PATCH] Added Icons to the dashboard page

---
 application/views/dashboard/index.php |   4 +--
 application/views/layout/header.php   |   1 -
 application/views/notes/add.php       |  44 +++++++++++++-------------
 application/views/qso/index.php       |   2 ++
 css/api.xsl                           |   4 +--
 css/global.css                        |   3 +-
 css/main.css                          |  10 ++----
 images/icons/qslcard.png              | Bin 0 -> 321 bytes
 images/icons/stats.png                | Bin 0 -> 389 bytes
 9 files changed, 31 insertions(+), 37 deletions(-)
 create mode 100644 images/icons/qslcard.png
 create mode 100644 images/icons/stats.png

diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 44a05f19..9ff60e11 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -110,7 +110,7 @@
   <div class="span5">
     	<table width="100%" class="zebra-striped">
 			<tr class="titles">
-				<td colspan="2">QSOs</td>
+				<td colspan="2"><span class="icon_stats">QSOs</span></td>
 			</tr>
 			
 			<tr>
@@ -153,7 +153,7 @@
 			</tr>
 					
 			<tr class="titles">
-				<td colspan="2">QSL Cards</td>
+				<td colspan="2"><span class="icon_qsl">QSL Cards</span></td>
 			</tr>
 			
 			<tr>
diff --git a/application/views/layout/header.php b/application/views/layout/header.php
index e4eaaad7..156a206d 100644
--- a/application/views/layout/header.php
+++ b/application/views/layout/header.php
@@ -9,7 +9,6 @@
 	<script type="text/javascript" src="<?php echo base_url(); ?>js/jquery-ui-1.8.12.custom.min.js"></script>
 	
 	<script type="text/javascript" src="<?php echo base_url(); ?>js/bootstrap-dropdown.js"></script>
-	<script type="text/javascript" src="<?php echo base_url(); ?>js/bootstrap-tabs.js"></script>
 
 	<script type="text/javascript" src="<?php echo base_url(); ?>js/global.js"></script>
 	<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?sensor=true"></script>
diff --git a/application/views/notes/add.php b/application/views/notes/add.php
index 80749c66..8c26e769 100644
--- a/application/views/notes/add.php
+++ b/application/views/notes/add.php
@@ -7,29 +7,29 @@
 	  <div class="span13">
 	  
 		<?php echo validation_errors(); ?>
-<form method="post" action="<?php echo site_url('notes/add'); ?>" name="notes_add" id="notes_add">
-<table>
-	<tr>
-		<td><label for="title">Title</label></td>
-		<td><input type="text" name="title" value="" /></td>
-	</tr>
-	
-	<tr>
-		<td><label for="category">Category</label></td>
-		<td><select name="category">
-			<option value="General" selected="selected">General</option>
-			<option value="Antennas">Antennas</option>
-			<option value="Satellites">Satellites</option>
-		</select></td>
-	</tr>
-	
-	<tr>
-		<td></td>
-		<td><textarea name="content" id="markItUp" rows="10" cols="10"></textarea></td>
-	</tr>
-</table>
+		<form method="post" action="<?php echo site_url('notes/add'); ?>" name="notes_add" id="notes_add">
+		<table>
+			<tr>
+				<td><label for="title">Title</label></td>
+				<td><input type="text" name="title" value="" /></td>
+			</tr>
+			
+			<tr>
+				<td><label for="category">Category</label></td>
+				<td><select name="category">
+					<option value="General" selected="selected">General</option>
+					<option value="Antennas">Antennas</option>
+					<option value="Satellites">Satellites</option>
+				</select></td>
+			</tr>
+			
+			<tr>
+				<td></td>
+				<td><textarea name="content" id="markItUp" rows="10" cols="10"></textarea></td>
+			</tr>
+		</table>
 
-<div class="actions"><input class="btn primary" type="submit" value="Submit" /></div>
+		<div class="actions"><input class="btn primary" type="submit" value="Submit" /></div>
 
 
 
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 33baee03..df9a7c86 100644
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -48,7 +48,9 @@
 
 	<div class="row show-grid">
 	  <div class="span6">
+	 
 	  	<h2>Add QSO</h2>
+		
 		<form id="qso_input" method="post" action="<?php echo site_url('qso'); ?>" name="qsos">
 
 		<table style="margin-bottom: 0px;">
diff --git a/css/api.xsl b/css/api.xsl
index 424ecaaf..f81aa8b2 100644
--- a/css/api.xsl
+++ b/css/api.xsl
@@ -11,11 +11,11 @@
   <h1>Output of '<xsl:value-of select="//queryInfo/@calledMethod"/>'</h1>
   <table id="results">
         <tr>
-        <xsl:for-each select="//results/result[1]/@*">
+        <xsl:for-each select="//elements/element[1]/@*">
           <th><b><xsl:value-of select="name()"/></b></th>
         </xsl:for-each>
         </tr>
-        <xsl:for-each select="//results/result">
+        <xsl:for-each select="//elements/element">
 		  <tr class="row{position() mod 2}">
           <xsl:for-each select="@*">
             <td><xsl:value-of select="."/></td>
diff --git a/css/global.css b/css/global.css
index 758724e2..ece97d24 100644
--- a/css/global.css
+++ b/css/global.css
@@ -71,7 +71,7 @@ td.item { padding-bottom: 5px; }
 .input_date { width: 70px; }
 .input_time { width: 54px; }
 #locator { width: 55px; text-transform: uppercase; }
-#country { border: none; width: 150px !important; }
+#country { border: none; }
 #locator_info { font-size: 13px; }
 #name { width: 208px; }
 #comment { width: 63.7%; }
@@ -96,7 +96,6 @@ ul#user li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: non
 #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; }
-.profile { padding: 5px; }
 
 /* Pager */
 .pager { margin-top: 5px; margin-bottom: 5px; font-size: 12px; }
diff --git a/css/main.css b/css/main.css
index 507743fc..97be68c3 100644
--- a/css/main.css
+++ b/css/main.css
@@ -15,7 +15,6 @@ table .title { font-weight: bold; color: #439BF6; }
 .band { width: 80px; }
 .mode { width: 80px; }
 #callsign { text-transform: uppercase; }
-#country { border: none; width: 140px !important; }
 
 input[type="text"] {
 	color: #000000 !important;
@@ -23,11 +22,6 @@ input[type="text"] {
 
 .pull-right { color: #fff; }
 
-/* Stats CSS */
-.type {
-	float: left;
-	width: 30%;
-	margin: 10px;
-}
+.icon_qsl { background: transparent url('../images/icons/qslcard.png') no-repeat center left; padding-left: 20px; font-weight: bold; }
 
-.clear {clear:both;}
\ No newline at end of file
+.icon_stats { background: transparent url('../images/icons/stats.png') no-repeat center left; padding-left: 20px; font-weight: bold; }
\ No newline at end of file
diff --git a/images/icons/qslcard.png b/images/icons/qslcard.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2ae157e45467db927e173b7518a16219cc1fd35
GIT binary patch
literal 321
zcmV-H0lxl;P)<h;3K|Lk000e1NJLTq000mG000RH1^@s6J1VR)00009a7bBm000XU
z000XU0RWnu7ytkO^GQTOR45gV(LYN<Q5eVZV<<MbNUy-ju^^Fl8=@B9LFiV4j^ZXR
zh6oPrwKN6Q)+#vV5W3oHD2IX!%<TJ(dpD6D_}u&4bAIO!+(ZcB7(HaL!hb43=mSlg
zBV^G)9^2SdUrbKX#mwLkHz?r_@9-w;ICqajxW=_%0K*fUq6JU*M!bo=V=b5&!@0p$
z)bI+sxWo^txWX&mqTaD3%<REhxj|e`-olg4Fh?CVeBvB0Fk|+wl04J!lqMEvBNz4F
z%BvQULID>Tp@X!4p^qo*qk<hcZn>f5V$01u>>AHFFz9b9;{<*i+Ej7ok<i00=gdUD
TQ!W3w00000NkvXXu0mjf4fu!v

literal 0
HcmV?d00001

diff --git a/images/icons/stats.png b/images/icons/stats.png
new file mode 100644
index 0000000000000000000000000000000000000000..024eaac7902208c0f80333f5934631a0dba788f0
GIT binary patch
literal 389
zcmV;00eb$4P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkPH%UZ6R5%fplDkR+K@^6au$2g6h*hvq6pMfm5CdKwz*K20tpo)h
zLu}JnC6I>*zJY?VNRwVsOG~i{L1q2^ffHwk&BcLl=FGYLJ9{`TP1A*G%Q;seegb`X
zApawiFM(;0d<goAc!u*ZKT}N5K^;192WwCR6R@+1uOOkZ0FE+rqvS2_dy&sX&c*^H
zltBMzL7gMmgh>J~#Fh(eT34{^t@*cgQV$Zkyn%5#qfRf%Ta^UwJ}l)$@u{f;s77)5
zRr_uNQQTjZv;&Lq<voAfkOscm^%^5=UTFUi`_AFsW<f7_gh|Vq9LJwR#|oD>2){hb
zKDHP5L8AEL9|E`JCb58?dNYTJhOKPHI>S*`*Dpa67XQL0z80*8#j>4OA!3WcDq<f&
j1Gb?JJ@PV*!{^s8Wslw0|NK`L00000NkvXXu0mjf`Wc^S

literal 0
HcmV?d00001