From 6532b5e21df08e3265f7d2b7c114d5b7bb8cf42f Mon Sep 17 00:00:00 2001
From: lsces <lester@lsces.co.uk>
Date: Sat, 31 May 2014 23:13:59 +0100
Subject: Modify templates for ink framework

---
 templates/admin_search.tpl      | 14 +++++++-------
 templates/menu_search.tpl       |  6 +++++-
 templates/menu_search_admin.tpl |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/templates/admin_search.tpl b/templates/admin_search.tpl
index 9928648..883f5f7 100644
--- a/templates/admin_search.tpl
+++ b/templates/admin_search.tpl
@@ -7,7 +7,7 @@
 			<input type="hidden" name="page" value="{$page}" />
 
 			{foreach from=$formSearchToggles key=item item=output}
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -17,7 +17,7 @@
 			{/foreach}
 
 			{foreach from=$formSearchInts key=item item=output}
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label=$output.label for=$item}
 					{forminput}
 						<input size="5" type="text" name="{$item}" id="{$item}" value="{$output.value|escape}" />
@@ -35,7 +35,7 @@
 	{jstab title="Searchable Content"}
 		{form legend="Searchable Content"}
 			{foreach from=$formSearchTypeToggles key=item item=output}
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
@@ -45,7 +45,7 @@
 			{/foreach}
 
 			<input type="hidden" name="page" value="{$page}" />
-			<div class="control-group">
+			<div class="control-group column-group gutters">
 				{formlabel label="Searchable Content"}
 				{forminput}
 					{html_checkboxes options=$formSearchable.guids value=y name=searchable_content separator="<br />" checked=$formSearchable.checked}
@@ -65,19 +65,19 @@
 
 		{form legend="Delete / Rebuild Index"}
 			<input type="hidden" name="page" value="{$page}" />
-			<div class="control-group">
+			<div class="control-group column-group gutters">
 				{formlabel label="Clear Searchwords:" for="clearss"}
 				{forminput}
 					<input type="submit" name="del_searchwords" value="{tr}Clear Searchwords{/tr}"/>
 					{formhelp note="This clears out the cache of recently searched for terms and the syllables derived from those search terms."}
 				{/forminput}
 			</div>
-			<div class="control-group">
+			<div class="control-group column-group gutters">
 				{formfeedback warning='Deleting the index will render search useless until content is reindexed.'}
 				{formfeedback warning='Rebuilding the Index <strong>could take a long time</strong> depending on how much content you have. If this is a large site, you may want to do this during off-peak hours.'}
 				{formfeedback warning='Note: timeout setting will automatically be set to 5 minutes for reindexing operations.'}
 			</div>
-			<div class="control-group">
+			<div class="control-group column-group gutters">
 				{formlabel label="Perform action on:" for="where"}
 				{forminput}
 					<select name="where" id="where">
diff --git a/templates/menu_search.tpl b/templates/menu_search.tpl
index 3a83d7c..2d3b6d9 100644
--- a/templates/menu_search.tpl
+++ b/templates/menu_search.tpl
@@ -1,3 +1,7 @@
 {strip}
-<ul><li><a class="item" href="{$smarty.const.SEARCH_PKG_URL}index.php">{biticon iexplain=Search iname=system-search ilocation=menu}</a></li></ul>
+{if $packageMenuTitle}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if}
+<ul class="{$packageMenuClass}">
+<li><a class="item" href="{$smarty.const.SEARCH_PKG_URL}index.php">{booticon iexplain=Search iname="icon-search" ilocation=menu}</a></li>
+
+</ul>
 {/strip}
diff --git a/templates/menu_search_admin.tpl b/templates/menu_search_admin.tpl
index 78d0911..fab8fbb 100644
--- a/templates/menu_search_admin.tpl
+++ b/templates/menu_search_admin.tpl
@@ -1,5 +1,5 @@
 {strip}
-<ul>
+<ul class="{$packageMenuClass}">
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=search" title="{tr}Search{/tr}" >{tr}Search{/tr} Settings</a></li>
 	{if $gBitSystem->isFeatureActive( 'search_stats' )}
 		<li><a class="item" href="{$smarty.const.SEARCH_PKG_URL}stats.php">{tr}Search Statistics{/tr}</a></li>
-- 
cgit v1.3