clean up install feedback

3 files changed, 33 insertions, 37 deletions

diff --git a/install_packages.php b/install_packages.php
index 09bfd92..573fa84 100644
--- a/install_packages.php
+++ b/install_packages.php
@@ -572,8 +572,8 @@ if( !empty( $_REQUEST['cancel'] ) ) {
 					if( $anonUser->store( $storeHash ) ) {
 						// Remove anonymous from registered group
 						$regGroupId = $anonUser->groupExists( 'Registered', ROOT_USER_ID );
-						$anonUser->removeUserFromGroup( ANONYMOUS_USER_ID, $regRoleId );
-						$anonUser->addUserToGroup( ANONYMOUS_USER_ID, ANONYMOUS_TEAM_ID);
+						$anonUser->removeUserFromGroup( ANONYMOUS_USER_ID, $regGroupId );
+						$anonUser->addUserToGroup( ANONYMOUS_USER_ID, ANONYMOUS_GROUP_ID);
 					}
 				}
 
diff --git a/templates/install_datapump.tpl b/templates/install_datapump.tpl
index a457f0f..6477f4b 100644
--- a/templates/install_datapump.tpl
+++ b/templates/install_datapump.tpl
@@ -15,15 +15,13 @@
 	<div class="control-group">
 		{formlabel label="Packages that can be populated"}
 		{forminput}
-			{if $pumpList}
-				<ul>
-					{foreach from=$pumpList item=file key=package}
-						<li><input type="checkbox" name="pump_package[]" value="{$package}" checked="checked"/>{$package}</li>
-					{/foreach}
-				</ul>
-			{else}
+			{foreach from=$pumpList item=file key=package}
+			<label class="checkbox">
+				<input type="checkbox" name="pump_package[]" value="{$package}" checked="checked"/>{$package}
+			</label>
+			{foreachelse}
 				No packages with prepared data have been installed.
-			{/if}
+			{/foreach}
 		{/forminput}
 	</div>
 
@@ -32,7 +30,7 @@
 			{if $pumpList}
 				<input type="submit" class="btn" value="Populate my site" name="fSubmitDataPump" /> 
 			{/if}
+			<input type="submit" class="btn" value="Skip" name="skip" />
 		{/forminput}
-		<input type="submit" class="btn" value="Skip" name="skip" />
 	</div>
 {/form}
diff --git a/templates/install_final_done.tpl b/templates/install_final_done.tpl
index 7af319b..1398678 100644
--- a/templates/install_final_done.tpl
+++ b/templates/install_final_done.tpl
@@ -16,32 +16,30 @@
 	<p>If you feel like contributing to Bitweaver, contact us! Bitweaver is free and Open Source to all. Translators, testers, admins, release managers, developers, programmers, designers, <em>we want you!</em> :)</p>
 
 	<h2>Some final notes</h2>
-	<ul>
-		<li>
-			<strong>Security</strong>
-			<ul>
-				<li>
-					<strong>Linux</strong>
-					<br />Change the directory permission with <kbd>chmod 000 install/</kbd>. If you need to run the installer again, you will have to revert the permissions with <kbd>chmod 755 install/</kbd>.
-				</li>
-				<li>
-					<strong>Windows</strong>
-					<br />Rename <kbd>install/install_inc.php</kbd> to something like <kbd>install/install_inc.php.done</kbd>
-				</li>
-				<li>
-					<strong>bitweaver Configuration</strong>
-					<br />We urge you to look at your <kbd>config/kernel/config_inc.php</kbd> file. It has various useful settings for sites in production. One of these is the <strong>IS_LIVE</strong> parameter. Setting this to <strong>TRUE</strong> will prevent any visible bug reports and will therefore not display sensitive information to the user.
-				</li>
-			</ul>
-		</li>
-		<li>
-			<strong>Performance</strong>
-			<ul>
-				<li>For production sites, we recommend you visit our <a class="external" href="http://www.bitweaver.org/wiki/Bitweaver+Performance">Bitweaver Performance</a> page on how to optimise your Bitweaver install.</li>
-				<li>Please also have a look at your <kbd>config/kernel/config_inc.php</kbd> file. It contains various settings that cannot be set elsewhere and which might be of interest to you.</li>
-			</ul>
-		</li>
-	</ul>
+	<div class="alert alert-warning">
+		<strong>Security</strong>
+		<ul>
+			<li>
+				<strong>Linux</strong>
+				<br />Change the directory permission with <kbd>chmod 000 install/</kbd>. If you need to run the installer again, you will have to revert the permissions with <kbd>chmod 755 install/</kbd>.
+			</li>
+			<li>
+				<strong>Windows</strong>
+				<br />Rename <kbd>install/install_inc.php</kbd> to something like <kbd>install/install_inc.php.done</kbd>
+			</li>
+			<li>
+				<strong>bitweaver Configuration</strong>
+				<br />We urge you to look at your <kbd>config/kernel/config_inc.php</kbd> file. It has various useful settings for sites in production. One of these is the <strong>IS_LIVE</strong> parameter. Setting this to <strong>TRUE</strong> will prevent any visible bug reports and will therefore not display sensitive information to the user.
+			</li>
+		</ul>
+	</div>
+	<div class="alert alert-info">
+		<strong>Performance</strong>
+		<ul>
+			<li>For production sites, we recommend you visit our <a class="external" href="http://www.bitweaver.org/wiki/Bitweaver+Performance">Bitweaver Performance</a> page on how to optimise your Bitweaver install.</li>
+			<li>Please also have a look at your <kbd>config/kernel/config_inc.php</kbd> file. It contains various settings that cannot be set elsewhere and which might be of interest to you.</li>
+		</ul>
+	</div>
 
 	<br />
 	<p class="help">Finally, we thank you again for using Bitweaver.</p>