clean theme admin selection

1 files changed, 22 insertions, 21 deletions

diff --git a/templates/admin_themes_manager.tpl b/templates/admin_themes_manager.tpl
index af25250..1bfc227 100644
--- a/templates/admin_themes_manager.tpl
+++ b/templates/admin_themes_manager.tpl
@@ -10,30 +10,31 @@
 			<div id="themeapprove">
 				<h1>{tr}Confirm Selection{/tr}</h1>
 				<p>{tr}The settings you have chosen has not been applied to the site yet. This allows you to test the styles before applying them to your site. To accept the change, please click on the accept button below{/tr}<p>
-				<a href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php">{biticon ipackage=icons iname="large/dialog-cancel" iexplain="Cancel"}</a>
-				<a href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style={$smarty.request.site_style}&amp;style_variation={$smarty.request.style_variation}&amp;site_style_layout={$smarty.request.site_style_layout}&amp;approved=1">{biticon ipackage=icons iname="large/dialog-ok" iexplain="Accept"}</a>
+				<a class="btn btn-primary" href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style={$smarty.request.site_style}&amp;style_variation={$smarty.request.style_variation}&amp;site_style_layout={$smarty.request.site_style_layout}&amp;approved=1">{booticon ipackage=icons iname="icon-ok"}{tr}Accept{/tr}</a>
+				<a class="btn pull-right" href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php">{booticon ipackage=icons iname="icon-remove" }{tr}Cancel{/tr}</a>
 			</div>
 		{/if}
 
 		{jstabs}
-			{jstab title="Site Style"}
-				{legend legend="Pick Site Style"}
+			{jstab title="Site Theme"}
+				{legend legend="Pick Site Theme"}
 					<ul class="data">
 						{foreach from=$stylesList item=s}
-							<li class="control-group item">
-								<h2 {if $style eq $s.style}class="highlight"{/if}>
+							<li class="item">
+								<legend {if $style eq $s.style}class="highlight"{/if}>
 									{if $style eq $s.style}
-										{booticon iname="icon-ok"  ipackage="icons"  iexplain="Current Style"}&nbsp;
+										{booticon iname="icon-ok"  ipackage="icons"  iexplain="Current Theme"}&nbsp;
 									{/if}
 									<a href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style={$s.style}">{$s.style|replace:"_":" "}</a>
-								</h2>
+								</legend>
 
 								{if $s.style_info.preview}
-									<a href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style={$s.style}">
+									<a class="floatright" href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style={$s.style}">
 										<img class="thumb" src="{$s.style_info.preview}" alt="{tr}Theme Preview{/tr}" title="{$s.style}" />
 									</a>
 								{/if}
 
+								<a class="btn btn-primary" href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style={$s.style}">{tr}Select{/tr} {$s.style|replace:"_":" "}</a>
 								{$s.style_info.description}
 								{if $s.alternate}
 									<h3>{tr}Variations of this style{/tr}</h3>
@@ -51,20 +52,20 @@
 				{/legend}
 			{/jstab}
 
-			{jstab title="Style Layout"}
+			{jstab title="Theme Layout"}
 				<p class="help">
 					{tr}Here you can pick the layout of the site style. this will basically rearrange the positions of the three columns.
 					<br />Please note that not all styles support this method of layout selection. Themes that support the style layout selection have a note of it in the description.
-					<br />For more information on the layouts and how to tweak them, please visit the <a class="external" href="http://www.bitweaver.org/wiki/StyleLayouts">StyleLayouts</a>{/tr}
+					<br />For more information on the layouts and how to tweak them, please visit the <a class="external" href="http://www.bitweaver.org/wiki/ThemeLayouts">ThemeLayouts</a>{/tr}
 				</p>
 
-				{legend legend="Pick Style Layout"}
+				{legend legend="Pick Theme Layout"}
 					<ul id="layoutgala">
 						{foreach from=$styleLayouts key=key item=layout}
 							<li class="{cycle values="even,odd"}">
 								<a {if $gBitSystem->getConfig(site_style_layout) == $key}class="highlight" {/if}href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_style_layout={$key}">
 									{if $layout.gif}<img src="{$smarty.const.THEMES_PKG_URL}layouts/{$layout.gif}" alt="{tr}Layout{/tr}: {$key}" title="{tr}Layout{/tr}: {$key}"/><br />{/if}
-									{if $gBitSystem->getConfig(site_style_layout) == $key}{booticon iname="icon-ok"  ipackage="icons"  iexplain="Current Style Layout"}{/if}
+									{if $gBitSystem->getConfig(site_style_layout) == $key}{booticon iname="icon-ok"  ipackage="icons"  iexplain="Current Theme Layout"}{/if}
 									{$key|replace:"_":" "}
 									{if $layout.txt}<br />{include file="`$smarty.const.THEMES_PKG_PATH`layouts/`$layout.txt`"}{/if}
 								</a>
@@ -84,24 +85,24 @@
 				</ul>
 			{/jstab}
 
-			{jstab title="Icon Style"}
-				{legend legend="Pick Icon Style"}
+			{jstab title="Icon Theme"}
+				{legend legend="Pick Icon Theme"}
 					<p class="help">
-						Icon themes can be downloaded from <a class="external" href="http://art.gnome.org/themes/icon/">Gnome</a> or <a class="external" href="http://www.kde-look.org/?xcontentmode=27">KDE</a> as long as they adhere to the <a class="external" href="http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html">Icon Naming Specifications</a>. For more information, please visit <a class="external" href="http://www.bitweaver.org/wiki/IconStyles">IconStyles</a>.
+						Icon themes can be downloaded from <a class="external" href="http://art.gnome.org/themes/icon/">Gnome</a> or <a class="external" href="http://www.kde-look.org/?xcontentmode=27">KDE</a> as long as they adhere to the <a class="external" href="http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html">Icon Naming Specifications</a>. For more information, please visit <a class="external" href="http://www.bitweaver.org/wiki/IconThemes">IconThemes</a>.
 					</p>
 					<p class="help">
 						If you are a developer and you want to view a list of available icons, you can do this with the {smartlink ititle="Icon Browser" ifile="icon_browser.php"}.
 					</p>
 
 					<ul class="data">
-						{foreach from=$iconStyles item=s}
-							<li class="control-group item">
-								<h2 {if $style eq $s.style}class="highlight"{/if}>
+						{foreach from=$iconThemes item=s}
+							<li class="item">
+								<legend {if $style eq $s.style}class="highlight"{/if}>
 									{if $gBitSystem->getConfig(site_icon_style) eq $s.style}
-										{booticon iname="icon-ok"  ipackage="icons"  iexplain="Current Style"}&nbsp;
+										{booticon iname="icon-ok"  ipackage="icons"  iexplain="Current Theme"}&nbsp;
 									{/if}
 									<a href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_icon_style={$s.style}">{$s.style|replace:"_":" "}</a>
-								</h2>
+								</legend>
 
 								{if $s.style_info.preview}
 									<a href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php?site_icon_style={$s.style}">