Index: branches/1.0.x/elements/search.elm.tpl
===================================================================
diff -u -N -r14708 -r15015
--- branches/1.0.x/elements/search.elm.tpl	(.../search.elm.tpl)	(revision 14708)
+++ branches/1.0.x/elements/search.elm.tpl	(.../search.elm.tpl)	(revision 15015)
@@ -1,16 +1,96 @@
-<div class="searchbox">
+<!--<div class="searchbox">
 	<form id="search_form" action="<inp2:m_Link template='inc/search_results_ajax.elm'/>">
 		<inp2:m_if check='m_Get' name='keywords'>
 			<input type="text" id="search" name="search" value="<inp2:m_Get name='keywords'/>" autocomplete="off" />
-		<inp2:m_else/>	
+		<inp2:m_else/>
 			<input type="text" id="search" name="search" value="Search" autocomplete="off" onblur="if (this.value == '') this.value='Search'" onclick="if (this.value == 'Search') this.value=''" />
 		</inp2:m_if>
 	</form>
-</div>
+</div>-->
 
-<div class="" style="display: none;">
-	<div class="search-box-small-header"></div>
-	<div class="search-box-small-footer"></div>
+<div style="float: right; margin-top: 7px;">
+	<div style="position: absolute; z-index: 150; margin-left: -150px;">
+		<div class="search-box-small<inp2:m_ifnot check='m_Get' name='keywords'> search-box-small-noactive</inp2:m_ifnot>" >
+			<form id="search_form" action="<inp2:m_Link template='elements/ajax/search_results'/>">
+				<inp2:m_if check='m_Get' name='keywords'>
+					<input type="text" id="search-box-small-input" name="keywords" value="<inp2:m_Get name='keywords'/>" autocomplete="off"/><img src="<inp2:m_TemplatesBase/>img/search_clear.gif" width="13" height="13" alt="" border="0" class="search-box-small-clear search-clear" />
+				<inp2:m_else/>
+					<input type="text" id="search-box-small-input" name="keywords" value="Search" autocomplete="off"/><img src="<inp2:m_TemplatesBase/>img/search_clear.gif" width="13" height="13" alt="" border="0" class="search-box-small-clear search-clear" />
+				</inp2:m_if>
+			</form>
+		</div>
+
+		<div class="search-box-small-results" style="display: none;">
+			<div class="search-box-small-header"></div>
+			<div class="search-box-small-footer"></div>
+		</div>
+	</div>
 </div>
 
+<script type="text/javascript">
+	$(document).ready(
+		function() {
+			$('#search_form').submit(
+				function () {
+					if ( $.trim( $('#search-box-small-input').val() ) != '' ) {
+						var $url = '<inp2:m_Link template="products/search_results" keywords="#KEYWORDS#" js_escape="1" no_amp="1"/>';
+
+						window.location.href = $url.replace('#KEYWORDS#', encodeURIComponent($('#search-box-small-input').val()));
+					}
+
+					return false;
+				}
+			);
+
+			$('#search-box-small-input')
+			.keyup(search_on_change)
+			.focus(
+				function($e) {
+					if ( $(this).val() == 'Search' ) {
+						$(this).val('');
+					}
+
+					$('.search-box-small').removeClass('search-box-small-noactive');
+				}
+			)
+			.blur(
+				function($e) {
+					if ( $.trim( $(this).val() ) == '' ) {
+						$('.search-box-small').addClass('search-box-small-noactive');
+						$('.search-box-small-results').hide();
+
+						$(this).val('Search');
+					}
+				}
+			);
+
+			$('.search-box-small').click(
+				function ($e) {
+					$('#search-box-small-input').focus();
+				}
+			);
+
+			$('.search-box-small-clear, #sub_search_clear').click(
+				function($e) {
+					$('.search-box-small').addClass('search-box-small-noactive');
+					$('#search-box-small-input').val('').blur();
+
+
+					var $sub_search_keyword = $('#keywords');
+
+					if ( $sub_search_keyword.length == 1 ) {
+						$sub_search_keyword.val('').focus();
+					}
+
+
+					$e.stopPropagation();
+					return false;
+
+				}
+
+			);
+		}
+	);
+</script>
+
 <div class="clear"></div>
\ No newline at end of file