merge recent changes into HEAD

6 files changed, 12 insertions, 10 deletions

diff --git a/style/install.css b/style/install.css
index 04f1276..8b3969f 100644
--- a/style/install.css
+++ b/style/install.css
@@ -10,7 +10,7 @@ caption	{font-weight:bold; padding:5px 0 0 0;}
 th		{text-align:left; padding:3px 5px; background:#2c4268; border-bottom:2px solid #fff; color:#fff;}
 td		{padding:2px 3px; vertical-align:top;}
 hr		{border:1px solid #000;}
-p		{margin:0.5em 0; padding:0.5em 1em;}
+p		{margin:0; padding:1em;}
 
 /* titles */
 h1			{font-size:130%; color:#900; font-weight:900;}
@@ -52,7 +52,7 @@ textarea	{width:100%;}
 .help			{background:#eee;}
 p.warning,
 p.success,
-p.error			{border:1px solid #999; padding:1em;}
+p.error			{border:1px solid #999;}
 
 .formfeedback ul {padding:0; margin:0;}
 .formfeedback li {border-bottom:1px dotted #aaa;}
diff --git a/templates/install_checks.tpl b/templates/install_checks.tpl
index 83295cd..e1448a9 100644
--- a/templates/install_checks.tpl
+++ b/templates/install_checks.tpl
@@ -37,7 +37,7 @@
 
 	<h3>Recommended Extensions</h3>
 
-	<p class="clear">
+	<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>.
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index cfa0eb4..9064ad9 100644
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -2,7 +2,7 @@
 {if $first_install}
 	<h1>Package Installation</h1>
 {else}
-	<h1>Adding and Remove Packages</h1>
+	<h1>Adding and Removing Packages</h1>
 {/if}
 <br />
 {if $error}
diff --git a/templates/upgrade_packages.tpl b/templates/upgrade_packages.tpl
index 2b92ab3..36853a4 100644
--- a/templates/upgrade_packages.tpl
+++ b/templates/upgrade_packages.tpl
@@ -16,7 +16,8 @@
 		{forminput}
 			<select name="upgrade_from">
 				<option value="TikiWiki 1.8">TikiWiki 1.8</option>
-				<option value="BONNIE">bitweaver ReleaseZero -BONNIE-</option>
+				<option value="TikiWiki 1.9">TikiWiki 1.9</option>
+				<option value="BWR0">bitweaver ReleaseZero -BONNIE-</option>
 				{formhelp note="The type of application you intend to upgrade"}
 			</select>
 		{/forminput}
diff --git a/templates/upgrade_ready.tpl b/templates/upgrade_ready.tpl
index 8d14def..0d6886d 100644
--- a/templates/upgrade_ready.tpl
+++ b/templates/upgrade_ready.tpl
@@ -14,7 +14,8 @@
 		{forminput}
 		<select name="upgrade_from">
 			<option value="TikiWiki 1.8">TikiWiki 1.8</option>
-			<option value="BONNIE">bitweaver 2.0 -BONNIE-</option>
+			<option value="TikiWiki 1.9">TikiWiki 1.9</option>
+			<option value="BWR0">bitweaver ReleaseZero -BONNIE-</option>
 		</select>
 			{formhelp note="The type of application you intend to upgrade"}
 		{/forminput}
diff --git a/upgrade_packages.php b/upgrade_packages.php
index 1fb7335..afb37b3 100644
--- a/upgrade_packages.php
+++ b/upgrade_packages.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_install/upgrade_packages.php,v 1.4 2006/01/18 20:19:15 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_install/upgrade_packages.php,v 1.5 2006/01/20 11:08:05 squareing Exp $
  * @package install
  * @subpackage upgrade
  */
@@ -22,9 +22,9 @@ include_once( $config_file ); // relative, but we know we are in the installer h
 $gBitInstaller->scanPackages( 'admin/upgrade_inc.php' );
 
 $upgradePath = array (
-	'TikiWiki 1.8' => array( 'TIKIWIKI18' => 'BONNIE', 'BONNIE' => 'BWR1', 'BWR1' => 'BWR2' ),
-	'BONNIE' => array( 'BONNIE' => 'BWR1', 'BWR1' => 'BWR2' ),
-	'BWR1' => array( 'BWR1' => 'BWR2' ),
+	'TikiWiki 1.8' => array( 'TIKIWIKI18' => 'BONNIE', 'BONNIE' => 'BWR1' ),
+	'TikiWiki 1.9' => array( 'TIKIWIKI19' => 'TIKIWIKI18', 'TIKIWIKI18' => 'BONNIE', 'BONNIE' => 'BWR1' ),
+	'BWR0' => array( 'BONNIE' => 'BWR1' ),
 );
 
 $gBitSmarty->assign( 'upgradeFrom', $gUpgradeFrom );