From a30d32a0075e0fcf39fb49a124e8a5a8bbbf74bd Mon Sep 17 00:00:00 2001
From: Darko <dkrisan@gmail.com>
Date: Tue, 7 Jul 2015 10:15:55 +0200
Subject: [PATCH] Fixed the search function, enabled modals for browse page.

---
 .../charisma/views/frontend/browse.tpl        | 395 +++++++------
 .../charisma/views/frontend/search.tpl        | 529 ++++++++++-------
 .../omicron/views/frontend/browse.tpl         |  14 +-
 .../omicron/views/frontend/search.tpl         | 553 +++++++++++-------
 4 files changed, 862 insertions(+), 629 deletions(-)

diff --git a/www/templates/charisma/views/frontend/browse.tpl b/www/templates/charisma/views/frontend/browse.tpl
index fb109463b..13fbecdf4 100644
--- a/www/templates/charisma/views/frontend/browse.tpl
+++ b/www/templates/charisma/views/frontend/browse.tpl
@@ -13,205 +13,210 @@
 {$site->adbrowse}
 
 {if $results|@count > 0}
-	<div class="row">
-		<div class="box col-md-12">
-			<div class="box-content">
-				<form id="nzb_multi_operations_form" action="get">
-					<div class="row">
-						<div class="col-xlg-12 portlets">
-							<div class="panel">
-								<div class="panel-content pagination2">
-									<div class="row">
-										<div class="col-md-8">
-											{if isset($shows)}
-												<p>
-													<a href="{$smarty.const.WWW_TOP}/series"
-													   title="View available TV series">Series List</a> |
-													<a title="Manage your shows" href="{$smarty.const.WWW_TOP}/myshows">Manage
-														My Shows</a> |
-													<a title="All releases in your shows as an RSS feed"
-													   href="{$smarty.const.WWW_TOP}/rss?t=-3&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">Rss
-														Feed</a>
-												</p>
-											{/if}
-											<div class="nzb_multi_operations">
-												{if ($category >= '1000' and $category <= '1999')}View:
-													<a href="{$smarty.const.WWW_TOP}/console?t={$category}">Covers</a>
-													|
-													<b>List</b>
-													<br/>
-												{elseif ($category >= '2000' and $category <= '2100')}View:
-													<a href="{$smarty.const.WWW_TOP}/movies?t={$category}">Covers</a>
-													|
-													<b>List</b>
-													<br/>
-												{elseif ($category >= '3000' and $category <= '3999')}View:
-													<a href="{$smarty.const.WWW_TOP}/music?t={$category}">Covers</a>
-													|
-													<b>List</b>
-													<br/>
-												{elseif ($category == '4050')}View:
-													<a href="{$smarty.const.WWW_TOP}/games?t={$category}">Covers</a>
-													|
-													<b>List</b>
-													<br/>
-												{elseif ($category == '6000'  OR '6080' OR '6070' OR '6020' OR '6040')}View:
-													<a href="{$smarty.const.WWW_TOP}/xxx?t={$category}">Covers</a>
-													|
-													<b>List</b>
-													<br/>
-												{elseif $category == '7000'}View:
-													<a href="{$smarty.const.WWW_TOP}/books?t={$category}">Covers</a>
-													|
-													<b>List</b>
-													<br/>
-												{/if}
-												With Selected:
-												<div class="btn-group">
-													<input type="button"
-														   class="nzb_multi_operations_download btn btn-sm btn-success"
-														   value="Download NZBs"/>
-													<input type="button"
-														   class="nzb_multi_operations_cart btn btn-sm btn-info"
-														   value="Add to Cart"/>
-													{if isset($sabintegrated)}
-														<input type="button"
-															   class="nzb_multi_operations_sab btn btn-sm btn-primary"
-															   value="Send to queue"/>
-													{/if}
-													{if isset($isadmin)}
-														<input type="button"
-															   class="nzb_multi_operations_edit btn btn-sm btn-warning"
-															   value="Edit"/>
-														<input type="button"
-															   class="nzb_multi_operations_delete btn btn-sm btn-danger"
-															   value="Delete"/>
-													{/if}
-												</div>
-											</div>
-										</div>
-										<div class="col-md-4">
-											{$pager}
-										</div>
-									</div>
-									<table class="data table table-condensed table-striped" cellspacing="0"
-										   cellpadding="0" style="table-layout: auto;">
-										<thead>
-										<tr>
-											<th><input id="chkSelectAll" type="checkbox" class="nzb_check_all"/></th>
-											<th>Name
-												<a title="Sort Descending" href="{$orderbyname_desc}">
-													<i class="fa-icon-caret-down text-muted"> </i>
-												</a>
-												<a title="Sort Ascending" href="{$orderbyname_asc}">
-													<i class="fa-icon-caret-up text-muted"> </i>
-												</a>
-											</th>
-											<th>Category</th>
-											<th>Posted</th>
-											<th>Size</th>
-											<th>Action</th>
-										</tr>
-										</thead>
-										<tbody>
-										{foreach from=$results item=result}
-											<tr id="guid{$result.guid}">
-												<td class="check"><input id="chk{$result.guid|substr:0:7}"
-																		 type="checkbox" class="nzb_check"
-																		 value="{$result.guid}"/></td>
-												<td>
-													<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"seourl"}"
-													   class="title">{$result.searchname|escape:"htmlall"|replace:".":" "}</a>
-													<br/>
-													<span class="label label-default">{$result.grabs}
-														Grab{if $result.grabs != 1}s{/if}</span>
-													{if $result.nfoid > 0}<span class="label label-default"><a
-																href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
-																class="text-muted">NFO</a></span>{/if}
-													{if $result.jpgstatus == 1 && $userdata.canpreview == 1}<span
-															class="label label-default"><a
-																href="{$smarty.const.WWW_TOP}/covers/sample/{$result.guid}_thumb.jpg"
-																class="text-muted">Sample</a></span>{/if}
-													{if $result.haspreview == 1 && $userdata.canpreview == 1}<span
-															class="label label-default"><a
-																href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg"
-																class="text-muted">Preview</a></span>{/if}
-													{if $result.rageid > 0}<span class="label label-default"><a
-																href="{$smarty.const.WWW_TOP}/series/{$result.rageid}"
-																class="text-muted">View TV</a></span>{/if}
-													{if $result.anidbid > 0}<span class="label label-default"><a
-																href="{$smarty.const.WWW_TOP}/anime/{$result.anidbid}"
-																class="text-muted">View Anime</a></span>{/if}
-												</td>
-												<td><span class="label label-default">{$result.category_name}</span>
-												</td>
-												<td>{$result.postdate|timeago}</td>
-												<td>{$result.size|fsize_format:"MB"}</td>
-												<td class="icon_nzb"><a
-															href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"url"}"><i
-																class="fa fa-download text-muted"
-																title="Download NZB"></i></a>
-													<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
-																class="fa fa-comments-o text-muted"
-																title="Comments"></i></a>
-													<a href="#" class="icon_cart text-muted"><i
-																class="fa fa-shopping-cart" title="Send to my Cart"></i></a>
-													{if isset($sabintegrated)}
-														<a href="#" class="icon_sab text-muted"><i class="fa fa-send-o"
-																								   title="Send to my Queue"></i></a>
-													{/if}
-													{if $weHasVortex}
-														<a href="#" class="icon_vortex text-muted"><i
-																	class="fa fa-send-o" title="Send to NZBVortex"></i></a>
-													{/if}
-												</td>
-											</tr>
-										{/foreach}
-										</tbody>
-									</table>
-									<div class="row">
-										<div class="col-md-7">
-											<div class="nzb_multi_operations">
-												{if isset($section) && $section != ''}View:
-													<a href="{$smarty.const.WWW_TOP}/{$section}?t={$category}">Covers</a>
-													|
-													<b>List</b>
-													<br/>
-												{/if}
-												<small>With Selected:</small>
-												<div class="btn-group">
-													<input type="button"
-														   class="nzb_multi_operations_download btn btn-sm btn-success"
-														   value="Download NZBs"/>
-													<input type="button"
-														   class="nzb_multi_operations_cart btn btn-sm btn-info"
-														   value="Add to Cart"/>
-													{if isset($sabintegrated)}
-														<input type="button"
-															   class="nzb_multi_operations_sab btn btn-sm btn-primary"
-															   value="Send to queue"/>
-													{/if}
-													{if isset($isadmin)}
-														<input type="button"
-															   class="nzb_multi_operations_edit btn btn-sm btn-warning"
-															   value="Edit"/>
-														<input type="button"
-															   class="nzb_multi_operations_delete btn btn-sm btn-danger"
-															   value="Delete"/>
-													{/if}
-												</div>
-											</div>
-										</div>
-										<div class="col-md-5">
-											{$pager}
-										</div>
+	<form id="nzb_multi_operations_form" action="get">
+		<div class="box-body"
+		<div class="row">
+			<div class="col-xlg-12 portlets">
+				<div class="panel">
+					<div class="panel-content pagination2">
+						<div class="row">
+							<div class="col-md-8">
+								{if isset($shows)}
+									<p>
+										<a href="{$smarty.const.WWW_TOP}/series"
+										   title="View available TV series">Series List</a> |
+										<a title="Manage your shows" href="{$smarty.const.WWW_TOP}/myshows">Manage
+											My Shows</a> |
+										<a title="All releases in your shows as an RSS feed"
+										   href="{$smarty.const.WWW_TOP}/rss?t=-3&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">Rss
+											Feed</a>
+									</p>
+								{/if}
+								<div class="nzb_multi_operations">
+									{if ($category >= '1000' and $category <= '1999')}View:
+										<a href="{$smarty.const.WWW_TOP}/console?t={$category}">Covers</a>
+										|
+										<b>List</b>
+										<br/>
+									{elseif ($category >= '2000' and $category <= '2100')}View:
+										<a href="{$smarty.const.WWW_TOP}/movies?t={$category}">Covers</a>
+										|
+										<b>List</b>
+										<br/>
+									{elseif ($category >= '3000' and $category <= '3999')}View:
+										<a href="{$smarty.const.WWW_TOP}/music?t={$category}">Covers</a>
+										|
+										<b>List</b>
+										<br/>
+									{elseif ($category == '4050')}View:
+										<a href="{$smarty.const.WWW_TOP}/games?t={$category}">Covers</a>
+										|
+										<b>List</b>
+										<br/>
+									{elseif ($category == '6000'  OR '6080' OR '6070' OR '6020' OR '6040')}View:
+										<a href="{$smarty.const.WWW_TOP}/xxx?t={$category}">Covers</a>
+										|
+										<b>List</b>
+										<br/>
+									{elseif $category == '7000'}View:
+										<a href="{$smarty.const.WWW_TOP}/books?t={$category}">Covers</a>
+										|
+										<b>List</b>
+										<br/>
+									{/if}
+									With Selected:
+									<div class="btn-group">
+										<input type="button"
+											   class="nzb_multi_operations_download btn btn-sm btn-success"
+											   value="Download NZBs"/>
+										<input type="button"
+											   class="nzb_multi_operations_cart btn btn-sm btn-info"
+											   value="Add to Cart"/>
+										{if isset($sabintegrated)}
+											<input type="button"
+												   class="nzb_multi_operations_sab btn btn-sm btn-primary"
+												   value="Send to Queue"/>
+										{/if}
+										{if isset($nzbgetintegrated)}
+											<input type="button"
+												   class="nzb_multi_operations_nzbget btn btn-sm btn-primary"
+												   value="Send to NZBGet"/>
+										{/if}
+										{if isset($isadmin)}
+											<input type="button"
+												   class="nzb_multi_operations_edit btn btn-sm btn-warning"
+												   value="Edit"/>
+											<input type="button"
+												   class="nzb_multi_operations_delete btn btn-sm btn-danger"
+												   value="Delete"/>
+										{/if}
 									</div>
 								</div>
 							</div>
