simplify and clean up templates

1 files changed, 53 insertions, 79 deletions

diff --git a/templates/install_checks.tpl b/templates/install_checks.tpl
index 4f69f54..83295cd 100644
--- a/templates/install_checks.tpl
+++ b/templates/install_checks.tpl
@@ -5,11 +5,7 @@
 
 	<h3>Required Settings</h3>
 
-	<div class="row">
-		<p>
-			The settings below are required by bitweaver to run. If any of these settings are not met, you will have to change these before you can continue with the installation process.
-		</p>
-	</div>
+	<p>The settings below are required by bitweaver to run. If any of these settings are not met, you will have to change these before you can continue with the installation process.</p>
 
 	<div class="row">
 		{formlabel label="Required settings"}
@@ -27,35 +23,29 @@
 		{/forminput}
 	</div>
 
-	<div class="row">
-		<ul class="result">
-			{if $error}
-				<li class="error">
-					{biticon ipackage=liberty iname=error iexplain=error}
-					Before you can continue with the installation, you must rectify the <strong style="color:red;">problems listed in red</strong>.
-				</li>
-			{else}
-				<li class="success">
-					{biticon ipackage=liberty iname=success iexplain=success}
-					Your system meets all the requirements.
-				</li>
-			{/if}
-		</ul>
-	</div>
+	{if $error}
+		<p class="clear error">
+			{biticon ipackage=liberty iname=error iexplain=error}
+			Before you can continue with the installation, you must rectify the <strong style="color:red;">problems listed in red</strong>.
+		</p>
+	{else}
+		<p class="clear success">
+			{biticon ipackage=liberty iname=success iexplain=success}
+			Your system meets all the requirements.
+		</p>
+	{/if}
 
 	<h3>Recommended Extensions</h3>
 
-	<div class="row">
-		<p>
-			Virtually all settings below this point can be adjusted by changing appropriate values in your php.ini file.
-			If you should have problems setting these, please consult the documentation in the php.ini file itself
-			and the <a class="external" href="http://www.php.net">PHP HomePage</a>.
-		</p>
-		<p>
-			bitweaver takes advantage of particular PHP extensions for full functionality.
-			If any of these extensions are not available to bitweaver, particular features might not work and it might even render particular packages useless.
-		</p>
-	</div>
+	<p class="clear">
+		Virtually all settings below this point can be adjusted by changing appropriate values in your php.ini file.
+		If you should have problems setting these, please consult the documentation in the php.ini file itself
+		and the <a class="external" href="http://www.php.net">PHP HomePage</a>.
+	</p>
+	<p>
+		bitweaver takes advantage of particular PHP extensions for full functionality.
+		If any of these extensions are not available to bitweaver, particular features might not work and it might even render particular packages useless.
+	</p>
 
 	<div class="row">
 		{formlabel label="Thoroughly recommended extensions"}
@@ -70,21 +60,17 @@
 		{/forminput}
 	</div>
 
-	<div class="row">
-		<ul class="result">
-			{if $warning}
-				<li class="warning">
-					{biticon ipackage=liberty iname=warning iexplain=warning}
-					Before you continue, we suggest that you try and install the mentioned extensions. If you can not do so, please bear in mind that these extensions can be installed at any time and might enhance your bitweaver experience.
-				</li>
-			{else}
-				<li class="success">
-					{biticon ipackage=liberty iname=success iexplain=success}
-					All recommended extensions are installed.
-				</li>
-			{/if}
-		</ul>
-	</div>
+	{if $warning}
+		<p class="clear warning">
+			{biticon ipackage=liberty iname=warning iexplain=warning}
+			Before you continue, we suggest that you try and install the mentioned extensions. If you can not do so, please bear in mind that these extensions can be installed at any time and might enhance your bitweaver experience.
+		</p>
+	{else}
+		<p class="clear success">
+			{biticon ipackage=liberty iname=success iexplain=success}
+			All recommended extensions are installed.
+		</p>
+	{/if}
 
 	<h3>Recommended Settings</h3>
 
@@ -103,13 +89,9 @@
 					<th scope="col">Setting</th>
 					<th scope="col">Should be</th>
 					<th scope="col">Actual</th>
-					<th scope="col" style="width:1px;"></th>
 				</tr>
 				{foreach from=`$recommended` item="check"}
 					<tr class="{if $check.passed eq 'y'}note{else}warning{/if}">
-						<td><abbr title="php.ini setting: {$check.1}">{$check.0}</abbr></td>
-						<td>{$check.shouldbe}</td>
-						<td>{$check.actual}</td>
 						<td>
 							{if $check.passed}
 								{biticon ipackage=liberty iname=success iexplain=success}
@@ -117,42 +99,37 @@
 								{biticon ipackage=liberty iname=warning iexplain=warning}
 								{assign var=rec_warning value=true}
 							{/if}
+							<abbr title="php.ini setting: {$check.1}">{$check.0}</abbr>
 						</td>
+						<td>{$check.shouldbe}</td>
+						<td>{$check.actual}</td>
 					</tr>
 				{/foreach}
 			</table>
 		{/forminput}
 	</div>
 
-	<div class="row">
-		<ul class="result">
-			{if $memory_warning}
-				<li class="warning">
-					{biticon ipackage=liberty iname=warning iexplain=warning}
-					Your memory limit settings are rather low. bitweaver requires at least 8MB memory to run, even having a limit of 8MB might cause undesired results. If you end up laoding blank pages, it might be the <strong>memory_limit</strong> setting in your <strong>php.ini</strong> file. if possible, please get your host to increase the limit to at least <strong>16MB</strong>.
-				</li>
-			{/if}
-			{if $rec_warning}
-				<li class="warning">
-					{biticon ipackage=liberty iname=warning iexplain=warning}
-					Not all the recommended setting have been met. However,  your site might still work without problems. Please keep these settings in mind when you run into problems.
-				</li>
-			{else}
-				<li class="success">
-					{biticon ipackage=liberty iname=success iexplain=success}
-					All recommended settings have been met.
-				</li>
-			{/if}
-		</ul>
-	</div>
+	{if $memory_warning}
+		<p class="clear warning">
+			{biticon ipackage=liberty iname=warning iexplain=warning}
+			Your memory limit settings are rather low. bitweaver requires at least 8MB memory to run, even having a limit of 8MB might cause undesired results. If you end up laoding blank pages, it might be the <strong>memory_limit</strong> setting in your <strong>php.ini</strong> file. if possible, please get your host to increase the limit to at least <strong>16MB</strong>.
+		</p>
+	{/if}
+	{if $rec_warning}
+		<p class="clear warning">
+			{biticon ipackage=liberty iname=warning iexplain=warning}
+			Not all the recommended setting have been met. However,  your site might still work without problems. Please keep these settings in mind when you run into problems.
+		</p>
+	{else}
+		<p class="clear success">
+			{biticon ipackage=liberty iname=success iexplain=success}
+			All recommended settings have been met.
+		</p>
+	{/if}
 
 	<h3>Settings worth knowing about</h3>
 
-	<div class="row">
-		<p>
-			The settings below are merely for your information and are meant to help you work out problems that might occur.
-		</p>
-	</div>
+	<p>The settings below are merely for your information and are meant to help you work out problems that might occur.</p>
 
 	<div class="row">
 		{formlabel label="Settings worth knowing about"}
@@ -163,9 +140,6 @@
 		{/forminput}
 	</div>
 
-	<div class="row">
-	</div>
-
 	{if !$error}
 		<div class="row submit">
 			<input type="submit" name="" value="Continue the Install process" />