Index: branches/1.0.x/img/search_top.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/products/search_results.tpl
===================================================================
diff -u -N
--- branches/1.0.x/products/search_results.tpl	(revision 0)
+++ branches/1.0.x/products/search_results.tpl	(revision 15015)
@@ -0,0 +1,72 @@
+<!--##
+<NAME>Search Results</NAME>
+<DESC></DESC>
+<SECTION>Pages</SECTION>
+##-->
+<inp2:m_DefineElement name="page_title">Search Results</inp2:m_DefineElement>
+
+<!--## required, when filters are used ##-->
+<inp2:p_InitList list_name="search_results" types="search" parent_cat_id="any" main_list="1"/>
+
+<inp2:m_DefineElement name="page_title">Search Results</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="sidebar">
+	<inp2:m_Include template="elements/side_boxes/categories.elm" data_exists="1"/>
+
+	<inp2:m_Include template="elements/filters.elm"/>
+	<inp2:item-filter_PrintList render_as="filter_element" prefix="p" list_name="search_results" is_list="1"/>
+
+	<!--<inp2:m_RenderElement name="filter_element" prefix="p" list_name="search_results" filter_field="ManufacturerId" filter_type="checkbox"/>
+	<inp2:m_RenderElement name="filter_element" prefix="p" list_name="search_results" filter_field="EditorsPick" filter_type="radio"/>
+	<inp2:m_RenderElement name="filter_element" prefix="p" list_name="search_results" filter_field="Price" filter_type="range"/>-->
+
+	<inp2:m_Include template="elements/side_boxes/picks.elm" data_exists="1"/>
+	<inp2:m_Include template="elements/side_boxes/compare.elm"/>
+
+	<inp2:m_Include template="elements/side_boxes/subscribe.elm"/>
+</inp2:m_DefineElement>
+
+<!--## MAIN CONTENT ##-->
+<inp2:m_DefineElement name="content">
+
+	<div id="products">
+		<inp2:m_Include template="elements/content_boxes/products.elm" list_name="search_results" prefix="p" types="search" parent_cat_id="any" data_exists="1" />
+	</div>
+</inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
+
+<inp2:m_DefineElement name="add_to_head">
+	<script src="<inp2:m_TemplatesBase/>inc/js/list_manager.js" type="text/javascript"></script>
+
+	<script type="text/javascript">
+		ListManager.containerSelector = '#products';
+		ListManager.url = '<inp2:m_Link render_template="elements/content_boxes/products.elm" list_name="search_results" list_prefix="p" js_escape="1" no_amp="1"/>';
+		ListManager.setParam('types', 'search');
+		ListManager.setParam('parent_cat_id', 'any');
+
+		$(document).ready(
+			function() {
+				// js that works for "Shop All" menu and "Categories sidebox": begin
+				var icons = {header: 'ui-icon-circle-arrow-e', headerSelected: 'ui-icon-circle-arrow-s'},
+					level2icons = {header: 'ui-icon-circle-arrow-l2e', headerSelected: 'ui-icon-circle-arrow-l2s'},
+					level3icons = {header: 'ui-icon-circle-arrow-l3e', headerSelected: 'ui-icon-circle-arrow-l3s'};
+
+//				$('#accordion-menu').accordion({icons: icons});
+				$('#level2-menu').accordion({icons: level2icons});
+
+				$('.level3-menu').accordion({
+					icons: level3icons,
+					header: 'h4',
+					autoHeight: false,
+					event: 'mouseover'
+				});
+
+				ListManager.init();
+			}
+		);
+	</script>
+</inp2:m_DefineElement>
+
+<!--## DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des" pass_params="1" left_column="sidebar"/>
+<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.0.x/elements/sorting.elm.tpl
===================================================================
diff -u -N -r14980 -r15015
--- branches/1.0.x/elements/sorting.elm.tpl	(.../sorting.elm.tpl)	(revision 14980)
+++ branches/1.0.x/elements/sorting.elm.tpl	(.../sorting.elm.tpl)	(revision 15015)
@@ -21,13 +21,15 @@
 
 	<div class="sortby">
 		<form method="post" action="<inp2:m_FormAction/>">