+							<div class="col-md-4">
+								{$pager}
+							</div>
+						</div>
+						<hr>
+						<table class="data table table-condensed table-striped" cellspacing="0"
+							   cellpadding="0" style="table-layout: auto;">
+							<thead>
+							<tr>
+								<th><input id="chkSelectAll" type="checkbox" class="nzb_check_all"/></th>
+								<th>Name
+									<a title="Sort Descending" href="{$orderbyname_desc}">
+										<i class="fa-icon-caret-down text-muted"> </i>
+									</a>
+									<a title="Sort Ascending" href="{$orderbyname_asc}">
+										<i class="fa-icon-caret-up text-muted"> </i>
+									</a>
+								</th>
+								<th>Category</th>
+								<th>Posted</th>
+								<th>Size</th>
+								<th>Action</th>
+							</tr>
+							</thead>
+							<tbody>
+							{foreach from=$results item=result}
+								<tr id="guid{$result.guid}">
+									<td class="check"><input id="chk{$result.guid|substr:0:7}"
+															 type="checkbox" class="nzb_check"
+															 value="{$result.guid}"/></td>
+									<td>
+										<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"seourl"}"
+										   class="title">{$result.searchname|escape:"htmlall"|replace:".":" "}</a>
+										<br/>
+													<span class="label label-default">{$result.grabs}
+														Grab{if $result.grabs != 1}s{/if}</span>
+										{if $result.nfoid > 0}<span><a
+													href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
+													class="modal_nfo label label-default" rel="nfo">NFO</a></span>{/if}
+										{if $result.jpgstatus == 1 && $userdata.canpreview == 1}<span><a
+													href="{$smarty.const.WWW_TOP}/covers/sample/{$result.guid}_thumb.jpg"
+													name="name{$result.guid}" class="modal_prev label label-default" rel="preview">Sample</a></span>{/if}
+										{if $result.haspreview == 1 && $userdata.canpreview == 1}<span><a
+													href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg"
+													name="name{$result.guid}" class="modal_prev label label-default" rel="preview">Preview</a></span>{/if}
+										{if $result.rageid > 0}<span class="label label-default"><a
+													href="{$smarty.const.WWW_TOP}/series/{$result.rageid}"
+													class="text-muted">View TV</a></span>{/if}
+										{if $result.anidbid > 0}<span class="label label-default"><a
+													href="{$smarty.const.WWW_TOP}/anime/{$result.anidbid}"
+													class="text-muted">View Anime</a></span>{/if}
+									</td>
+									<td><span class="label label-default">{$result.category_name}</span>
+									</td>
+									<td>{$result.postdate|timeago}</td>
+									<td>{$result.size|fsize_format:"MB"}</td>
+									<td class="icon_nzb"><a
+												href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"url"}"><i
+													class="fa fa-download text-muted"
+													title="Download NZB"></i></a>
+										<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
+													class="fa fa-comments-o text-muted"
+													title="Comments"></i></a>
+										<a href="#" class="icon_cart text-muted"><i
+													class="fa fa-shopping-cart" title="Send to my Cart"></i></a>
+										{if isset($sabintegrated)}
+											<a href="#" class="icon_sab text-muted"><i class="fa fa-send-o"
+																					   title="Send to my Queue"></i></a>
+										{/if}
+										{if $weHasVortex}
+											<a href="#" class="icon_vortex text-muted"><i
+														class="fa fa-send-o" title="Send to NZBVortex"></i></a>
+										{/if}
+									</td>
+								</tr>
+							{/foreach}
+							</tbody>
+						</table>
+						<hr>
+						<div class="row">
+							<div class="col-md-8">
+								<div class="nzb_multi_operations">
+									{if isset($section) && $section != ''}View:
+										<a href="{$smarty.const.WWW_TOP}/{$section}?t={$category}">Covers</a>
+										|
+										<b>List</b>
+										<br/>
+									{/if}
+									With Selected:
+									<div class="btn-group">
+										<input type="button"
+											   class="nzb_multi_operations_download btn btn-sm btn-success"
+											   value="Download NZBs"/>
+										<input type="button"
+											   class="nzb_multi_operations_cart btn btn-sm btn-info"
+											   value="Add to Cart"/>
+										{if isset($sabintegrated)}
+											<input type="button"
+												   class="nzb_multi_operations_sab btn btn-sm btn-primary"
+												   value="Send to Queue"/>
+										{/if}
+										{if isset($nzbgetintegrated)}
+											<input type="button"
+												   class="nzb_multi_operations_nzbget btn btn-sm btn-primary"
+												   value="Send to NZBGet"/>
+										{/if}
+										{if isset($isadmin)}
+											<input type="button"
+												   class="nzb_multi_operations_edit btn btn-sm btn-warning"
+												   value="Edit"/>
+											<input type="button"
+												   class="nzb_multi_operations_delete btn btn-sm btn-danger"
+												   value="Delete"/>
+										{/if}
+									</div>
+								</div>
+							</div>
+							<div class="col-md-4">
+								{$pager}
+							</div>
 						</div>
 					</div>
