start adding bitweaver R1 to R2 specific instructions and making upgrade process a bit more pleasant

5 files changed, 81 insertions, 52 deletions

diff --git a/templates/install_database.tpl b/templates/install_database.tpl
index e4562a3..1aa7cd8 100644
--- a/templates/install_database.tpl
+++ b/templates/install_database.tpl
@@ -47,15 +47,15 @@
 		{formlabel label="Database type" for="db"}
 		{forminput}
 			{if $section eq 'Upgrade'}
-				{formfeedback warning="If you intend to upgrade an existing MySQL database, the required server version is greater than 4.1."}
+				<p class="warning">If you intend to upgrade an existing MySQL database, the required server version is greater than 4.1.</p>
 			{/if}
 			{if $dbservers}
 				{html_options name='db' options=$dbservers id=db selected=$gBitDbType}
 			{else}
-				{formfeedback warning='You currently have no Database installed that works here. If you feel this is wrong, please contact the <a class="external" href="http://www.bitweaver.org/">bitweaver Team</a>.'}
+				<p class="warning">You currently have no Database installed that works here. If you feel this is wrong, please contact the <a class="external" href="http://www.bitweaver.org/">bitweaver Team</a>.</p>
 			{/if}
 			{formhelp note="The type of database you intend to use."}
-			{formfeedback warning="If the database you wish to use is not listed above, the version of PHP on this server does not have support for that database installed or compiled in."}
+			<p class="warning">If the database you wish to use is not listed above, the version of PHP on this server does not have support for that database installed or compiled in.</p>
 		{/forminput}
 	</div>
 
@@ -111,7 +111,7 @@
 	{/if}
 		{formlabel label="Database Prefix" for="prefix"}
 		{forminput}
-			<input type="text" size="25" name="prefix" id="prefix" value="{$db_prefix_bit|replace:'`':''|default:"bit_"}" />
+			<input type="text" size="25" name="prefix" id="prefix" value="{$db_prefix_bit|replace:'`':''}" />
 			{formhelp note="This prefix will be prepended to the begining of every table name to allow multiple
 				independent install to share a single database. To ensure problem free usage of bitweaver with other
 				applications in the same database, <strong>we highly recommend using a prefix</strong>.
diff --git a/templates/install_database_done.tpl b/templates/install_database_done.tpl
index 2649565..bf557e1 100644
--- a/templates/install_database_done.tpl
+++ b/templates/install_database_done.tpl
@@ -69,11 +69,12 @@
 	</div>
 
 	<div class="row">
-		<p>
-			This information was stored in the file '<strong>{$smarty.const.KERNEL_PKG_PATH}config_inc.php</strong>'. if you should have to modify the settings at some point, you can use this installer, or modify that file directly.
+		<p class="success">
+			This information was stored in the file:<br />
+			<strong>{$smarty.const.KERNEL_PKG_PATH}config_inc.php</strong>
 		</p>
 		<p>
-			If you are interested in debugging bitweaver, please view this file, as there are some additional debugging options that can't be set elsewhere.
+			If you are interested in debugging or developing bitweaver, please view this file, as there are important additional options that can not be set elsewhere. Web designers can also find some settings that might help with theme creation.
 		</p>
 	</div>
 
diff --git a/templates/install_welcome.tpl b/templates/install_welcome.tpl
index 80c0974..624ebbc 100644
--- a/templates/install_welcome.tpl
+++ b/templates/install_welcome.tpl
@@ -1,26 +1,49 @@
 <h1>Welcome to the bitweaver installer</h1>
 
-{form legend="Begin the installation process"}
-    <input type="hidden" name="step" value="{$next_step}" />
-	<div class="row">
+{form}
+	{legend legend="Begin the installation process"}
+		<input type="hidden" name="step" value="{$next_step}" />
+
 		{if $gBitUser->isAdmin()}
-			<p class="warning">Since this does not appear to be your first install, you can use the navigation on the right to access various pages of the installer.
-			To install new packages, please visit the <strong>Package Installation</strong> page.</p>
+			<p class="warning">Since this does not appear to be your first
+			install, you can use the navigation on the right to access various
+			pages of the installer.  To install new packages, please visit the
+			<strong>Package Installation</strong> page.</p>
 		{/if}
 
-	    <p> Thank you for choosing bitweaver. This web application offers an 
-	    unparalled combination of flexibility, performance, and simplicity.</p>
-	    <p> For questions, comments, or support, please don't hesitate to visit <a class="external" href="http://www.bitweaver.org">http://www.bitweaver.org</a>. 
-	    Help is available via <a class="external" href="http://www.bitweaver.org/forums/viewforum.php?f=5">the forums</a>
-	    or come and visit us at 
-	    <a class="external" href="irc://irc.freenode.net:6667/bitweaver">#bitweaver</a>
-	    on irc (if the irc link doesn't work, there are 
-	    <a class="external" href="http://www.bitweaver.org/wiki/index.php?page=ConnectingToIrc">detailed directions</a> 
-	    on how to meet up with us on irc).</p>
-	    <p> This installer will guide you through the installation of bitweaver.  </p>
-	</div>
+		<p> Thank you for choosing bitweaver. This web application offers an
+		unparalled combination of flexibility, performance, and simplicity.</p>
+
+		<p> For questions, comments, or support, please don't hesitate to visit <a
+		class="external"
+		href="http://www.bitweaver.org">http://www.bitweaver.org</a>.  Help is
+		available via <a class="external"
+		href="http://www.bitweaver.org/forums/viewforum.php?f=5">the forums</a> or
+		come and visit us at <a class="external"
+		href="irc://irc.freenode.net:6667/bitweaver">#bitweaver</a> on irc (if the
+		irc link doesn't work, there are <a class="external"
+		href="http://www.bitweaver.org/wiki/index.php?page=ConnectingToIrc">detailed
+		directions</a> on how to meet up with us on irc).</p>
+
+		<p>This installer will guide you through the installation of bitweaver.
+		</p>
+
+		<div class="row submit">
+			<input type="submit" name="install" value="Begin the Install process" />
+		</div>
+	{/legend}
+
+	{legend legend="Upgrade bitweaver"}
+		<p> If you have an existing version 1 of bitweaver installed and would
+		like to upgrade to version 2, please use the upgrader.</p>
+
+		<p class="warning">This path will only work for upgrading bitweaver
+		release one to release two. if you want to upgrade from previous
+		versions or from other applications such as tikiwiki, please follow
+		the installer, you will have options to do this later on.</p>
 
