From 77f2b61bfdf451ac437906f413a23ae9e73651eb Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Mon, 7 Nov 2011 17:53:35 +0000
Subject: [PATCH] Fixed search

---
 application/views/layout/header.php | 21 +---------
 application/views/search/main.php   | 17 +++++++-
 cloudlog.sublime-workspace          | 63 ++++++++++++++++++++++-------
 3 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/application/views/layout/header.php b/application/views/layout/header.php
index 7f53038d..f6698409 100644
--- a/application/views/layout/header.php
+++ b/application/views/layout/header.php
@@ -12,25 +12,6 @@
 
 	<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>
-	
-
-
-	<style type="text/css" media="screen" >
-		#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
-		}?> }
-
-	</style>
 
 
 	<link rel="stylesheet" href="<?php echo base_url();?>css/bootcamp/bootstrap.css" type="text/css" />
@@ -78,7 +59,7 @@
 
           </ul>
 
-        <form action=""><input type="text" placeholder="Search Callsign"></form>
+        <form method="post" action="<?php echo site_url('search'); ?>"><input type="text" name="callsign" placeholder="Search Callsign"></form>
 
         <?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
         	<p class="pull-right">Logged in as <a href="#"><?php echo $this->session->userdata('user_callsign'); ?></a></p>
diff --git a/application/views/search/main.php b/application/views/search/main.php
index 0cc79509..4d22625c 100644
--- a/application/views/search/main.php
+++ b/application/views/search/main.php
@@ -1,5 +1,7 @@
+<div id="container">
+
 <h2>Search</h2>
-<div class="wrap_content">
+
 <form method="post" action="" id="search_box" name="test">
 	Callsign: <input type="text" id="callsign" name="callsign" value="" />
 </form>
@@ -12,6 +14,19 @@
 <script type="text/javascript">
 i=0;
 $(document).ready(function(){
+
+	$('#partial_view').load("logbook/search_result/<?php echo $this->input->post('callsign'); ?>", function() {
+	      // after load trigger your fancybox 
+	      	$(".editbox").fancybox({
+				'autoDimensions'	: false,
+				'width'         	: 450,
+				'height'        	: 550,
+				'transitionIn'		: 'fade',
+				'transitionOut'		: 'fade',
+				'type'				: 'iframe',
+			});
+	});
+
   $("#callsign").keyup(function(){
 	if ($(this).val()) {
 
diff --git a/cloudlog.sublime-workspace b/cloudlog.sublime-workspace
index ad6181ae..74e57033 100644
--- a/cloudlog.sublime-workspace
+++ b/cloudlog.sublime-workspace
@@ -5,7 +5,7 @@
 		[
 			[
 				"text",
-				"text: text-align: left/center/right"
+				"text: text-transform: capitalize/upper/lower"
 			],
 			[
 				"font",
@@ -31,7 +31,7 @@
 			"file": "application/views/qso/index.php",
 			"settings":
 			{
-				"buffer_size": 12968,
+				"buffer_size": 13016,
 				"line_ending": "Windows"
 			}
 		},
@@ -55,7 +55,15 @@
 			"file": "css/main.css",
 			"settings":
 			{
-				"buffer_size": 444,
+				"buffer_size": 483,
+				"line_ending": "Windows"
+			}
+		},
+		{
+			"file": "application/views/layout/header.php",
+			"settings":
+			{
+				"buffer_size": 4384,
 				"line_ending": "Windows"
 			}
 		}
@@ -218,7 +226,7 @@
 	"groups":
 	[
 		{
-			"selected": 4,
+			"selected": 5,
 			"sheets":
 			[
 				{
@@ -253,15 +261,15 @@
 					"file": "application/views/qso/index.php",
 					"settings":
 					{
-						"buffer_size": 12968,
+						"buffer_size": 13016,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								2006,
-								2002
+								1875,
+								1883
 							]
 						],
 						"settings":
@@ -270,7 +278,7 @@
 							"translate_tabs_to_spaces": false
 						},
 						"translation.x": 0.0,
-						"translation.y": 1193.0,
+						"translation.y": 1032.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
@@ -297,7 +305,7 @@
 							"translate_tabs_to_spaces": false
 						},
 						"translation.x": 0.0,
-						"translation.y": 864.0,
+						"translation.y": 18.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"
@@ -334,23 +342,50 @@
 					"file": "css/main.css",
 					"settings":
 					{
-						"buffer_size": 444,
+						"buffer_size": 483,
 						"regions":
 						{
 						},
 						"selection":
 						[
 							[
-								402,
-								402
+								62,
+								62
 							]
 						],
 						"settings":
 						{
-							"syntax": "Packages/CSS/CSS.tmLanguage"
+							"syntax": "Packages/CSS/CSS.tmLanguage",
+							"translate_tabs_to_spaces": false
 						},
 						"translation.x": 0.0,
-						"translation.y": 216.0,
+						"translation.y": 0.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 5,
+					"file": "application/views/layout/header.php",
+					"settings":
+					{
+						"buffer_size": 4384,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								4249,
+								4249
+							]
+						],
+						"settings":
+						{
+							"syntax": "Packages/PHP/PHP.tmLanguage"
+						},
+						"translation.x": 0.0,
+						"translation.y": 1192.0,
 						"zoom_level": 1.0
 					},
 					"type": "text"