-				</form>
+				</div>
 			</div>
 		</div>
-	</div>
-{/if}
+	</form>
+{/if}
\ No newline at end of file
diff --git a/www/templates/charisma/views/frontend/search.tpl b/www/templates/charisma/views/frontend/search.tpl
index 8dbd0510a..c64c4001c 100644
--- a/www/templates/charisma/views/frontend/search.tpl
+++ b/www/templates/charisma/views/frontend/search.tpl
@@ -1,3 +1,6 @@
+{if {$site->adbrowse} != ''}
+	{$site->adbrowse}
+{/if}
 <div class="header">
 	<h2>newznab-tmux > <strong>Search</strong></h2>
 
@@ -8,15 +11,21 @@
 		</ol>
 	</div>
 </div>
-
-<div style="display:none;text-align:right;">
-	<a href="#"
-	   onclick="if(jQuery(this).text()=='Advanced Search')jQuery(this).text('Basic Search');else jQuery(this).text('Advanced Search');jQuery('#sbasic,#sadvanced').toggle();return false;">{if $sadvanced}Basic{else}Advanced{/if}
-		Search</a>
+<div>
+	<center>
+		<a href="#" onclick="if (jQuery(this).text() == 'Advanced Search')
+					jQuery(this).text('Basic Search');
+				else
+					jQuery(this).text('Advanced Search');
+				jQuery('#sbasic,#sadvanced').toggle();
+				return false;">{if $sadvanced}Basic{else}Click For Advanced{/if} Search
+		</a>
+	</center>
 </div>
+<br>
 <div class="well well-sm">
 	<form method="get" action="{$smarty.const.WWW_TOP}/search">
-		<div id="sbasic" class="row">
+		<div id="sbasic" class="row" style="text-align:center;{if $sadvanced} display:none;{/if}">
 			<div class="col-md-6">
 				<input id="search" class="form-control" maxlength="50" name="search" value="{$search|escape:'html'}"
 					   type="search" placeholder="What are you looking for?"/>
@@ -29,231 +38,337 @@
 		</div>
 	</form>
 </div>
-
 <form method="get" action="{$smarty.const.WWW_TOP}/search">
 	<div id="sadvanced" {if not $sadvanced}style="display:none"{/if}>
 		<center>
 			<table class="data">
 				<tr>
-					<th><label for="searchadvr">Release Name</label>:</th>
-					<td><input id="searchadvr" name="searchadvr" value="{$searchadvr|escape:'html'}" type="text"/></td>
+					<th><label for="searchadvr">Release Name:</label></th>
+					<td><input class="searchadv" id="searchadvr" name="searchadvr" value="{$searchadvr|escape:'html'}" type="text"></td>
 				</tr>
 				<tr>
-					<th><label for="searchadvposter">Poster</label>:</th>
-					<td><input id="searchadvposter" name="searchadvposter" value="{$searchadvposter|escape:'html'}"
-							   type="text"/></td>
+					<th><label for="searchadvsubject">Usenet Name:</label></th>
+					<td><input class="searchadv" id="searchadvsubject" name="searchadvsubject" value="{$searchadvsubject|escape:'html'}" type="text"></td>
 				</tr>
 				<tr>
-					<th><label for="searchadvgroups">Group</label>:</th>
-					<td>{html_options id="searchadvgroups" name=searchadvgroups options=$grouplist selected=$selectedgroup}</td>
+					<th><label for="searchadvposter">Poster:</label></th>
+					<td><input class="searchadv" id="searchadvposter" name="searchadvposter" value="{$searchadvposter|escape:'html'}" type="text"></td>
 				</tr>
 				<tr>
-					<th><label for="searchadvcat">Category</label>:</th>
-					<td>{html_options id="searchadvcat" name=searchadvcat options=$catlist selected=$selectedcat}</td>
-				</tr>
-				<tr>
-					<th><label for="searchadvsizefrom">Size Between</label>:</th>
+					<th><label for="searchadvdaysnew">Min age(days):</label></th>
 					<td>
-						{html_options id="searchadvsizefrom" name=searchadvsizefrom options=$sizelist selected=$selectedsizefrom}
-						and {html_options id="searchadvsizeto" name=searchadvsizeto options=$sizelist selected=$selectedsizeto}
+						<input class="searchdaysinput" id="searchadvdaysnew" name="searchadvdaysnew" value="{$searchadvdaysnew|escape:'html'}" type="text">
 					</td>
 				</tr>
 				<tr>
-					<th></th>
+					<th><label for="searchadvdaysold">Max age(days):</label></th>
 					<td>
-						<input type="hidden" name="search_type" value="adv" id="search_type"/>
-						<input id="search_adv_button" type="submit" value="search"/>
+						<input class="searchdaysinput" id="searchadvdaysold" name="searchadvdaysold" value="{$searchadvdaysold|escape:'html'}" type="text">
+					</td>
+				</tr>
+				<tr>
+					<th><label for="searchadvgroups">Group:</label></th>
+					<td>{html_options class="searchadvbtns" id="searchadvgroups" name="searchadvgroups" options=$grouplist selected=$selectedgroup}</td>
+				</tr>
+				<tr>
+					<th><label for="searchadvcat">Category:</label></th>
+					<td>{html_options class="searchadvbtns" id="searchadvcat" name="searchadvcat" options=$catlist selected=$selectedcat}</td>
+				</tr>
+				<tr>
+					<th><label for="searchadvsizefrom">Min/Max Size:</label></th>
+					<td>
+						{html_options id="searchadvsizefrom" name="searchadvsizefrom" options=$sizelist selected=$selectedsizefrom}
+						{html_options id="searchadvsizeto" name="searchadvsizeto" options=$sizelist selected=$selectedsizeto}
+					</td>
+				</tr>
+				<tr>
+					<th><label for="searchadvhasnfo">NFO/Comments:</label></th>
+					<td>
+						<input type="hidden" name="searchadvhasnfo" value="0">
+						<input type="checkbox" name="searchadvhasnfo" value="1">
+						<input type="hidden" name="searchadvhascomments" value="0">
+						<input type="checkbox" name="searchadvhascomments" value="1">
+						<div style="float:right;"><input type="hidden" name="search_type" value="adv" id="search_type">
+							<input id="search_adv_button" type="submit" value="search">
+						</div>
 					</td>
 				</tr>
 			</table>
 		</center>
 	</div>
 </form>
-
-{if $results|@count == 0 && $search != ""}
-	<div class="alert alert-block">
-		<h4>No result!</h4>
-		Your search - <strong>{$search|escape:'htmlall'}</strong> - did not match any releases.
-		<br/><br/>
-		Suggestions:
-		<br/><br/>
-		<ul>
-			<li>Make sure all words are spelled correctly.</li>
-			<li>Try different keywords.</li>
-			<li>Try more general keywords.</li>
-			<li>Try fewer keywords.</li>
-		</ul>
-	</div>
-{elseif $search == ""}
+{if $results|@count == 0 && ($search || $subject|| $searchadvr|| $searchadvsubject || $selectedgroup || $selectedsizefrom || $searchadvdaysold) != ""}
+	<center>
+		<div class="nosearchresults">
+			Your search did not match any releases.
+			<br><br>
+			Suggestions:
+			<br><br>
+			<ul>
+				<center><li>Make sure all words are spelled correctly.</li></center>
+				<center><li>Try different keywords.</li></center>
+				<center><li>Try more general keywords.</li></center>
+				<center><li>Try fewer keywords.</li></center>
+			</ul>
+		</div>
+	</center>
+{elseif ($search || $subject || $searchadvr || $searchadvsubject || $selectedgroup || $selectedsizefrom || $searchadvdaysold) == ""}
 {else}