-	<div class="row submit">
-	    <input type="submit" name="" value="Begin the Install process!" />
-	</div>
+		<div class="row submit">
+			<input type="submit" name="upgrade" value="Upgrade bitweaver R1 to R2" />
+		</div>
+	{/legend}
 {/form}
diff --git a/templates/upgrade_packages.tpl b/templates/upgrade_packages.tpl
index 57fe906..932d96e 100644
--- a/templates/upgrade_packages.tpl
+++ b/templates/upgrade_packages.tpl
@@ -1,36 +1,45 @@
 <h3>Upgrading {$upgradeFrom} to {$smarty.const.BIT_MAJOR_VERSION}.{$smarty.const.BIT_MINOR_VERSION}.{$smarty.const.BIT_SUB_VERSION} {$smarty.const.BIT_LEVEL}</h3>
 
-{* should be fixed at some point
-<p>The following packages will be updated</p>
-
-<ol>
-	{foreach from=$gBitSystem->mUpgrades key=pkg item=upHash}
-		<li>{$pkg}</li>
-	{/foreach}
-</ol>
-*}
-
 {form legend="Begin the upgrade process"}
 	<input type="hidden" name="step" value="{$next_step}" />
 
 	<div class="row">
 		{formlabel label="Upgrade Application" for="db"}
 		{forminput}
-			<select name="upgrade_from">
-				<optgroup label="bitweaver">
-					<option value="BWR0">bitweaver ReleaseZero -BONNIE-</option>
-					<option value="BWR1">bitweaver ReleaseOne -R1-</option>
-				</optgroup>
-				<optgroup label="TikiWiki">
-					<option value="TikiWiki 1.8">TikiWiki 1.8</option>
-					<option value="TikiWiki 1.9">TikiWiki 1.9</option>
-				</optgroup>
-			</select>
-			<br />to bitweaver <strong>ReleaseTwo</strong> -R2-
+			{if $smarty.session.upgrade_r1}
+				<input type="hidden" name="upgrade_from" value="BWR1" />
+				bitweaver <strong>ReleaseOne</strong> &nbsp; <em>-R1-</em>
+			{else}
+				<select name="upgrade_from">
+					<optgroup label="bitweaver">
+						<option value="BWR0">bitweaver ReleaseZero -BONNIE-</option>
+						<option value="BWR1">bitweaver ReleaseOne -R1-</option>
+					</optgroup>
+					<optgroup label="TikiWiki">
+						<option value="TikiWiki 1.8">TikiWiki 1.8</option>
+						<option value="TikiWiki 1.9">TikiWiki 1.9</option>
+					</optgroup>
+				</select>
+			{/if}
+			<br />to
+			<br />bitweaver <strong>ReleaseTwo</strong> &nbsp; <em>-R2-</em>
 			{formhelp note="The type of application you intend to upgrade"}
 		{/forminput}
 	</div>
 
+	{if $smarty.session.upgrade_r1}
+		<p>The following packages will be updated</p>
+		<ul>
+			{foreach from=$upgrading item=package}
+				<li>{$package}</li>
+			{/foreach}
+		</ul>
+	{/if}
+
+	<div class="row submit">
+		<input type="submit" name="upgrade" value="Upgrade Packages" />
+	</div>
+
 	<div class="row">
 		{formlabel label="Debug mode" for="debug"}
 		{forminput}
@@ -38,8 +47,4 @@
 			{formhelp note="This will display SQL statements."}
 		{/forminput}
 	</div>
-
-	<div class="row submit">
-		<input type="submit" name="upgrade" value="Upgrade Packages" />
-	</div>
 {/form}
diff --git a/templates/upgrade_welcome.tpl b/templates/upgrade_welcome.tpl
index a3b6f4c..4dfb416 100644
--- a/templates/upgrade_welcome.tpl
+++ b/templates/upgrade_welcome.tpl
@@ -9,7 +9,7 @@
 	<br />
 	<p class="warning"><strong>Do a Trial Run first</strong><br />You should run a trial upgrade on an offline server, personal machine, etc. before you do this on your live site.</p>
 	<br />
-	<p class="warning">Upgrades can <strong>take a long time</strong><br />Make sure your max_execution_time in your php.ini is large enough for your site.</p>
+	<p class="warning"><strong>Upgrades can take a long time</strong><br />We try to override the setting in your php.ini to ensure enough time but on some systems this does not work. If you get a blank page with a non-functional site as a result, the execution time might be the reason. Please bear this in mind. The value we have set is: <strong>max_execution_time: {$max_execution_time} seconds</strong>. If you run into problems with the upgrade process and you think this might be problem, please consult the <a class="external" href="http://us2.php.net/manual/en/ref.info.php#ini.max-execution-time">php manual</a>.</p>
 	<strong>{formfeedback warning=$dbWarning}</strong>
 	<p>We have done our best to make sure all situations are handled. However, your install might have the one case we haven't run into yet.</p>