-			Sort by:
-			<select name="<inp2:p_CombinedSortingDropDownName/>" id="sorting">
-				<option value="Name|asc" <inp2:p_SortingSelected sorting="l1_Name|asc" selected='selected="selected"'/>>Name</option>
-				<option value="Price|asc" <inp2:p_SortingSelected sorting="Price|asc" selected='selected="selected"'/>>Price Low</option>
-				<option value="Price|desc" <inp2:p_SortingSelected sorting="Price|desc" selected='selected="selected"'/>>Price High</option>
-				<option value="CachedRating|asc" <inp2:p_SortingSelected sorting="CachedRating|asc" selected='selected="selected"'/>>Rating</option>
-			</select>&nbsp;&nbsp;
+			<inp2:m_ifnot check="m_Param" name="list_name" equals_to="search_results">
+				Sort by:
+				<select name="<inp2:p_CombinedSortingDropDownName/>" id="sorting">
+					<option value="Name|asc" <inp2:p_SortingSelected sorting="l1_Name|asc" selected='selected="selected"'/>>Name</option>
+					<option value="Price|asc" <inp2:p_SortingSelected sorting="Price|asc" selected='selected="selected"'/>>Price Low</option>
+					<option value="Price|desc" <inp2:p_SortingSelected sorting="Price|desc" selected='selected="selected"'/>>Price High</option>
+					<option value="CachedRating|asc" <inp2:p_SortingSelected sorting="CachedRating|asc" selected='selected="selected"'/>>Rating</option>
+				</select>&nbsp;&nbsp;
+			</inp2:m_ifnot>
 
 			Per Page:
 			<select name="<inp2:{$prefix}_VarName type='PerPage'/>" id="per-page">
Index: branches/1.0.x/img/search_box.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/search_clear.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/ajax/search_results.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/ajax/search_results.tpl	(revision 0)
+++ branches/1.0.x/elements/ajax/search_results.tpl	(revision 15015)
@@ -0,0 +1,34 @@
+<inp2:m_NoDebug/>
+
+<inp2:m_DefineElement name="product_search_element">
+	<li>
+		<a href="<inp2:ProductLink template='__default__'/>"><inp2:Field name="Name"/></a>
+	</li>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="more_link">
+	<br/>
+	<inp2:m_Get name="keywords" result_to_var="keywords"/>
+	<a href="<inp2:m_Link template='products/search_results' keywords='$keywords'/>" class="link-more">More Search Results</a><br />
+</inp2:m_DefineElement>
+
+<inp2:p_InitList list_name="search_results" types="search" parent_cat_id="any" per_page="5"/>
+
+<inp2:m_if check="p_TotalRecords" list_name="search_results">
+	<p class="title">Suggested Products:</p>
+
+	<ol>
+		<inp2:p_PrintList list_name="search_results" render_as="product_search_element"/>
+	</ol>
+
+	<div class="clear"></div>
+
+	<inp2:p_MoreLink list_name="search_results" render_as="more_link"/>
+<inp2:m_else/>
+	<p class="title">No Suggested Products:</p>
+
+	<inp2:m_Get name="keywords" result_to_var="keywords"/>
+	<a href="<inp2:m_Link template='products/search_results' keywords='$keywords'/>" class="link-more">Search All Pages</a><br />
+</inp2:m_if>
+
+<br />
\ No newline at end of file
Index: branches/1.0.x/inc/styles.css
===================================================================
diff -u -N -r14990 -r15015
--- branches/1.0.x/inc/styles.css	(.../styles.css)	(revision 14990)
+++ branches/1.0.x/inc/styles.css	(.../styles.css)	(revision 15015)
@@ -252,7 +252,9 @@
 .menu ul li a.active {
 	background: #2d85d6 url(@templates_base@/img/bg-menu.jpg) repeat-x 0 -92px;
 }