-
-	{$site->adbrowse}
-	<div class="row">
-		<div class="box col-md-12">
-			<div class="box-content">
-				<form style="padding-top:10px;" id="nzb_multi_operations_form" method="get"
-					  action="{$smarty.const.WWW_TOP}/search">
-					<div class="row">
-						<div class="col-xlg-12 portlets">
-							<div class="panel">
-								<div class="panel-content pagination2">
-									<form id="nzb_multi_operations_form" action="get">
-										<div class="row">
-											<div class="col-md-8">
-												{if isset($shows)}
-													<p>
-														<a href="{$smarty.const.WWW_TOP}/series"
-														   title="View available TV series">Series List</a> |
-														<a title="Manage your shows"
-														   href="{$smarty.const.WWW_TOP}/myshows">Manage My Shows</a> |
-														<a title="All releases in your shows as an RSS feed"
-														   href="{$smarty.const.WWW_TOP}/rss?t=-3&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">Rss
-															Feed</a>
-													</p>
-												{/if}
-												<div class="nzb_multi_operations">
-													{if isset($section) && $section != ''}View:
-														<a href="{$smarty.const.WWW_TOP}/{$section}?t={$category}">Covers</a>
-														|
-														<b>List</b>
-														<br/>
-													{/if}
-													With Selected:
-													<div class="btn-group">
-														<input type="button"
-															   class="nzb_multi_operations_download btn btn-sm btn-success"
-															   value="Download NZBs"/>
-														<input type="button"
-															   class="nzb_multi_operations_cart btn btn-sm btn-info"
-															   value="Add to Cart"/>
-														{if isset($sabintegrated)}
-															<input type="button"
-																   class="nzb_multi_operations_sab btn btn-sm btn-primary"
-																   value="Send to Queue"/>
-														{/if}
-														{if isset($nzbgetintegrated)}
-															<input type="button"
-																   class="nzb_multi_operations_nzbget btn btn-sm btn-primary"
-																   value="Send to NZBGet"/>
-														{/if}
-														{if isset($isadmin)}
-															<input type="button"
-																   class="nzb_multi_operations_edit btn btn-sm btn-warning"
-																   value="Edit"/>
-															<input type="button"
-																   class="nzb_multi_operations_delete btn btn-sm btn-danger"
-																   value="Delete"/>
-														{/if}
-													</div>
-												</div>
-											</div>
-											<div class="col-md-4">
-												{$pager}
-											</div>
-										</div>
-										<table class="data table table-condensed table-striped responsive"
-											   cellspacing="0" cellpadding="0" style="table-layout: auto;">
-											<thead>
-											<tr>
-												<th><input id="chkSelectAll" type="checkbox" class="nzb_check_all"/>
-												</th>
-												<th>Name
-													<a title="Sort Descending" href="{$orderbyname_desc}">
-														<i class="fa-icon-caret-down text-muted"> </i>
-													</a>
-													<a title="Sort Ascending" href="{$orderbyname_asc}">
-														<i class="fa-icon-caret-up text-muted"> </i>
-													</a>
-												</th>
-												<th>Category</th>
-												<th>Posted</th>
-												<th>Size</th>
-												<th>Action</th>
-											</tr>
-											</thead>
-											<tbody>
-											{foreach from=$results item=result}
-												<tr id="guid{$result.guid}">
-													<td class="check"><input id="chk{$result.guid|substr:0:7}"
-																			 type="checkbox" class="nzb_check"
-																			 name="id[]" value="{$result.guid}"/></td>
-													<td>
-														<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"seourl"}">{$result.searchname|escape:"htmlall"|replace:".":" "}</a>
-														<br/>
-														<span class="label label-default">{$result.grabs}
-															Grab{if $result.grabs != 1}s{/if}</span> {if $result.nfoid > 0}
-														<span class="label label-default"><a
-																	href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
-																	class="text-muted">NFO</a>
-									</span>
-													</td>{/if}
-													<td><span class="label label-default">{$result.category_name}</span>
-													</td>
-													<td>{$result.postdate|timeago}</td>
-													<td>{$result.size|fsize_format:"MB"}</td>
-													<td>
-														<a href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"url"}"><i
-																	class="fa fa-download text-muted"></i></a>
-														<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
-																	class="fa fa-comments-o text-muted"></i></a>
-														<a href="#" class="icon_cart text-muted"><i
-																	class="fa fa-shopping-cart"></i></a>
-														{if isset($sabintegrated)}
-															<a href="#" class="icon_sab text-muted"><i
-																		class="fa fa-send-o"
-																		title="Send to my Queue"></i></a>
-														{/if}
-													</td>
-												</tr>
-											{/foreach}
-											</tbody>
-										</table>
-
-										{if $results|@count > 10}
-											<div class="row">
-												<div class="col-md-8">
-													<div class="nzb_multi_operations">
-														<small>With Selected:</small>
-														<div class="btn-group">
-															<input type="button"
-																   class="nzb_multi_operations_download btn btn-sm btn-success"
-																   value="Download NZBs"/>
-															<input type="button"
-																   class="nzb_multi_operations_cart btn btn-sm btn-info"
-																   value="Add to Cart"/>
-															{if isset($sabintegrated)}
-																<input type="button"
-																	   class="nzb_multi_operations_sab btn btn-sm btn-primary"
-																	   value="Send to Queue"/>
-															{/if}
-															{if isset($nzbgetintegrated)}
-																<input type="button"
-																	   class="nzb_multi_operations_nzbget btn btn-sm btn-primary"
-																	   value="Send to NZBGet"/>
-															{/if}
-															{if isset($isadmin)}
-																<input type="button"
-																	   class="nzb_multi_operations_edit btn btn-sm btn-warning"
-																	   value="Edit"/>
-																<input type="button"
-																	   class="nzb_multi_operations_delete btn btn-sm btn-danger"
-																	   value="Delete"/>
-															{/if}
-														</div>
-													</div>
-												</div>
-												<div class="col-md-4">
-													{$pager}
-												</div>
-											</div>
-										{/if}
-
-								</div>
-							</div>
-						</div>
+	<form style="padding-top:10px;" id="nzb_multi_operations_form" method="get" action="{$smarty.const.WWW_TOP}/search">
+		<div class="row">
+			<div class="col-md-8">
+				{if isset($shows)}
+					<p>
+						<a href="{$smarty.const.WWW_TOP}/series"
+						   title="View available TV series">Series List</a> |
+						<a title="Manage your shows"
+						   href="{$smarty.const.WWW_TOP}/myshows">Manage My Shows</a> |
+						<a title="All releases in your shows as an RSS feed"
+						   href="{$smarty.const.WWW_TOP}/rss?t=-3&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">Rss
+							Feed</a>
+					</p>
+				{/if}
+				<div class="nzb_multi_operations">
+					{if isset($section) && $section != ''}View:
+						<a href="{$smarty.const.WWW_TOP}/{$section}?t={$category}">Covers</a>
+						|
+						<b>List</b>
+						<br/>
+					{/if}
+					With Selected:
+					<div class="btn-group">
+						<input type="button"
+							   class="nzb_multi_operations_download btn btn-sm btn-success"
+							   value="Download NZBs"/>
+						<input type="button"
+							   class="nzb_multi_operations_cart btn btn-sm btn-info"
+							   value="Add to Cart"/>
+						{if isset($sabintegrated)}
+							<input type="button"
+								   class="nzb_multi_operations_sab btn btn-sm btn-primary"
+								   value="Send to Queue"/>
+						{/if}
+						{if isset($nzbgetintegrated)}
+							<input type="button"
+								   class="nzb_multi_operations_nzbget btn btn-sm btn-primary"
+								   value="Send to NZBGet"/>
+						{/if}
+						{if isset($isadmin)}
+							<input type="button"
+								   class="nzb_multi_operations_edit btn btn-sm btn-warning"
+								   value="Edit"/>
+							<input type="button"
+								   class="nzb_multi_operations_delete btn btn-sm btn-danger"
+								   value="Delete"/>
+						{/if}
 					</div>
-				</form>
+				</div>
+			</div>
+			<div class="col-md-4">
+				{$pager}
 			</div>
 		</div>
