diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2007-04-21 14:10:41 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2007-04-21 14:10:41 +0000 |
| commit | aaac2c7494fcbca55c06637a0bac717e965724b2 (patch) | |
| tree | 6f9620b118b2e0664d6279b46deddec151854ad3 /templates | |
| parent | 0c673250c757ed4432e7a6e7caaa529b885acce3 (diff) | |
| download | install-aaac2c7494fcbca55c06637a0bac717e965724b2.tar.gz install-aaac2c7494fcbca55c06637a0bac717e965724b2.tar.bz2 install-aaac2c7494fcbca55c06637a0bac717e965724b2.zip | |
extend installer that we can have installer extensions for external packages. fix some minor stuff and clean up templates a bit.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/install.tpl | 4 | ||||
| -rw-r--r-- | templates/install_cleanup.tpl | 6 | ||||
| -rw-r--r-- | templates/upgrade_welcome.tpl | 52 |
3 files changed, 48 insertions, 14 deletions
diff --git a/templates/install.tpl b/templates/install.tpl index 712343d..d1f92db 100644 --- a/templates/install.tpl +++ b/templates/install.tpl @@ -4,7 +4,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <style type="text/css"> - <!-- @import url(style/install.css); --> + <!-- @import url({$smarty.const.INSTALL_PKG_URL}style/install.css); --> </style> <title>Install bitweaver - {$browserTitle}</title> <link rel="shortcut icon" href="{$smarty.const.INSTALL_PKG_URL}favicon.ico" type="image/x-icon" /> @@ -46,7 +46,7 @@ <li class="{$step.state}"> {biticon ipackage=icons iname=`$step.icon` iexplain=`$step.state` iforce=icon} {if $step.state ne 'uncompleted'} - <a href="{$smarty.const.INSTALL_PKG_URL}{$menu_file|default:"install.php"}?step={$key}"> + <a href="{$menu_path|default:$smarty.const.INSTALL_PKG_URL}{$menu_file|default:"install.php"}?step={$key}"> {/if} {$step.name} {if $step.state ne 'uncompleted'} diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl index c75548b..2ce0f09 100644 --- a/templates/install_cleanup.tpl +++ b/templates/install_cleanup.tpl @@ -1,4 +1,4 @@ -<h1>Package Conflicts</h1> +<h1>Bitweaver integrity check</h1> <p> {biticon ipackage="icons" iname="dialog-information" iexplain=Information} @@ -43,7 +43,7 @@ {if $required} <p class="error"> {biticon ipackage="icons" iname="dialog-error" iexplain=error} - A required package is missing at least one table. This will have unpredictable results. Please make a note of the table and contact the bitweaver team on how to procede. + A required package is missing at least one table. This will have unpredictable results. Please make a note of the table and contact the bitweaver team on how to proceed. If this is your first install, we recommend that you give it another shot, perhaps with fewer packages selected. You can return to the installer at any time and install more packages later. <br />If this problem persists, we recommend that you turn on the <strong>debugging</strong> option and look for error messages regarding the above table(s). This will help the bitweaver team identify the problem more quickly when you contact them. </p> @@ -121,7 +121,7 @@ {else} <p class="success"> {biticon ipackage="icons" iname="dialog-ok" iexplain=success} - The permissioning system in your installation is up to date and does not require any adjustments. + The permissioning system in your installation is up to date and does not require any adjustments. Even though this is true, we recommend you visit the <a href="{$smarty.const.USERS_PKG_URL}admin/unassigned_perms.php">Unassigned Permissions</a> page at some point to ensure that all permissions are active. </p> {/if} {/legend} diff --git a/templates/upgrade_welcome.tpl b/templates/upgrade_welcome.tpl index 4dfb416..5074ec3 100644 --- a/templates/upgrade_welcome.tpl +++ b/templates/upgrade_welcome.tpl @@ -3,15 +3,49 @@ {form legend="Begin the upgrade process"} <input type="hidden" name="step" value="{$next_step}" /> - <p>Welcome to the new and improved bitweaver upgrade process. Our upgrade scripts are currently still in development and we cannot take any reponsibility for any loss of data that occurs due to the use of these scripts. Having said this, we are doing our best to make this upgrade process as reliable and complete as we possibly can. Due to this, we urge you to follow the instructions here carefully before you proceed.</p> - <p>Initial steps before beginning the actual upgrade stages.</p> - <p class="warning"><strong>Make a Backup</strong><br />You should have a spare dump of your database before you run this. (Of course, you already have a nightly cron job making nightly backups and scp'ing them to another host? right? right.)</p> - <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"><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> + <p> + Welcome to the new and improved bitweaver package manager. Using this + package manager will allow you to download packages from our central + repository and apply the install or upgrade process easily. + </p> + <p> + Initial steps before beginning the actual upgrade stages. + </p> + <p class="warning"> + <strong>Make a Backup</strong><br /> + You should have a spare dump of your database before you run this. (Of + course, you already have a nightly cron job making nightly backups and + scp'ing them to another host? right? right.) + </p> + <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> + {if $max_execution_time} + <p class="warning"> + <strong>Upgrades can take a long time</strong><br /> + We tried to override the max_execution_time 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.<br /> + The value we are trying to set max_execution_time to is 86400. + However, your value of {$max_execution_time} cannot be overridden + on your system. 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> + on how to change the value. + </p> + {/if} + {if $dbWarning} + <p class="warning"> + {$dbWarning} + </p> + {/if} + <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> <div class="row submit"> <input type="submit" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the Upgrade process!"}" /> |