-.menu .searchbox {
+
+/* === Top Search Box: begin === */
+/*.menu .searchbox {
 	background: url(@templates_base@/img/bg-searchbox-l.jpg) no-repeat 0 0;
 	float: right;
 	margin-top: 10px;
@@ -266,8 +268,69 @@
 	line-height: 23px;
 	padding-top: 2px;
 	width: 180px;
+}*/
+
+.search-box-small {
+	height:23px;
+	background:url(@templates_base@/img/search_box.gif) bottom left;
+	width:146px;
+	cursor:text;
 }
 
+.search-box-small input {
+	font-family:Arial, Helvetica, sans-serif;
+	width:93px;
+	float:left;
+	font-size:9pt;
+	border:none;
+	background:none;
+	line-height:23px;
+	margin-left:30px;
+	margin-top:5px;
+	line-height:14px;
+}
+
+.search-box-small input:focus { outline: none }
+
+.search-box-small-noactive {
+	background:url(@templates_base@/img/search_box.gif) top left;
+}
+
+.search-box-small-noactive input {
+	color:#FFFFFF;
+}
+
+.search-box-small-noactive .search-clear {
+	display:none;
+}
+
+.search-box-small .search-clear {
+	margin-top: 5px;
+	margin-left:5px;
+	cursor:pointer;
+}
+
+.search-box-small-results {
+	position:absolute;
+	margin-top:-4px;
+	margin-left:-173px;
+}
+
+.search-box-small-header {
+	background:url(@templates_base@/img/search_top.png) top left;
+	padding-top:25px;
+	padding-left:25px;
+	padding-right:25px;
+	width:277px;
+}
+
+.search-box-small-footer {
+	background:url(@templates_base@/img/search_bottom.png) top left;
+	width:327px;
+	height:14px;
+}
+/* === Top Search Box: end === */
+
 .level2 {
 	background-color: #fff;
 	left: 273px;
@@ -542,11 +605,11 @@
 	position: relative;
 	z-index: 150;
 }
-
-.block h2 em.filter-header {
-	padding-left: 14px;
-}
-
+
+.block h2 em.filter-header {
+	padding-left: 14px;
+}
+
 .block h2 a { text-decoration: underline; }
 .block h2 i {
 	background: url(@templates_base@/img/bc-step.png) no-repeat 50% 50%;
@@ -577,10 +640,10 @@
 }
 .block.alt-block h2 a {
 	display: block;
-	float: right;
-	line-height: 8px;
-	padding-top: 8px;
-	padding-right: 8px;
+	float: right;
+	line-height: 8px;
+	padding-top: 8px;
+	padding-right: 8px;
 }
 
 .block .block-content {
Index: branches/1.0.x/inc/js/jquery.scripts.js
===================================================================
diff -u -N -r14907 -r15015
--- branches/1.0.x/inc/js/jquery.scripts.js	(.../jquery.scripts.js)	(revision 14907)
+++ branches/1.0.x/inc/js/jquery.scripts.js	(.../jquery.scripts.js)	(revision 15015)
@@ -1,3 +1,5 @@
+var $auto_search_request = null;
+
 /* === General usage functions === */
 function jq($selector, $delimiter) {
 	return ($selector + '').replace(new RegExp('[.\\\\+*?\\[\\^\\]$(){}=!<>|:\\' + ($delimiter || '') + '-]', 'g'), '\\$&');
@@ -116,6 +118,35 @@
 	window.location.href = $url;
 }
 
+function search_on_change ($e) {
+	if ($auto_search_request != null) {
+		$auto_search_request.abort();
+	}
+
+	if ( $e.which == 13 || $.trim( $('#search-box-small-input').val() ).length < 3 ) {
+		$('.search-box-small-results').hide();
+
+		return ;
+	}
+
+	var $form = $('#search_form');
+
+	$auto_search_request = $.get(
+		$form.attr('action'),
+		$form.serialize(),
+		function ($data) {
+			$('.search-box-small-header').html($data);
+
+			if ( $.trim($data) != '' ) {
+				$('.search-box-small-results').show();
+			}
+			else {
+				$('.search-box-small-clear').click();
+			}
+		}
+	);
+}
+
 /* === DBlocks class === */
 function DBlocks() {
 	var $me = this;
Index: branches/1.0.x/img/search_bottom.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/content_boxes/products.elm.tpl
===================================================================
diff -u -N -r14982 -r15015
--- branches/1.0.x/elements/content_boxes/products.elm.tpl	(.../products.elm.tpl)	(revision 14982)
+++ branches/1.0.x/elements/content_boxes/products.elm.tpl	(.../products.elm.tpl)	(revision 15015)
@@ -1,13 +1,15 @@
-<inp2:m_DefaultParam prefix="" list_name="" layout="list"/>
+<inp2:m_DefaultParam prefix="" list_name="" types="" parent_cat_id="" layout="list"/>
 
 <inp2:m_if check="m_Get" name="ajax" equals_to="yes">
 	<inp2:m_NoDebug/>
 	<inp2:m_Get name="list_prefix" result_to_var="prefix"/>
 	<inp2:m_Get name="list_name" result_to_var="list_name"/>
+	<inp2:m_Get name="types" result_to_var="types"/>
+	<inp2:m_Get name="parent_cat_id" result_to_var="parent_cat_id"/>
 	<inp2:m_Get name="layout" result_to_var="layout"/>
 </inp2:m_if>
 
-<inp2:$prefix_InitList list_name="$list_name" main_list="1"/>
+<inp2:$prefix_InitList list_name="$list_name" types="$types" parent_cat_id="$parent_cat_id" main_list="1"/>
 
 <inp2:m_Include template="elements/content_boxes.elm" strip_nl="2"/>
 <inp2:m_Include template="elements/product_elements.elm" strip_nl="2"/>
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