-	</div>
+		<table class="data table table-condensed table-striped responsive" id="browsetable">
+			<tr>
+				<th></th>
+				<th>
+					name<br>
+					<a title="Sort Descending" href="{$orderbyname_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbyname_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th style="text-align:center;">
+					category<br>
+					<a title="Sort Descending" href="{$orderbycat_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbycat_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th style="text-align:center;">
+					posted<br>
+					<a title="Sort Descending" href="{$orderbyposted_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbyposted_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th style="text-align:center;">
+					size<br>
+					<a title="Sort Descending" href="{$orderbysize_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbysize_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th style="text-align:center;">
+					files<br>
+					<a title="Sort Descending" href="{$orderbyfiles_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbyfiles_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th style="text-align:center;">stats<br>
+					<a title="Sort Descending" href="{$orderbystats_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbystats_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th>
+					<input id="chkSelectAll" type="checkbox" class="nzb_check_all">
+					<label for="chkSelectAll" style="display:none;">Select All</label>
+				</th>
+			</tr>
+			{foreach from=$results item=result}
+				<tr class="{cycle values=",alt"}{if $lastvisit|strtotime<$result.adddate|strtotime} new{/if}" id="guid{$result.guid}">
+					<td class="icons">
+						<div class="icon icon_nzb">
+							<a title="Download Nzb" href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"htmlall"}">&nbsp;</a>
+						</div>
+						<div class="icon icon_cart" title="Add to Cart"></div>
+						{if $sabintegrated}
+							<div class="icon icon_sab" title="Send to my Queue"></div>
+						{/if}
+					</td>
+					<td class="item">
+						<label for="chk{$result.guid|substr:0:7}">
+							<a class="title" title="View details" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">{$result.searchname|escape:"htmlall"|truncate:150:"...":true}</a></label value="Searchname">
+
+						<div class="resextra">
+							<a class="browsename" title="View details" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">
+								{$result.name|escape:"htmlall"|truncate:150:"...":true}
+							</a>
+							<div class="btns" style="float:right">
+								{release_flag($result.searchname, browse)}
+								{if $result.passwordstatus == 1}
+									<img title="RAR/ZIP Possibly Passworded." src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/lock2.png" alt="RAR/ZIP Possibly Passworded.">
+								{elseif $result.passwordstatus == 2}
+									<img title="RAR/ZIP Possibly Damaged." src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/broken.png" alt="RAR/ZIP Possibly Damaged.">
+								{elseif $result.passwordstatus == 10}
+									<img title="RAR/ZIP is Passworded." src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/lock.gif" alt="RAR/ZIP is Passworded.">
+								{/if}
+								{if $result.videostatus > 0}
+									<a
+											class="model_prev label label-default"
+											href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}"
+											title="This release has a video preview."
+											rel="preview"
+											><i class="icon-youtube-play"></i>
+									</a>
+								{/if}
+								{if $result.nfoid > 0}
+									<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}" title="View Nfo" class="modal_nfo label label-default" rel="nfo">Nfo</a>
+								{/if}
+								{if $result.imdbid > 0}
+									<a href="#" name="name{$result.imdbid}" title="View movie info" class="modal_imdb label label-default" rel="movie" >Cover</a>
+								{/if}
+								{if $result.haspreview == 1 && $userdata.canpreview == 1}
+								<a href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg" name="name{$result.guid}" title="Screenshot of {$result.searchname|escape:"htmlall"}" class="modal_prev label label-default" rel="preview">Preview</a>{/if}
+								{if $result.jpgstatus == 1 && $userdata.canpreview == 1}
+								<a href="{$smarty.const.WWW_TOP}/covers/sample/{$result.guid}_thumb.jpg" name="name{$result.guid}" title="Sample of {$result.searchname|escape:"htmlall"}" class="modal_prev label label-default" rel="preview">Sample</a>{/if}
+								{if $result.musicinfoid > 0}
+									<a href="#" name="name{$result.musicinfoid}" title="View music info" class="modal_music label label-default" rel="music" >Cover</a>
+								{/if}
+								{if $result.consoleinfoid > 0}
+									<a href="#" name="name{$result.consoleinfoid}" title="View console info" class="modal_console label label-default" rel="console" >Cover</a>
+								{/if}
+								{if $result.rageid > 0}
+									<a class="label label-default" href="{$smarty.const.WWW_TOP}/series/{$result.rageid}" title="View all episodes">View Series</a>
+								{/if}
+								{if $result.anidbid > 0}
+									<a class="label label-default" href="{$smarty.const.WWW_TOP}/anime/{$result.anidbid}" title="View all episodes">View Anime</a>
+								{/if}
+								{if $result.tvairdate != ""}
+									<span class="seriesinfo label label-default" title="{$result.guid}">Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}</span>
+								{/if}
+								{if $result.group_name != ""}
+									<a class="label label-default" href="{$smarty.const.WWW_TOP}/browse?g={$result.group_name|escape:"htmlall"}" title="Browse {$result.group_name}">{$result.group_name|escape:"htmlall"|replace:"alt.binaries.":"a.b."}</a>
+								{/if}
+							</div>
+						</div>
+					</td>
+					<td class="category">
+						<a title="Browse {$result.category_name}" href="{$smarty.const.WWW_TOP}/browse?t={$result.categoryid}">{$result.category_name}</a>
+					</td>
+					<td class="posted" title="{$result.postdate}">
+						{$result.postdate|timeago}
+					</td>
+					<td class="size">
+						{$result.size|fsize_format:"MB"}
+						{if $result.completion > 0}
+							<br>
+							{if $result.completion < 100}
+								<span class="warning">{$result.completion}%</span>
+							{else}
+								{$result.completion}%
+							{/if}
+						{/if}
+					</td>
+					<td class="files">
+						<a title="View file list" href="{$smarty.const.WWW_TOP}/filelist/{$result.guid}">{$result.totalpart}</a>
+						{if $result.rarinnerfilecount > 0}
+							<div class="rarfilelist">
+								<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/magnifier.png" alt="{$result.guid}">
+							</div>
+						{/if}
+					</td>
+					<td class="stats" nowrap="nowrap">
+						<a title="View comments" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments">{$result.comments} cmt{if $result.comments != 1}s{/if}</a>
+						<br>{$result.grabs} grab{if $result.grabs != 1}s{/if}
+					</td>
+					<td class="check">
+						<input id="chk{$result.guid|substr:0:7}" type="checkbox" class="nzb_check" value="{$result.guid}">
+					</td>
+				</tr>
+			{/foreach}
+		</table>
+		<br/>
+		<div class="row">
+			<div class="col-md-8">
+				<div class="nzb_multi_operations">
+					<small>With Selected:</small>
+					<div class="btn-group">
+						<input type="button"
+							   class="nzb_multi_operations_download btn btn-sm btn-success"
+							   value="Download NZBs"/>
+						<input type="button"
+							   class="nzb_multi_operations_cart btn btn-sm btn-info"
+							   value="Add to Cart"/>
+						{if isset($sabintegrated)}
+							<input type="button"
+								   class="nzb_multi_operations_sab btn btn-sm btn-primary"
+								   value="Send to Queue"/>
+						{/if}
+						{if isset($nzbgetintegrated)}
+							<input type="button"
+								   class="nzb_multi_operations_nzbget btn btn-sm btn-primary"
+								   value="Send to NZBGet"/>
+						{/if}
+						{if isset($isadmin)}
+							<input type="button"
+								   class="nzb_multi_operations_edit btn btn-sm btn-warning"
+								   value="Edit"/>
+							<input type="button"
+								   class="nzb_multi_operations_delete btn btn-sm btn-danger"
+								   value="Delete"/>
+						{/if}
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4">
+				{$pager}
+			</div>
+		</div>
+		<br><br><br>
+	</form>
 {/if}
\ No newline at end of file
diff --git a/www/templates/omicron/views/frontend/browse.tpl b/www/templates/omicron/views/frontend/browse.tpl
index 8c7c5d769..de97ebd46 100644
--- a/www/templates/omicron/views/frontend/browse.tpl
+++ b/www/templates/omicron/views/frontend/browse.tpl
@@ -129,17 +129,15 @@
 										<br/>
 													<span class="label label-default">{$result.grabs}
 														Grab{if $result.grabs != 1}s{/if}</span>
-										{if $result.nfoid > 0}<span class="label label-default"><a
+										{if $result.nfoid > 0}<span><a
 													href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
-													class="text-muted">NFO</a></span>{/if}
-										{if $result.jpgstatus == 1 && $userdata.canpreview == 1}<span
-												class="label label-default"><a
+													class="modal_nfo label label-default" rel="nfo">NFO</a></span>{/if}
+										{if $result.jpgstatus == 1 && $userdata.canpreview == 1}<span><a
 													href="{$smarty.const.WWW_TOP}/covers/sample/{$result.guid}_thumb.jpg"
-													class="text-muted">Sample</a></span>{/if}
-										{if $result.haspreview == 1 && $userdata.canpreview == 1}<span
-												class="label label-default"><a
+													name="name{$result.guid}" class="modal_prev label label-default" rel="preview">Sample</a></span>{/if}
+										{if $result.haspreview == 1 && $userdata.canpreview == 1}<span><a
 													href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg"
-													class="text-muted">Preview</a></span>{/if}
+													name="name{$result.guid}" class="modal_prev label label-default" rel="preview">Preview</a></span>{/if}
 										{if $result.rageid > 0}<span class="label label-default"><a
 													href="{$smarty.const.WWW_TOP}/series/{$result.rageid}"
 													class="text-muted">View TV</a></span>{/if}
diff --git a/www/templates/omicron/views/frontend/search.tpl b/www/templates/omicron/views/frontend/search.tpl
index 8dbd0510a..972346a24 100644
--- a/www/templates/omicron/views/frontend/search.tpl
+++ b/www/templates/omicron/views/frontend/search.tpl
@@ -1,3 +1,6 @@
+{if {$site->adbrowse} != ''}
+	{$site->adbrowse}
+{/if}
 <div class="header">
 	<h2>newznab-tmux > <strong>Search</strong></h2>
 
@@ -8,252 +11,364 @@
 		</ol>
 	</div>
 </div>
-
-<div style="display:none;text-align:right;">
-	<a href="#"
-	   onclick="if(jQuery(this).text()=='Advanced Search')jQuery(this).text('Basic Search');else jQuery(this).text('Advanced Search');jQuery('#sbasic,#sadvanced').toggle();return false;">{if $sadvanced}Basic{else}Advanced{/if}
-		Search</a>
+<div>
+	<center>
+		<a href="#" onclick="if (jQuery(this).text() == 'Advanced Search')
+					jQuery(this).text('Basic Search');
+				else
+					jQuery(this).text('Advanced Search');
+				jQuery('#sbasic,#sadvanced').toggle();
+				return false;">{if $sadvanced}Basic{else}Click For Advanced{/if} Search
+		</a>
+	</center>
 </div>
+<br>
 <div class="well well-sm">
-	<form method="get" action="{$smarty.const.WWW_TOP}/search">
-		<div id="sbasic" class="row">
-			<div class="col-md-6">
-				<input id="search" class="form-control" maxlength="50" name="search" value="{$search|escape:'html'}"
-					   type="search" placeholder="What are you looking for?"/>
-			</div>
-			<div class="col-md-6">
-				<input type="hidden" name="t" value="{if $category[0]!=""}{$category[0]}{else}-1{/if}" id="search_cat"/>
-				<input type="hidden" name="search_type" value="basic" id="search_type"/>
-				<input id="search_search_button" class="btn btn-primary" type="submit" value="Search"/>
-			</div>
+<form method="get" action="{$smarty.const.WWW_TOP}/search">
+	<div id="sbasic" class="row" style="text-align:center;{if $sadvanced} display:none;{/if}">
+		<div class="col-md-6">
+			<input id="search" class="form-control" maxlength="50" name="search" value="{$search|escape:'html'}"
+				   type="search" placeholder="What are you looking for?"/>
 		</div>
-	</form>
-</div>
-
+		<div class="col-md-6">
+			<input type="hidden" name="t" value="{if $category[0]!=""}{$category[0]}{else}-1{/if}" id="search_cat"/>
+			<input type="hidden" name="search_type" value="basic" id="search_type"/>
+			<input id="search_search_button" class="btn btn-primary" type="submit" value="Search"/>
+		</div>
+	</div>
+</form>
+	</div>
 <form method="get" action="{$smarty.const.WWW_TOP}/search">
 	<div id="sadvanced" {if not $sadvanced}style="display:none"{/if}>
 		<center>
 			<table class="data">
 				<tr>
-					<th><label for="searchadvr">Release Name</label>:</th>
-					<td><input id="searchadvr" name="searchadvr" value="{$searchadvr|escape:'html'}" type="text"/></td>
+					<th><label for="searchadvr">Release Name:</label></th>
+					<td><input class="searchadv" id="searchadvr" name="searchadvr" value="{$searchadvr|escape:'html'}" type="text"></td>
 				</tr>
 				<tr>
-					<th><label for="searchadvposter">Poster</label>:</th>
-					<td><input id="searchadvposter" name="searchadvposter" value="{$searchadvposter|escape:'html'}"
-							   type="text"/></td>
+					<th><label for="searchadvsubject">Usenet Name:</label></th>
+					<td><input class="searchadv" id="searchadvsubject" name="searchadvsubject" value="{$searchadvsubject|escape:'html'}" type="text"></td>
 				</tr>
 				<tr>
-					<th><label for="searchadvgroups">Group</label>:</th>
-					<td>{html_options id="searchadvgroups" name=searchadvgroups options=$grouplist selected=$selectedgroup}</td>
+					<th><label for="searchadvposter">Poster:</label></th>
+					<td><input class="searchadv" id="searchadvposter" name="searchadvposter" value="{$searchadvposter|escape:'html'}" type="text"></td>
 				</tr>
 				<tr>
-					<th><label for="searchadvcat">Category</label>:</th>
-					<td>{html_options id="searchadvcat" name=searchadvcat options=$catlist selected=$selectedcat}</td>
-				</tr>
-				<tr>
-					<th><label for="searchadvsizefrom">Size Between</label>:</th>
+					<th><label for="searchadvdaysnew">Min age(days):</label></th>
 					<td>
-						{html_options id="searchadvsizefrom" name=searchadvsizefrom options=$sizelist selected=$selectedsizefrom}
-						and {html_options id="searchadvsizeto" name=searchadvsizeto options=$sizelist selected=$selectedsizeto}
+						<input class="searchdaysinput" id="searchadvdaysnew" name="searchadvdaysnew" value="{$searchadvdaysnew|escape:'html'}" type="text">
 					</td>
 				</tr>
 				<tr>
-					<th></th>
+					<th><label for="searchadvdaysold">Max age(days):</label></th>
 					<td>
-						<input type="hidden" name="search_type" value="adv" id="search_type"/>
-						<input id="search_adv_button" type="submit" value="search"/>
+						<input class="searchdaysinput" id="searchadvdaysold" name="searchadvdaysold" value="{$searchadvdaysold|escape:'html'}" type="text">
+					</td>
+				</tr>
+				<tr>
+					<th><label for="searchadvgroups">Group:</label></th>
+					<td>{html_options class="searchadvbtns" id="searchadvgroups" name="searchadvgroups" options=$grouplist selected=$selectedgroup}</td>
+				</tr>
+				<tr>
+					<th><label for="searchadvcat">Category:</label></th>
+					<td>{html_options class="searchadvbtns" id="searchadvcat" name="searchadvcat" options=$catlist selected=$selectedcat}</td>
+				</tr>
+				<tr>
+					<th><label for="searchadvsizefrom">Min/Max Size:</label></th>
+					<td>
+						{html_options id="searchadvsizefrom" name="searchadvsizefrom" options=$sizelist selected=$selectedsizefrom}
+						{html_options id="searchadvsizeto" name="searchadvsizeto" options=$sizelist selected=$selectedsizeto}
+					</td>
+				</tr>
+				<tr>
+					<th><label for="searchadvhasnfo">NFO/Comments:</label></th>
+					<td>
+						<input type="hidden" name="searchadvhasnfo" value="0">
+						<input type="checkbox" name="searchadvhasnfo" value="1">
+						<input type="hidden" name="searchadvhascomments" value="0">
+						<input type="checkbox" name="searchadvhascomments" value="1">
+						<div style="float:right;"><input type="hidden" name="search_type" value="adv" id="search_type">
+							<input id="search_adv_button" type="submit" value="search">
+						</div>
 					</td>
 				</tr>
 			</table>
 		</center>
 	</div>
 </form>
-
-{if $results|@count == 0 && $search != ""}
-	<div class="alert alert-block">
-		<h4>No result!</h4>
-		Your search - <strong>{$search|escape:'htmlall'}</strong> - did not match any releases.
-		<br/><br/>
-		Suggestions:
-		<br/><br/>
-		<ul>
-			<li>Make sure all words are spelled correctly.</li>
-			<li>Try different keywords.</li>
-			<li>Try more general keywords.</li>
-			<li>Try fewer keywords.</li>
-		</ul>
-	</div>
-{elseif $search == ""}
+{if $results|@count == 0 && ($search || $subject|| $searchadvr|| $searchadvsubject || $selectedgroup || $selectedsizefrom || $searchadvdaysold) != ""}
+	<center>
+		<div class="nosearchresults">
+			Your search did not match any releases.
+			<br><br>
+			Suggestions:
+			<br><br>
+			<ul>
+				<center><li>Make sure all words are spelled correctly.</li></center>
+				<center><li>Try different keywords.</li></center>
+				<center><li>Try more general keywords.</li></center>
+				<center><li>Try fewer keywords.</li></center>
+			</ul>
+		</div>
+	</center>
+{elseif ($search || $subject || $searchadvr || $searchadvsubject || $selectedgroup || $selectedsizefrom || $searchadvdaysold) == ""}
 {else}
-
-	{$site->adbrowse}
-	<div class="row">
-		<div class="box col-md-12">
-			<div class="box-content">
-				<form style="padding-top:10px;" id="nzb_multi_operations_form" method="get"
-					  action="{$smarty.const.WWW_TOP}/search">
-					<div class="row">
-						<div class="col-xlg-12 portlets">
-							<div class="panel">
-								<div class="panel-content pagination2">
-									<form id="nzb_multi_operations_form" action="get">
-										<div class="row">
-											<div class="col-md-8">
-												{if isset($shows)}
-													<p>
-														<a href="{$smarty.const.WWW_TOP}/series"
-														   title="View available TV series">Series List</a> |
-														<a title="Manage your shows"
-														   href="{$smarty.const.WWW_TOP}/myshows">Manage My Shows</a> |
-														<a title="All releases in your shows as an RSS feed"
-														   href="{$smarty.const.WWW_TOP}/rss?t=-3&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">Rss
-															Feed</a>
-													</p>
-												{/if}
-												<div class="nzb_multi_operations">
-													{if isset($section) && $section != ''}View:
-														<a href="{$smarty.const.WWW_TOP}/{$section}?t={$category}">Covers</a>
-														|
-														<b>List</b>
-														<br/>
-													{/if}
-													With Selected:
-													<div class="btn-group">
-														<input type="button"
-															   class="nzb_multi_operations_download btn btn-sm btn-success"
-															   value="Download NZBs"/>
-														<input type="button"
-															   class="nzb_multi_operations_cart btn btn-sm btn-info"
-															   value="Add to Cart"/>
-														{if isset($sabintegrated)}
-															<input type="button"
-																   class="nzb_multi_operations_sab btn btn-sm btn-primary"
-																   value="Send to Queue"/>
-														{/if}
-														{if isset($nzbgetintegrated)}
-															<input type="button"
-																   class="nzb_multi_operations_nzbget btn btn-sm btn-primary"
-																   value="Send to NZBGet"/>
-														{/if}
-														{if isset($isadmin)}
-															<input type="button"
-																   class="nzb_multi_operations_edit btn btn-sm btn-warning"
-																   value="Edit"/>
-															<input type="button"
-																   class="nzb_multi_operations_delete btn btn-sm btn-danger"
-																   value="Delete"/>
-														{/if}
-													</div>
-												</div>
-											</div>
-											<div class="col-md-4">
-												{$pager}
-											</div>
-										</div>
-										<table class="data table table-condensed table-striped responsive"
-											   cellspacing="0" cellpadding="0" style="table-layout: auto;">
-											<thead>
-											<tr>
-												<th><input id="chkSelectAll" type="checkbox" class="nzb_check_all"/>
-												</th>
-												<th>Name
-													<a title="Sort Descending" href="{$orderbyname_desc}">
-														<i class="fa-icon-caret-down text-muted"> </i>
-													</a>
-													<a title="Sort Ascending" href="{$orderbyname_asc}">
-														<i class="fa-icon-caret-up text-muted"> </i>
-													</a>
-												</th>
-												<th>Category</th>
-												<th>Posted</th>
-												<th>Size</th>
-												<th>Action</th>
-											</tr>
-											</thead>
-											<tbody>
-											{foreach from=$results item=result}
-												<tr id="guid{$result.guid}">
-													<td class="check"><input id="chk{$result.guid|substr:0:7}"
-																			 type="checkbox" class="nzb_check"
-																			 name="id[]" value="{$result.guid}"/></td>
-													<td>
-														<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"seourl"}">{$result.searchname|escape:"htmlall"|replace:".":" "}</a>
-														<br/>
-														<span class="label label-default">{$result.grabs}
-															Grab{if $result.grabs != 1}s{/if}</span> {if $result.nfoid > 0}
-														<span class="label label-default"><a
-																	href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
-																	class="text-muted">NFO</a>
-									</span>
-													</td>{/if}
-													<td><span class="label label-default">{$result.category_name}</span>
-													</td>
-													<td>{$result.postdate|timeago}</td>
-													<td>{$result.size|fsize_format:"MB"}</td>
-													<td>
-														<a href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"url"}"><i
-																	class="fa fa-download text-muted"></i></a>
-														<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
-																	class="fa fa-comments-o text-muted"></i></a>
-														<a href="#" class="icon_cart text-muted"><i
-																	class="fa fa-shopping-cart"></i></a>
-														{if isset($sabintegrated)}
-															<a href="#" class="icon_sab text-muted"><i
-																		class="fa fa-send-o"
-																		title="Send to my Queue"></i></a>
-														{/if}
-													</td>
-												</tr>
-											{/foreach}
-											</tbody>
-										</table>
-
-										{if $results|@count > 10}
-											<div class="row">
-												<div class="col-md-8">
-													<div class="nzb_multi_operations">
-														<small>With Selected:</small>
-														<div class="btn-group">
-															<input type="button"
-																   class="nzb_multi_operations_download btn btn-sm btn-success"
-																   value="Download NZBs"/>
-															<input type="button"
-																   class="nzb_multi_operations_cart btn btn-sm btn-info"
-																   value="Add to Cart"/>
-															{if isset($sabintegrated)}
-																<input type="button"
-																	   class="nzb_multi_operations_sab btn btn-sm btn-primary"
-																	   value="Send to Queue"/>
-															{/if}
-															{if isset($nzbgetintegrated)}
-																<input type="button"
-																	   class="nzb_multi_operations_nzbget btn btn-sm btn-primary"
-																	   value="Send to NZBGet"/>
-															{/if}
-															{if isset($isadmin)}
-																<input type="button"
-																	   class="nzb_multi_operations_edit btn btn-sm btn-warning"
-																	   value="Edit"/>
-																<input type="button"
-																	   class="nzb_multi_operations_delete btn btn-sm btn-danger"
-																	   value="Delete"/>
-															{/if}
-														</div>
-													</div>
-												</div>
-												<div class="col-md-4">
-													{$pager}
-												</div>
-											</div>
-										{/if}
-
-								</div>
-							</div>
-						</div>
+	<form style="padding-top:10px;" id="nzb_multi_operations_form" method="get" action="{$smarty.const.WWW_TOP}/search">
+		<div class="row">
+			<div class="col-md-8">
+				{if isset($shows)}
+					<p>
+						<a href="{$smarty.const.WWW_TOP}/series"
+						   title="View available TV series">Series List</a> |
+						<a title="Manage your shows"
+						   href="{$smarty.const.WWW_TOP}/myshows">Manage My Shows</a> |
+						<a title="All releases in your shows as an RSS feed"
+						   href="{$smarty.const.WWW_TOP}/rss?t=-3&amp;dl=1&amp;i={$userdata.id}&amp;r={$userdata.rsstoken}">Rss
+							Feed</a>
+					</p>
+				{/if}
+				<div class="nzb_multi_operations">
+					{if isset($section) && $section != ''}View:
+						<a href="{$smarty.const.WWW_TOP}/{$section}?t={$category}">Covers</a>
+						|
+						<b>List</b>
+						<br/>
+					{/if}
+					With Selected:
+					<div class="btn-group">
+						<input type="button"
+							   class="nzb_multi_operations_download btn btn-sm btn-success"
+							   value="Download NZBs"/>
+						<input type="button"
+							   class="nzb_multi_operations_cart btn btn-sm btn-info"
+							   value="Add to Cart"/>
+						{if isset($sabintegrated)}
+							<input type="button"
+								   class="nzb_multi_operations_sab btn btn-sm btn-primary"
+								   value="Send to Queue"/>
+						{/if}
+						{if isset($nzbgetintegrated)}
+							<input type="button"
+								   class="nzb_multi_operations_nzbget btn btn-sm btn-primary"
+								   value="Send to NZBGet"/>
+						{/if}
+						{if isset($isadmin)}
+							<input type="button"
+								   class="nzb_multi_operations_edit btn btn-sm btn-warning"
+								   value="Edit"/>
+							<input type="button"
+								   class="nzb_multi_operations_delete btn btn-sm btn-danger"
+								   value="Delete"/>
+						{/if}
 					</div>
-				</form>
+				</div>
+			</div>
+			<div class="col-md-4">
+				{$pager}
 			</div>
 		</div>
-	</div>
+		<table class="data table table-condensed table-striped responsive" id="browsetable">
+			<tr>
+				<th></th>
+				<th>
+					name<br>
+					<a title="Sort Descending" href="{$orderbyname_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbyname_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th style="text-align:center;">
+					category<br>
+					<a title="Sort Descending" href="{$orderbycat_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbycat_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th style="text-align:center;">
+					posted<br>
+					<a title="Sort Descending" href="{$orderbyposted_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbyposted_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th style="text-align:center;">
+					size<br>
+					<a title="Sort Descending" href="{$orderbysize_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbysize_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th style="text-align:center;">
+					files<br>
+					<a title="Sort Descending" href="{$orderbyfiles_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbyfiles_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th style="text-align:center;">stats<br>
+					<a title="Sort Descending" href="{$orderbystats_desc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_down.gif" alt="Sort Descending">
+					</a>
+					<a title="Sort Ascending" href="{$orderbystats_asc}">
+						<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/sorting/arrow_up.gif" alt="Sort Ascending">
+					</a>
+				</th>
+				<th>
+					<input id="chkSelectAll" type="checkbox" class="nzb_check_all">
+					<label for="chkSelectAll" style="display:none;">Select All</label>
+				</th>
+			</tr>
+			{foreach from=$results item=result}
+				<tr class="{cycle values=",alt"}{if $lastvisit|strtotime<$result.adddate|strtotime} new{/if}" id="guid{$result.guid}">
+					<td class="icons">
+						<div class="icon icon_nzb">
+							<a title="Download Nzb" href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"htmlall"}">&nbsp;</a>
+						</div>
+						<div class="icon icon_cart" title="Add to Cart"></div>
+						{if $sabintegrated}
+							<div class="icon icon_sab" title="Send to my Queue"></div>
+						{/if}
+					</td>
+					<td class="item">
+						<label for="chk{$result.guid|substr:0:7}">
+							<a class="title" title="View details" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">{$result.searchname|escape:"htmlall"|truncate:150:"...":true}</a></label value="Searchname">
+
+						<div class="resextra">
+							<a class="browsename" title="View details" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">
+								{$result.name|escape:"htmlall"|truncate:150:"...":true}
+							</a>
+							<div class="btns" style="float:right">
+								{release_flag($result.searchname, browse)}
+								{if $result.passwordstatus == 1}
+									<img title="RAR/ZIP Possibly Passworded." src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/lock2.png" alt="RAR/ZIP Possibly Passworded.">
+								{elseif $result.passwordstatus == 2}
+									<img title="RAR/ZIP Possibly Damaged." src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/broken.png" alt="RAR/ZIP Possibly Damaged.">
+								{elseif $result.passwordstatus == 10}
+									<img title="RAR/ZIP is Passworded." src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/lock.gif" alt="RAR/ZIP is Passworded.">
+								{/if}
+								{if $result.videostatus > 0}
+									<a
+											class="model_prev label label-default"
+											href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}"
+											title="This release has a video preview."
+											rel="preview"
+											><i class="icon-youtube-play"></i>
+									</a>
+								{/if}
+								{if $result.nfoid > 0}
+									<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}" title="View Nfo" class="modal_nfo label label-default" rel="nfo">Nfo</a>
+								{/if}
+								{if $result.imdbid > 0}
+									<a href="#" name="name{$result.imdbid}" title="View movie info" class="modal_imdb label label-default" rel="movie" >Cover</a>
+								{/if}
+								{if $result.haspreview == 1 && $userdata.canpreview == 1}
+								<a href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg" name="name{$result.guid}" title="Screenshot of {$result.searchname|escape:"htmlall"}" class="modal_prev label label-default" rel="preview">Preview</a>{/if}
+								{if $result.jpgstatus == 1 && $userdata.canpreview == 1}
+								<a href="{$smarty.const.WWW_TOP}/covers/sample/{$result.guid}_thumb.jpg" name="name{$result.guid}" title="Sample of {$result.searchname|escape:"htmlall"}" class="modal_prev label label-default" rel="preview">Sample</a>{/if}
+								{if $result.musicinfoid > 0}
+									<a href="#" name="name{$result.musicinfoid}" title="View music info" class="modal_music label label-default" rel="music" >Cover</a>
+								{/if}
+								{if $result.consoleinfoid > 0}
+									<a href="#" name="name{$result.consoleinfoid}" title="View console info" class="modal_console label label-default" rel="console" >Cover</a>
+								{/if}
+								{if $result.rageid > 0}
+									<a class="label label-default" href="{$smarty.const.WWW_TOP}/series/{$result.rageid}" title="View all episodes">View Series</a>
+								{/if}
+								{if $result.anidbid > 0}
+									<a class="label label-default" href="{$smarty.const.WWW_TOP}/anime/{$result.anidbid}" title="View all episodes">View Anime</a>
+								{/if}
+								{if $result.tvairdate != ""}
+									<span class="seriesinfo label label-default" title="{$result.guid}">Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}</span>
+								{/if}
+								{if $result.group_name != ""}
+									<a class="label label-default" href="{$smarty.const.WWW_TOP}/browse?g={$result.group_name|escape:"htmlall"}" title="Browse {$result.group_name}">{$result.group_name|escape:"htmlall"|replace:"alt.binaries.":"a.b."}</a>
+								{/if}
+							</div>
+						</div>
+					</td>
+					<td class="category">
+						<a title="Browse {$result.category_name}" href="{$smarty.const.WWW_TOP}/browse?t={$result.categoryid}">{$result.category_name}</a>
+					</td>
+					<td class="posted" title="{$result.postdate}">
+						{$result.postdate|timeago}
+					</td>
+					<td class="size">
+						{$result.size|fsize_format:"MB"}
+						{if $result.completion > 0}
+							<br>
+							{if $result.completion < 100}
+								<span class="warning">{$result.completion}%</span>
+							{else}
+								{$result.completion}%
+							{/if}
+						{/if}
+					</td>
+					<td class="files">
+						<a title="View file list" href="{$smarty.const.WWW_TOP}/filelist/{$result.guid}">{$result.totalpart}</a>
+						{if $result.rarinnerfilecount > 0}
+							<div class="rarfilelist">
+								<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/magnifier.png" alt="{$result.guid}">
+							</div>
+						{/if}
+					</td>
+					<td class="stats" nowrap="nowrap">
+						<a title="View comments" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments">{$result.comments} cmt{if $result.comments != 1}s{/if}</a>
+						<br>{$result.grabs} grab{if $result.grabs != 1}s{/if}
+					</td>
+					<td class="check">
+						<input id="chk{$result.guid|substr:0:7}" type="checkbox" class="nzb_check" value="{$result.guid}">
+					</td>
+				</tr>
+			{/foreach}
+		</table>
+		<br/>
+		<div class="row">
+			<div class="col-md-8">
+				<div class="nzb_multi_operations">
+					<small>With Selected:</small>
+					<div class="btn-group">
+						<input type="button"
+							   class="nzb_multi_operations_download btn btn-sm btn-success"
+							   value="Download NZBs"/>
+						<input type="button"
+							   class="nzb_multi_operations_cart btn btn-sm btn-info"
+							   value="Add to Cart"/>
+						{if isset($sabintegrated)}
+							<input type="button"
+								   class="nzb_multi_operations_sab btn btn-sm btn-primary"
+								   value="Send to Queue"/>
+						{/if}
+						{if isset($nzbgetintegrated)}
+							<input type="button"
+								   class="nzb_multi_operations_nzbget btn btn-sm btn-primary"
+								   value="Send to NZBGet"/>
+						{/if}
+						{if isset($isadmin)}
+							<input type="button"
+								   class="nzb_multi_operations_edit btn btn-sm btn-warning"
+								   value="Edit"/>
+							<input type="button"
+								   class="nzb_multi_operations_delete btn btn-sm btn-danger"
+								   value="Delete"/>
+						{/if}
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4">
+				{$pager}
+			</div>
+		</div>
+		<br><br><br>
+	</form>
 {/if}
\ No newline at end of file