diff options
| author | laetzer <laetzer@users.sourceforge.net> | 2008-09-28 08:19:48 +0000 |
|---|---|---|
| committer | laetzer <laetzer@users.sourceforge.net> | 2008-09-28 08:19:48 +0000 |
| commit | 79b624490a7b4a4125544c0396abb7dc95b6429d (patch) | |
| tree | 6bfb63403d16165083f1b17b63a5ecfcf592bec8 /templates | |
| parent | 583e037288a5cdf2f134f1cafa679389f8ff2ce9 (diff) | |
| download | install-79b624490a7b4a4125544c0396abb7dc95b6429d.tar.gz install-79b624490a7b4a4125544c0396abb7dc95b6429d.tar.bz2 install-79b624490a7b4a4125544c0396abb7dc95b6429d.zip | |
installer design revamp
Diffstat (limited to 'templates')
29 files changed, 515 insertions, 646 deletions
diff --git a/templates/install.tpl b/templates/install.tpl index b4b3385..7be6cc7 100644 --- a/templates/install.tpl +++ b/templates/install.tpl @@ -4,10 +4,11 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <style type="text/css"> - <!-- @import url({$smarty.const.INSTALL_PKG_URL}style/install.css); --> + @import url({$smarty.const.INSTALL_PKG_URL}style/install.css); </style> - <title>Install bitweaver - {$browserTitle}</title> + <title>Install Bitweaver - {$browserTitle}</title> <link rel="shortcut icon" href="{$smarty.const.INSTALL_PKG_URL}favicon.ico" type="image/x-icon" /> + <link rel="icon" href="{$smarty.const.INSTALL_PKG_URL}favicon.ico" type="image/x-icon" /> <script type="text/javascript">/* <![CDATA[ */ var bitCookiePath = "{$smarty.const.BIT_ROOT_URL}"; @@ -17,75 +18,83 @@ /* ]]> */</script> <script type="text/javascript" src="{$smarty.const.BIT_ROOT_URL}util/javascript/libs/tabpane.js"></script> <script type="text/javascript" src="{$smarty.const.BIT_ROOT_URL}util/javascript/bitweaver.js"></script> + {if $gBrowserInfo.browser eq 'ie'} + <!--[if lt IE 7]> + <script type="text/javascript" src="{$smarty.const.BIT_ROOT_URL}util/javascript/fixes/ie7/IE8.js"></script> + <![endif]--> + {/if} </head> -<body> +<body id="step{$smarty.request.step}"> <div id="container"> - <div id="header"> </div> + <div id="header"> + <a href="http://www.bitweaver.org/" title="bitweaver.org" id="bitweaver_logo"> + <em>bitweaver.org</em> + </a> + <h1 id="title"> + <strong>Bitweaver {$smarty.const.BIT_MAJOR_VERSION}.{$smarty.const.BIT_MINOR_VERSION}.{$smarty.const.BIT_SUB_VERSION} {$smarty.const.BIT_LEVEL}</strong> + <em>{$section|default:"Install"}</em> + </h1> + <div class="bittop"> + <ul id="stepmenu"> + {foreach from=$menu_steps item=step key=key} + <li class="{$step.state}"> + {if $step.state ne 'uncompleted'} + <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'} + </a> + {/if} + </li> + {/foreach} + </ul> + </div> + </div> <div id="wrapper"> <div id="content"> - <div class="bittop"> - <h1>bitweaver <strong>{$smarty.const.BIT_MAJOR_VERSION}.{$smarty.const.BIT_MINOR_VERSION}.{$smarty.const.BIT_SUB_VERSION} {$smarty.const.BIT_LEVEL}</strong></h1> + {include file=$install_file} </div> + </div> - {include file=$install_file} + <div id="navigation"> + <div class="progressbar"> + <em>{$section|default:"Install"} Progress</em> + <div class="bar"> + <div class="progress progress{$progress}" style="width:{$progress|default:0}%;"><strong>{$progress}%</strong></div> + </div> + <span class="clear"><!-- --></span> </div> </div> - <div id="navigation"> + <div id="extra"> <ul> - <li class="title"> - {$section|default:"Install"}ometer - </li> - - {foreach from=$menu_steps item=step key=key} - <li class="{$step.state}"> - {biticon ipackage=icons iname=`$step.icon` iexplain=`$step.state` iforce=icon} - {if $step.state ne 'uncompleted'} - <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'} - </a> - {/if} - </li> - {/foreach} - - <li> - {biticon ipackage=liberty iname=spacer iexplain=spacer iforce=icon} - </li> <li class="help"> - {biticon ipackage="icons" iname="help-contents" iexplain=help iforce=icon} <a class="external" href="http://www.bitweaver.org/wiki/index.php?page={$section|default:"Install"}bitweaverDoc">{$section|default:"Install"} Help</a> </li> <li class="help"> - {biticon ipackage="icons" iname="view-refresh" iexplain=restart iforce=icon} <a href="{$smarty.const.INSTALL_PKG_URL}{$menu_file|default:"install.php"}?step=0">Start over</a> </li> {if $section} <li class="help"> - {biticon ipackage="icons" iname="view-refresh" iexplain=restart iforce=icon} <a href="{$smarty.const.INSTALL_PKG_URL}install.php?step=2">Return to Installer</a> </li> {/if} - <li class="warning" style="text-align:center;"> - {biticon ipackage="icons" iname="large/dialog-warning" iexplain=warning iforce=icon} - <br /> - Please don't use the browser back button. + <li class="warning" title="Please don't use your browser's back button during this install process."> + Please don't use the browser back button </li> </ul> </div> - <div id="extra"> - <div class="progressbar"> - {$section|default:"Install"} Progress - <div class="bar"> - <div class="progress" style="width:{$progress|default:0}%;">{$progress}%</div> - </div> - </div> + <div id="footer"> + <p> + <a href="http://bitweaver.org"> + Bitweaver. It's the one + <br /> + www.bitweaver.org + </a> + </p> </div> - - <div id="footer"> </div> </div> </body> </html> diff --git a/templates/install_admin_inc.tpl b/templates/install_admin_inc.tpl index f8737e6..dc7d487 100644 --- a/templates/install_admin_inc.tpl +++ b/templates/install_admin_inc.tpl @@ -1,4 +1,4 @@ -<h1>Administrator Information</h1> +<h1>Administrator Setup</h1> {strip} {form legend="Please enter administrator information"} diff --git a/templates/install_admin_inc_done.tpl b/templates/install_admin_inc_done.tpl index f3d3977..445bd07 100644 --- a/templates/install_admin_inc_done.tpl +++ b/templates/install_admin_inc_done.tpl @@ -11,12 +11,12 @@ {foreach from=$warning item=warn} <li class="warning"> {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} + {$warn} </li> {/foreach} {else} <li class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} Administrator configured successfully </li> {/if} @@ -53,13 +53,19 @@ {if $mail} <div class="row"> - {formlabel label="Email Transport"} + {formlabel label="Email transport"} {forminput} {if $mail.warning} - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} {$mail.warning}<br /> - You will have to consult your Server Adminstrator to fix this issue. + {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} + + {$mail.warning} + <br /> + You will have to consult your server adminstrator to fix this issue. {else} - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} {$mail.success}<br /> + {biticon ipackage="icons" iname="dialog-ok" iexplain=success} + + {$mail.success} + <br /> Please check your inbox to confirm that the email was sent. {/if} {/forminput} @@ -67,7 +73,7 @@ {/if} <div class="row submit"> - <input type="submit" value="Continue Install Process" /> + <input type="submit" value="Continue install process" /> </div> {/form} diff --git a/templates/install_beta1_beta2.tpl b/templates/install_beta1_beta2.tpl index fb60292..57afb91 100644 --- a/templates/install_beta1_beta2.tpl +++ b/templates/install_beta1_beta2.tpl @@ -37,7 +37,7 @@ <div class="row"> {forminput} <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label> - {formhelp note="This will display SQL statements."} + {formhelp note="Display SQL statements."} {/forminput} </div> {/form} diff --git a/templates/install_beta1_beta2_done.tpl b/templates/install_beta1_beta2_done.tpl index 4fdfe02..717f8da 100644 --- a/templates/install_beta1_beta2_done.tpl +++ b/templates/install_beta1_beta2_done.tpl @@ -13,7 +13,6 @@ <div class="row"> <ul class="result"> <li class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} All Database operations completed succesfully </li> </ul> @@ -32,6 +31,6 @@ {/if} <div class="row submit"> - <input type="submit" value="Continue Install Process" /> + <input type="submit" value="Continue install process" /> </div> {/form} diff --git a/templates/install_bit_settings.tpl b/templates/install_bit_settings.tpl index 12ad41c..d3538bc 100644 --- a/templates/install_bit_settings.tpl +++ b/templates/install_bit_settings.tpl @@ -1,16 +1,9 @@ -<h1>bitweaver Settings</h1> +<h1>Bitweaver Settings</h1> {form legend="Some Preliminary Settings"} <input type="hidden" name="step" value="{$next_step}" /> - <p> - You can take advantage of setting some preliminary settings that will help you set up your site quickly and easily. - Since bitweaver has so many settings and features, we thought it might - be useful to collect some of the key settings to simplify the initial stages. - </p> - <p> - These settings can all be found from the Administration panel. - </p> + <p>Since Bitweaver has so many settings and features, it might be useful to set some of the key settings on this screen already, to simplify the initial stages. These settings can be found later in the administration panel.</p> {foreach from=$formInstallToggles key=feature item=output} <div class="row"> @@ -26,7 +19,7 @@ {formlabel label="Browser title" for="site_title"} {forminput} <input size="40" type="text" name="site_title" id="site_title" value="{$gBitSystem->getConfig('site_title')|escape}" /> - {formhelp note="Enter the title that should appear in the title bar of the users browser when visiting your site."} + {formhelp note="Enter the text that should appear in the title bar of the user's browser when visiting your site."} {/forminput} </div> @@ -53,7 +46,7 @@ <option value="users_custom_home"{if $bit_index eq $gBitSystem->getConfig('site_url_index')} selected="selected"{/if}>{tr}Custom home{/tr}</option> {/if} </select> - {formhelp note="Pick your site's homepage. This is where they will be redirected, when they access a link to your homepage. + {formhelp note="Pick your site's homepage. This is where users will be redirected, when they access a link to your homepage. <dl> <dt>My Home</dt><dd>This page contains all links the user can access with his/her current permissions. It's like a personal administration screen.</dd> <dt>Group Home</dt><dd>You can define an individual home page for a group of users using this option. To define home pages, please access the <br /><strong>Administration --> Users --> Groups and Permissions</strong> page.</dd> @@ -70,7 +63,7 @@ <option value="{$langCode}" {if $langCode eq "en"}selected="selected"{/if}>{$lang.full_name|escape}</option> {/foreach} </select> - {formhelp note="Select the default language of your site. Choosing a language other than english will cause the language to be installed, which might take some time depending on your setup."} + {formhelp note="Select the default language of your site. Choosing a language other than English will cause the language to be installed, which might take some time depending on your setup."} {/forminput} </div> @@ -88,4 +81,4 @@ <div class="row submit"> <input type="submit" name="bit_settings" value="{tr}Set Preferences{/tr}" /> </div> -{/form} +{/form}
\ No newline at end of file diff --git a/templates/install_bit_settings_done.tpl b/templates/install_bit_settings_done.tpl index cfedafc..c170a52 100644 --- a/templates/install_bit_settings_done.tpl +++ b/templates/install_bit_settings_done.tpl @@ -1,4 +1,4 @@ -<h1>bitweaver Settings</h1> +<h1>Bitweaver Settings</h1> {form legend="Some Preliminary Settings"} <input type="hidden" name="step" value="{$next_step}" /> @@ -6,7 +6,6 @@ <div class="row"> <ul class="result"> <li class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} All setting have been stored successfully </li> </ul> @@ -50,6 +49,6 @@ {/if} <div class="row submit"> - <input type="submit" value="Continue Install Process" /> + <input type="submit" value="Continue install process" /> </div> {/form} diff --git a/templates/install_checks.tpl b/templates/install_checks.tpl index ac7fcf1..e330fe9 100644 --- a/templates/install_checks.tpl +++ b/templates/install_checks.tpl @@ -1,302 +1,235 @@ -<h1>bitweaver PHP Settings</h1> +<h1>Server Settings Check</h1> -{form legend="Server Settings" class=checks} +{form legend="Server settings" class=checks} <input type="hidden" name="step" value="{$next_step}" /> - <h2>Required Settings</h2> + {jstabs} + {jstab title="Setup"} - <p class="help">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"} - {forminput} - {foreach from=$required item="check"} - {if $check.passed} - <p>{biticon ipackage="icons" iname="dialog-ok" iexplain=success} {$check.note}</p> - {else} - <p class="error">{biticon ipackage="icons" iname="dialog-error" iexplain=error} {$check.note}</p> - {/if} - {/foreach} - {if $http_referer_error} - <p class="error"> - {biticon ipackage="icons" iname="dialog-error" iexplain=error} - We have detected that we cannot access the - _SERVER['HTTP_REFERER'] variable from your browser. This - can be because you have bookmarked this page and accessed - this page directly. If so, this will probably not cause any - problems during installation.<br />However, if you came - here from the welcome page, you are probably using some - sort of firewall which is blocking this information (a - common example is Norton Firewall). Please disable this - feature or the firewall until the installation process is - completed. - </p> + <h2>Required Settings</h2> + <p class="help">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 requirements"> + {formlabel label="Basic Requirements"} + {forminput} + {foreach from=$required item="check"} + {if $check.passed} + <p class="success">{$check.note}</p> + {else} + <p class="error">{$check.note}</p> + {/if} + {/foreach} + {if $http_referer_error} + <p class="error">We have detected that we cannot access the _SERVER['HTTP_REFERER'] variable from your browser. This can be because you have bookmarked this page and accessed this page directly. If so, this will probably not cause any problems during installation. However, if you came here from the welcome page, you are probably using some sort of firewall which is blocking this information (a common example is Norton Firewall). Please disable this feature or the firewall until the installation process is completed.</p> + {/if} + {/forminput} + </div> + + {if $error} + <p class="error">Before you can continue with the installation, you must rectify the <strong>problems listed in red</strong>. After you have made the changes, you can reload the page.</p> + <div class="row submit"> + <input type="submit" name="reload" value="Reload Page" /> + </div> + {else} + <p class="success">Your system meets all the requirements. You are ready to install Bitweaver.</p> {/if} - {/forminput} - </div> - - {if $error} - <p class="error"> - {biticon ipackage="icons" iname="dialog-error" iexplain=error} - Before you can continue with the installation, you must rectify the - <strong style="color:red;">problems listed in red</strong>. <br /> - After you have made the changes, you can reload the page. - </p> - - <div class="row submit"> - <input type="submit" name="reload" value="Reload Page" /> - </div> - {else} - <p class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} - Your system meets all the requirements. - </p> - {/if} - - <br /> - <h2>Recommended Settings</h2> + + + + <h2>PHP Settings</h2> + <p class="help">The following are settings that aren't strictly required by Bitweaver to run, but are recommendations. Bitweaver might still operate if your settings do not quite match the recommended. These settings can be adjusted by changing appropriate values in your <kbd>php.ini</kbd> file. If you should have problems setting these, please consult the documentation in the <kbd>php.ini</kbd> file itself and the <a class="external" href="http://www.php.net/">PHP homepage</a>.</p> + + <div class="row"> + {formlabel label="Recommended PHP settings"} + {forminput} + <table id="phpini" summary="This table lists recommended PHP settings for Bitweaver to run smoothly."> + <tr> + <th scope="col">php.ini setting</th> + <th scope="col">should be</th> + <th scope="col">actual</th> + </tr> + {foreach from=$recommended item="check"} + <tr class="{if $check.passed eq 'y'}success{else}warning{assign var=rec_warning value=true}{/if}"> + <td> + <abbr title="php.ini setting: {$check.1}">{$check.0}</abbr> + </td> + <td>{$check.shouldbe}</td> + <td>{$check.actual}</td> + </tr> + {/foreach} + </table> + {/forminput} + </div> + + {if $memory_warning} + <p class="warning">Your memory limit settings are rather low. Bitweaver requires at least 16MB memory to run, even having a limit of 16MB might cause undesired results. If you end up loading blank pages, it might be the <kbd>memory_limit</kbd> setting in your <kbd>php.ini</kbd> file. If you have a PHP optimiser such as eAccelerator installed you should be fine with 16MB, if not, please try to raise the limit to something higher.</p> + {/if} + + {if $rec_warning} + <p class="warning">Not all the recommended setting have been met. However, your site might still work without problems. Please keep these settings in mind if you run into problems.</p> + {else} + <p class="success">All recommended settings have been met.</p> + {/if} - <p class="help"> - The following are settings that aren't strictly required by bitweaver - to run, but are recommendations.<br /> bitweaver might still operate if - your settings do not quite match the recommended. These settings 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> + {/jstab} + {jstab title="Recommended"} - <div class="row"> - {formlabel label="Recommended settings"} - {forminput} - <table width="100%" summary="This table lists recommended php settings for bitweaver to run smoothly"> - <caption>Recommended php.ini Settings</caption> - <tr> - <th scope="col">Setting</th> - <th scope="col">Should be</th> - <th scope="col">Actual</th> - </tr> - {foreach from=$recommended item="check"} - <tr class="{if $check.passed eq 'y'}note{else}warning{/if}"> - <td> + <h2>Recommended Extensions</h2> + <p class="help">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 recommended"> + {formlabel label="Thoroughly recommended extensions"} + {forminput} + {foreach from=$extensions item="check"} + {if $check.passed} + <p class="success">{$check.note}</p> + {else} + {assign var=extwarning value=1} + <p class="warning">{$check.note}</p> + {/if} + {/foreach} + {/forminput} + </div> + + {if $extwarning} + <p class="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="success">All recommended extensions are installed.</p> + {/if} + + + + <h2>Recommended PEAR Extensions</h2> + <p class="help">PEAR provides extensions to PHP, which can easily be installed and updated using the pear interface on Linux. None of the extenstions below are required, they always provide an alternative to the existing methods available. Often these alternatives are superior to the default methods.</p> + + <div class="row recommended"> + {formlabel label="Recommended PEAR Extensions"} + {forminput} + {if !$pearexts.PEAR.passed} + {assign var=pearinstall value=1} + <p class="warning">{$pearexts.PEAR.note}</p> + <p>Extensions we can make use of:</p> + <ul> + {foreach from=$pearexts key=ext item="check"} + {if $ext != 'PEAR'} + <li><strong>PEAR::{$ext}</strong><br />{$check.original_note}</li> + {/if} + {/foreach} + </ul> + {else} + {foreach from=$pearexts item="check"} {if $check.passed} - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} + <p class="success">{$check.note}</p> {else} - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} - {assign var=rec_warning value=true} + {assign var=pearextswarning value=1} + <p class="warning">{$check.note}</p> {/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> - - {if $memory_warning} - <p class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} - Your memory limit settings are rather low. bitweaver requires at - least 16MB memory to run, even having a limit of 16MB might cause - undesired results. If you end up loading blank pages, it might be - the <strong>memory_limit</strong> setting in your - <strong>php.ini</strong> file. If you have a php optimiser such as - eAccelerator installed you should be fine with 16MB, if not, please - try to raise the limit to something higher. - </p> - {/if} - - {if $rec_warning} - <p class="warning"> - {biticon ipackage="icons" iname="dialog-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="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} - All recommended settings have been met. - </p> - {/if} - - <br /> - <h2>Recommended Extensions</h2> - - <p class="help"> - 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"} - {forminput} - {foreach from=$extensions item="check"} - {if $check.passed} - <p>{biticon ipackage="icons" iname="dialog-ok" iexplain=success} {$check.note}</p> - {else} - {assign var=extwarning value=1} - <p class="warning">{biticon ipackage="icons" iname="dialog-warning" iexplain=warning} {$check.note}</p> - {/if} - {/foreach} - {/forminput} - </div> - - {if $extwarning} - <p class="warning"> - {biticon ipackage="icons" iname="dialog-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="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} - All recommended extensions are installed. - </p> - {/if} - - <br /> - <h2>Recommended PEAR Extensions</h2> - - <p class="help"> - PEAR provides extensions to php, which can easily be installed and - updated using the pear interface on linux. None of the extenstions - below are required, they always provide an alternative to the existing - methods available. Often these alternatives are superior to the default - methods. - </p> - - <div class="row"> - {formlabel label="Recommended PEAR Extensions"} - {forminput} - {if !$pearexts.PEAR.passed} - {assign var=pearinstall value=1} - <p class="warning">{biticon ipackage="icons" iname="dialog-warning" iexplain=warning} {$pearexts.PEAR.note}</p> - <p>Extensions we can make use of:</p> + {/foreach} + {/if} + {/forminput} + </div> + + {if $pearinstall or $pearextswarning} + <p class="warning"> + <strong>Installation help</strong>: None of the recommend extension are required. + However, they do enhance some Bitweaver features. To install PEAR for your + Bitweaver site, choose one of the following methods. Users in a shared hosting environment + without PEAR should download the pre-packed set: + </p> + <ul> - {foreach from=$pearexts key=ext item="check"} - {if $ext != 'PEAR'} - <li><strong>PEAR::{$ext}</strong><br />{$check.original_note}</li> - {/if} - {/foreach} + {if $pearinstall} + <li>If you want to install PEAR, you can view the <a + class="external" + href="http://pear.php.net/manual/en/installation.getting.php">instructions</a> + (this is not necessary if you download the pre-packed set of + PEAR extensions below).</li> + {/if} + <li>Install PEAR extensions using <a class="external" + href="http://pear.php.net/manual/en/guide.users.commandline.cli.php"> + command line interface</a> (requires ssh access).</li> + <li>Install PEAR extensions in <a class="external" + href="http://pear.php.net/manual/en/installation.shared.php">a + shared environment</a> (requires ssh access or ftp access).</li> + <li>Download a pre-packed set of <a class="external" + href="http://www.bitweaver.org/downloads/file/11619">Bitweaver + PEAR extensions</a> and extract this to<br /> + <kbd>{$smarty.const.UTIL_PKG_PATH}pear/</kbd></li> </ul> {else} - {foreach from=$pearexts item="check"} - {if $check.passed} - <p>{biticon ipackage="icons" iname="dialog-ok" iexplain=success} {$check.note}</p> - {else} - {assign var=pearextswarning value=1} - <p class="warning">{biticon ipackage="icons" iname="dialog-warning" iexplain=warning} {$check.note}</p> - {/if} - {/foreach} + <p class="success"> + {biticon ipackage="icons" iname="dialog-ok" iexplain=success} + All recommended pear extensions are installed. + </p> {/if} - {/forminput} - </div> - - {if $pearinstall or $pearextswarning} - <p class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} - <strong>Installation help</strong>: Below you can find a selection - of methods to install PEAR extensions to make them work for your - bitweaver install. Please note that <strong>none of these - extensions are required</strong> and only enhance some - bitweaver features: - </p> - - <ul> - {if $pearinstall} - <li>If you want to install PEAR, you can view the <a - class="external" - href="http://pear.php.net/manual/en/installation.getting.php">instructions</a> - (this is not necessary if you download the pre-packed set of - PEAR extensions below).</li> + + <br /> + <h2>Recommended Executables</h2> + + <p class="help"> + Here we test for a set of executable files on your server. These files + are not mandatory but will enable you to perform certain tasks. We + generally try to avoid using external applications, but sometimes it's + the easiest and quickest way to achieve a certain goal. + </p> + + <div class="row recommended"> + {formlabel label="Recommended executables"} + {forminput} + {foreach from=$executables item="check"} + {if $check.passed} + <p class="success">{$check.note}</p> + {else} + {assign var=executableswarning value=1} + <p class="warning">{$check.note}</p> + {/if} + {/foreach} + {/forminput} + </div> + + {if $executableswarning} + <p class="warning"> + Please bear in mind that certain options will not be available to + you due to the fact that some of the applications Bitweaver uses + are not available. E.g., if <kbd>unzip</kbd> is not available, .zip files + cannot be processed after uploading them. + </p> + {else} + <p class="success"> + All recommended executables are installed. + </p> {/if} - <li>Install PEAR extensions using <a class="external" - href="http://pear.php.net/manual/en/guide.users.commandline.cli.php"> - command line interface</a> (requires ssh access).</li> - <li>Install PEAR extensions in <a class="external" - href="http://pear.php.net/manual/en/installation.shared.php">a - shared environment</a> (requires ssh access or ftp access).</li> - <li>Download a pre-packed set of <a class="external" - href="http://www.bitweaver.org/downloads/file/11619">bitweaver - PEAR extensions</a> and extract this to<br /> - <code>{$smarty.const.UTIL_PKG_PATH}pear/</code>.<br /> - This solution might be easiest for users in a shared - environment.</li> - </ul> - {else} - <p class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} - All recommended pear extensions are installed. - </p> - {/if} - - <br /> - <h2>Recommended Executables</h2> + + {/jstab} + {jstab title="Other"} - <p class="help"> - Here we test for a set of executable files on your server. These files - are not mandatory but will enable you to perform certain tasks. We - generally try to avoid using external applications, but sometimes it's - the easiest and quickest way to achieve a certain goal. - </p> + <h2>Settings worth knowing about</h2> + + <p class="help"> + The settings below are for your information, meant to + help you work out problems that might occur. + </p> + + <div class="row"> + {formlabel label="Settings worth knowing about"} + {forminput} + <ul> + {foreach from=$show item="check"} + <li>{$check}</li> + {/foreach} + </ul> + {/forminput} + </div> - <div class="row"> - {formlabel label="Recommended executables"} - {forminput} - {foreach from=$executables item="check"} - {if $check.passed} - <p>{biticon ipackage="icons" iname="dialog-ok" iexplain=success} {$check.note}</p> - {else} - {assign var=executableswarning value=1} - <p class="warning">{biticon ipackage="icons" iname="dialog-warning" iexplain=warning} {$check.note}</p> - {/if} - {/foreach} - {/forminput} - </div> - - {if $executableswarning} - <p class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} - Please bear in mind that certain options will not be available to - you due to the fact that some of the applications bitweaver uses - are not available. e.g.: if unzip is not available, .zip files - cannot be processed after uploading them. - </p> - {else} - <p class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} - All recommended executables are installed. - </p> - {/if} - - <br /> - <h2>Settings worth knowing about</h2> - - <p class="help"> - 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"} - {forminput} - {foreach from=$show item="check"} - <p>{$check}</p> - {/foreach} - {/forminput} - </div> + {/jstab} + {/jstabs} {if !$error} <div class="row submit"> - <input type="submit" name="reload" value="Reload Page" /> - <input type="submit" name="continue" value="Continue the Install process" /> + <input type="submit" name="reload" value="Reload page" /> + + <input type="submit" name="continue" value="Continue install process" /> </div> {/if} -{/form} + +{/form}
\ No newline at end of file diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl index 17a099c..67db749 100644 --- a/templates/install_cleanup.tpl +++ b/templates/install_cleanup.tpl @@ -1,16 +1,12 @@ <h1>Bitweaver integrity check</h1> -<p> - {biticon ipackage="icons" iname="dialog-information" iexplain=Information} - This page allows you to fix some basic setup problems. -</p> - -{form} +{form id="integrity_check"} <input type="hidden" name="step" value="{$next_step}" /> + {legend legend="Database Integrity Check"} + {if $metaTables} <p class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} We have scanned the database and have found some outdated tables. We will update these to the latest set of tables. If you wish to upgrade the tables by hand, please visit the @@ -32,7 +28,6 @@ {if $gBitSystem->isPackageActive( "treasury" )} <p class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} Seems that you have been using treasury. After the tables have been fixed, please make sure to go to the <a href="{$smarty.const.TREASURY_PKG_URL}admin/database_to_libertymime.php">treasury database upgrader</a> @@ -48,12 +43,11 @@ <div class="row"> {forminput} <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label> - {formhelp note="This will display SQL statements."} + {formhelp note="Display SQL statements."} {/forminput} </div> {elseif $dbIntegrity} <p class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} We have scanned the database for missing tables and have found that the following tables have not been installed: </p> <ul> @@ -85,53 +79,46 @@ <p>If you know SQL, you can display the table details and try to create such a table in your database and reload this page. This check merely checks the existence of a given table, not the table columns.</p> {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 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. + 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, 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, turn on the <strong>debugging</strong> option and look for error messages regarding the above tables. This will help the Bitweaver developers you contact to identify the problem more quickly. </p> {/if} {if $optional} <p class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} One of the optional packages you have selected for installation has not installed one of its tables. This will - probably render the package useless. You can try + probably render the package useless. You can try installing this package again by revisiting the <a href="{$smarty.const.INSTALL_PKG_URL}install.php?step={$smarty.request.step-1}">Package installation</a> - page. <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. + page. If this problem persists, turn on the <strong>debugging</strong> option and look + for error messages regarding the above table. This will help the Bitweaver developers you contact to identify the problem more quickly. </p> {/if} <div class="row submit"> - <input type="submit" name="create_tables" value="Try to create missing table(s)" /> + <input type="submit" name="create_tables" value="Try to create missing table/s" /> </div> <div class="row"> {forminput} <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label> - {formhelp note="This will display SQL statements."} + {formhelp note="Display SQL statements."} {/forminput} </div> {else} <p class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} Database integrity has been confirmed by scanning all available tables in your database and comparing them to the ones that should be present. </p> {/if} {/legend} - <br /> <br /> + {legend legend="Fix Permissioning"} {if $delPerms || $insPerms} <p class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain="Permission update"} Some permissions require your attention. {if $insPerms} <br />Some of these permissions might be from packages that have @@ -185,7 +172,6 @@ </table> {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. Even though this is true, we recommend you visit the {smartlink ititle="Permission @@ -194,19 +180,18 @@ </p> {/if} {/legend} - <br /> <br /> + {legend legend="Resolve Service Conflicts"} {if $serviceList} <p class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} We have noticed that you have activated multiple packages of - the same service type. A service package is a package that - allows you to extend the way you display bitweaver content - - such as <em>categorising your content</em>. <br /> The site + the same service type. A service package is a package that + allows you to extend the way you display Bitweaver content – + such as <em>categorising your content</em>. The site should still be fully functional, however, there might be some minor problems such as display of the wrong menus and - overlapping functionality. We therefore recommend that you + overlapping functionality. We therefore recommend that you enable only one of each service type. </p> @@ -234,7 +219,6 @@ {/foreach} {else} <p class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} None of the packages you have installed are causing any problems. </p> {/if} @@ -247,12 +231,12 @@ <div class="row"> {forminput} <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label> - {formhelp note="This will display SQL statements."} + {formhelp note="Display SQL statements."} {/forminput} </div> {else} <div class="row submit"> - <input type="submit" name="skip" value="Continue Install Process" /> + <input type="submit" name="skip" value="Continue install process" /> </div> {/if} {/legend} diff --git a/templates/install_cleanup_done.tpl b/templates/install_cleanup_done.tpl index cbb040d..5674b0a 100644 --- a/templates/install_cleanup_done.tpl +++ b/templates/install_cleanup_done.tpl @@ -4,8 +4,7 @@ <input type="hidden" name="step" value="{$next_step}" /> <p class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} - bitweaver was successfully updated + Bitweaver was successfully updated </p> {if $fixedPermissions} @@ -40,6 +39,6 @@ {/if} <div class="row submit"> - <input type="submit" value="Continue Install Process" /> + <input type="submit" value="Continue install process" /> </div> {/form} diff --git a/templates/install_database.tpl b/templates/install_database.tpl index 97f06b1..dbf219a 100644 --- a/templates/install_database.tpl +++ b/templates/install_database.tpl @@ -1,6 +1,6 @@ -<h1>Database Connection Information</h1> +<h1>Database Connection</h1> -{form legend="Please Enter your Database Connection Information"} +{form legend="Please enter your database connection information"} <input type="hidden" name="step" value="{$next_step}" /> <input type="hidden" name="gBitDbPassword_hash" value="{$gBitDbPassword_hash}" /> @@ -8,13 +8,11 @@ {if $warning or $error or $success} {if $warning} <p class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} - We have already set up a working connection with your db. Change these settings at your own peril. + We have already set up a working connection with your database. Change these settings at your own peril. </p> {elseif $error} <div class="error"> <p> - {biticon ipackage="icons" iname="dialog-error" iexplain=error} Database connection could not be established. </p> @@ -54,15 +52,15 @@ {/if} {if $dbservers} {html_options name='db' options=$dbservers id=db selected=$gBitDbType style="width:50%"} + {formhelp note="The type of database you intend to use."} {if $mysqlWarning} <p class="warning"> - Versions of MySQL less than 4.1 are not supported by some packages due to the <a href="http://dev.mysql.com/doc/refman/4.1/en/subqueries.html">lack of subquery support</a>. Notable among these are the <a href="http://www.bitweaver.org/wiki/BoardsPackage">Boards</a> and <a href="http://www.bitweaver.org/wiki/MessagesPackage">Messages</a> packages. Other packages may also have issues. It is recommended that you use MySQL version 4.1 or higher for the best experience with Bitweaver. It may be possible to use a lower versions of MySQL if you do not install these packages but this is not a supported configuration. + Versions of MySQL less than 4.1 are not supported by some packages due to the <a href="http://dev.mysql.com/doc/refman/4.1/en/subqueries.html">lack of subquery support</a>. Notable among these are the <a href="http://www.bitweaver.org/wiki/BoardsPackage">Boards</a> and <a href="http://www.bitweaver.org/wiki/MessagesPackage">Messages</a> packages. Other packages may also have issues. It is recommended that you use MySQL version 4.1 or higher for the best experience with Bitweaver. It <em>may</em> be possible to use a lower versions of MySQL if you do not install these packages. </p> {/if} {else} - <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> + <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."} <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> @@ -73,7 +71,7 @@ <input type="text" size="25" name="host" id="host" value="{if $gBitDbHost ne '' }{$gBitDbHost}{/if}" /> {formhelp note="Hostname or IP for your MySQL database, example:<br /> Use 'localhost' if your database is on the same machine as your server.<br /> - If you use Oracle, insert your TNS Name here<br /> + If you use Oracle, insert your TNS name here<br /> If you use SQLite, insert the path and filename to your database file<br /> If you are not sure what to put in here, try using localhost."} {/forminput} @@ -100,15 +98,15 @@ {forminput} <input type="text" size="25" name="name" id="name" value="{$gBitDbName}" /> { if ( $fbpath ) } - {formhelp note="The name of the database where bitweaver will create tables. You can - create a Firebird alias for the bitweaver database in aliases.conf and then use that + {formhelp note="The name of the database where Bitweaver will create tables. You can + create a Firebird alias for the Bitweaver database in aliases.conf and then use that aliase as the database name, or provide a full path and file name to create the database in an existing directory."} {else} - {formhelp note="The name of the database where bitweaver will create tables. You can + {formhelp note="The name of the database where Bitweaver will create tables. You can create the database using mysqladmin, or PHPMyAdmin or ask your hosting service to create a MySQL database. - Normally bitweaver tables won't conflict with other product names."} + Normally, Bitweaver tables won't conflict with other product names."} {/if} {/forminput} </div> @@ -117,11 +115,11 @@ { if ( $fbpath ) } {formhelp note="<strong>Do not use Prefix with Firebird, as the field and table names are already up to 30 characters.</strong>"} {/if} - {formlabel label="Database Prefix" for="prefix"} + {formlabel label="Database prefix" for="prefix"} {forminput} <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 + 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>. If you are NOT running MySQL (i.e. Postgres, Oracle, etc.) you can end the prefix string with a '.' (period) to use a schema in systems that support it. @@ -131,38 +129,38 @@ { if ( $fbpath ) } <div class="row"> - {formlabel label="Firebird Installation Path" for="fbpath"} + {formlabel label="Firebird installation path" for="fbpath"} {forminput} <input type="text" size="50" name="fbpath" id="fbpath" value="{$fbpath}" /> {formhelp note="If you have modified your Firebird installation from the default please enter the correct - path to the base firebird directory. This is used to find isql in order to create the initial blank - database and should be maintained in the correct format for your OS."} + path to the base Firebird directory. This is used to find isql in order to create the initial blank + database and should be maintained in the correct format for your operating system."} {/forminput} </div> {/if} <div class="row"> - {formlabel label="Site Base Url" for="baseurl"} + {formlabel label="Site base URL" for="baseurl"} {forminput} <input type="text" size="25" name="baseurl" id="baseurl" value="{$bit_root_url}" /> - {formhelp note="This is the path from the server root to your bitweaver location.<br /> - i.e. if you access bitweaver as 'http://MyServer.com/applications/new/wiki/index.php' you should enter '/applications/new/'"} + {formhelp note="This is the path from the server root to your Bitweaver location.<br /> + i.e. if you access Bitweaver as <kbd>http://MyServer.com/applications/new/wiki/index.php</kbd> you should enter <kbd>/applications/new/</kbd>"} {/forminput} </div> <div class="row"> - {formlabel label="Automatically submit bugs" for="auto_bug_submit"} + {formlabel label="Auto submit bugs" for="auto_bug_submit"} {forminput} <input type="checkbox" name="auto_bug_submit" id="auto_bug_submit"{if $auto_bug_submit} checked="checked"{/if} /> - {formhelp note="Checking this box will automatically submit fatal database errors to the bitweaver team. If you are running a live site, we recommend you check this box, as it will also avoid horrible error messages from appearing in such cases."} + {formhelp note="Checking this box will automatically submit fatal database errors to the Bitweaver team. If you are running a live site, consider checking this box, as it will also avoid fatal error messages from appearing to the user."} {/forminput} </div> <div class="row"> - {formlabel label="Site is Live" for="is_live"} + {formlabel label="Site is live" for="is_live"} {forminput} <input type="checkbox" name="is_live" id="is_live" /> - {formhelp note="Checking this will make debugging quite difficult as it will hide errors. Please only check this if your site is being used in a live environment right after installation."} + {formhelp note="Checking this will make debugging quite difficult as it will hide errors. Only check if your site is being used in a live environment right after installation."} {/forminput} </div> diff --git a/templates/install_database_done.tpl b/templates/install_database_done.tpl index 1274dc2..c3b4a1d 100644 --- a/templates/install_database_done.tpl +++ b/templates/install_database_done.tpl @@ -7,12 +7,10 @@ <ul class="result"> {if $error} <li class="error"> - {biticon ipackage="icons" iname="dialog-error" iexplain=error} {$error} </li> {else} <li class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} A connection to your database was sucessfully established </li> {/if} @@ -55,14 +53,14 @@ </div> <div class="row"> - {formlabel label="Database Prefix"} + {formlabel label="Database prefix"} {forminput} {$db_prefix_bit|replace:"`":""} {/forminput} </div> <div class="row"> - {formlabel label="Site Base Url"} + {formlabel label="Site base URL"} {forminput} {$bit_root_url} {/forminput} @@ -75,12 +73,11 @@ </p> {if substr( PHP_OS, 0, 3 ) == 'WIN'} <p class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain=success} - Your server seems to be a windows machine. Please set the PHP_MAGIC_PATH constant in the configuration file. + Your server seems to run under Microsoft Windows. Please set the PHP_MAGIC_PATH constant in the configuration file. </p> {/if} <p> - 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. + 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 helps with theme creation. </p> </div> @@ -89,12 +86,12 @@ {formlabel label="Use InnoDB tables" for="use_innodb"} {forminput} <input type="checkbox" name="use_innodb" id="use_innodb" {if $has_innodb_support eq 'DEFAULT'}checked="checked"{/if} /> - {formhelp note="Your database server supports InnoDB which provides MySQL with a transaction-safe storage engine that has commit, rollback, and crash recovery capabilities. You usually want this for safest possible data storage. Otherwise the standard MyIsam Engine is used."} + {formhelp note="Your database server supports InnoDB which provides MySQL with a transaction-safe storage engine that has commit, rollback, and crash recovery capabilities. You usually want this for safest possible data storage. Otherwise the standard MyIsam engine is used."} {/forminput} </div> {/if} <div class="row submit"> - <input type="submit" value="Continue {$section|default:"Install"} Process" /> + <input type="submit" value="Continue {$section|default:"install"} process" /> </div> {/form} diff --git a/templates/install_database_reset.tpl b/templates/install_database_reset.tpl index 9fdad48..f7cd8b8 100644 --- a/templates/install_database_reset.tpl +++ b/templates/install_database_reset.tpl @@ -8,14 +8,14 @@ </div> <div class="row submit"> - <input type="submit" name="continue_install" value="Continue {$section|default:"Install"} Process" /> + <input type="submit" name="continue_install" value="Continue {$section|default:"install"} process" /> </div> <div class="row"> - <p>Your database information is stored in the file '<strong>{$smarty.const.BIT_ROOT_PATH}kernel/config_inc.php</strong>'. If you would like to reset these settings with new ones, you will first have to delete the settings stored therein before you can connect to a different database.</p> + <p>Your database information is stored in the file <kbd>{$smarty.const.BIT_ROOT_PATH}kernel/config_inc.php</kbd>. To reset these settings with new ones, delete the settings stored therein before you connect to a different database.</p> <p class="warning">Before you hit the <strong>Reset config_inc.php file button</strong> please make sure you know what you are doing.</p> - <p>Hitting the <strong>Reset</strong> button will delete all contents in the config_inc.php file which will render your site useless until you've completed the installation process again. This is only really useful if your database access information has changed or if you plan to install bitweaver to a different database or use a different schema or prefix.</p> - <p>If you want to reinstall bitweaver into the same database as before, make sure you have deleted all bitweaver related tables before doing so. Reinstalling into an existing database might cause unwanted effects.</p> + <p>Hitting the <strong>Reset</strong> button will delete all contents in the <kbd>config_inc.php</kbd> file which will render your site useless until you've completed the installation process again. This is only really useful if your database access information has changed or if you plan to install Bitweaver to a different database or use a different schema or prefix.</p> + <p>If you want to reinstall Bitweaver into the same database as before, make sure you have deleted all Bitweaver related tables before doing so. Reinstalling into an existing database might cause unwanted effects.</p> </div> <div class="row submit"> diff --git a/templates/install_datapump.tpl b/templates/install_datapump.tpl index caa4d08..cefc4e4 100644 --- a/templates/install_datapump.tpl +++ b/templates/install_datapump.tpl @@ -1,20 +1,16 @@ <h1>Sample Data</h1> -{form legend="Populate Your Database With Useful Information"} +{form legend="Populating the database with useful information"} <input type="hidden" name="step" value="{$next_step}" /> <p> - Here we provide you with the option to add some sample data to your installation of bitweaver. - If this is your first installation, we recommend that you take advantage of this option, - since the information added contains useful information on how to use and navigate the appropriate packages. - </p> - <p> - Also, by adding this data to your database you will enter the site with a feel for what it will look like when populated with your own data. - This simplifies theme selection and allows you to evaluate the product more easily. + It's recommended to select this option to add sample data to your installation of Bitweaver. The sample data contains useful information on how to use and navigate the appropriate packages. You will enter the site with a feel for what it might look like later, when populated with actual content. This simplifies theme selection and allows you to evaluate the product more easily. </p> + {* <p> This page is only available during the first installation as it can cause problems when applied more than once. </p> + so? *} <div class="row"> {formlabel label="Packages that can be populated"} diff --git a/templates/install_datapump_done.tpl b/templates/install_datapump_done.tpl index 9a9a89b..4a1ded4 100644 --- a/templates/install_datapump_done.tpl +++ b/templates/install_datapump_done.tpl @@ -14,7 +14,6 @@ <ul class="result"> {if $error} <li class="error"> - {biticon ipackage="icons" iname="dialog-error" iexplain=error} The following errors occurred during the addition of the data <br /> {$error} @@ -22,10 +21,8 @@ {else} <li class="success"> {if count($pumpedData) == 0} - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} The Sample data was not added to your database {else} - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} The Sample data was successfully added to your database {/if} </li> @@ -47,6 +44,6 @@ {/foreach} <div class="row submit"> - <input type="submit" value="Continue Install Process" /> + <input type="submit" value="Continue install process" /> </div> {/form} diff --git a/templates/install_final_done.tpl b/templates/install_final_done.tpl index 1abef11..b12c2a7 100644 --- a/templates/install_final_done.tpl +++ b/templates/install_final_done.tpl @@ -2,23 +2,19 @@ {form action="`$smarty.const.BIT_ROOT_URL`index.php" legend="Installation has been completed sucessfully"} <p class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} Your system is ready for use now. </p> - <p>bitweaver features useful helpnotes throughout. However, should you require more help, you can always contact us by any of the means mentioned below.</p> - <p>Since we are still working hard on improving usability and stability of bitweaver, we haven't had time to translate bitweaver into various languages. If you are interested in helping us translate parts of bitweaver, please feel free to contact us.</p> - <p>If you want to find out more about existing packages and how to install them, you can find information at <a class="external" href="http://www.bitweaver.org/wiki/index.php?page=bitweaverFeatures">bitweaverFeatures</a>.</p> - <p>Best methods to get in contact with us:</p> + <p>Bitweaver offers helpnotes throughout. Should you require more help, you can always contact Bitweaver's developers by any of the means mentioned below. To find out more about existing packages and how to install them, visit <a class="external" href="http://www.bitweaver.org/wiki/index.php?page=bitweaverFeatures">Bitweaver Features</a>.</p> + <p>To get in contact with Bitweaver developers:</p> <ul> - <li>IRC (<a class="external" href="http://www.bitweaver.org/wiki/index.php?page=ConnectingToIrc">instructions</a> on connecting to irc)</li> - <li><a class="external" href="http://sourceforge.net/mail/?group_id=141358">Sourceforge mailing list</a></li> - <li>If you wish to report any bugs, we urge you to do this at <a class="external" href="http://sourceforge.net/tracker/?atid=749176&group_id=1413589&func=browse">Sourceforge</a></li> - <li>the <a class="external" href="http://www.bitweaver.org/forums/viewforum.php?f=5">bitweaver Forums</a> might contain useful information.</li> - <li><a class="external" href="http://www.bitweaver.org/">bitweaver</a> currently contains all the documentation we have.</li> + <li><a class="external" href="http://www.bitweaver.org/wiki/Live+Support">chat:</a> #bitweaver on freenode.net</li> + <li><a class="external" href="http://sourceforge.net/mail/?group_id=141358">mailing list at sourceforge.net</a></li> + <li><a class="external" href="http://www.bitweaver.org/forums/viewforum.php?f=5">bitweaver.org Forums</a></li> + <li><a class="external" href="http://www.bitweaver.org/">bitweaver.org</a> contains all available documentation</li> + <li>submit bugs to Bitweaver's <a class="external" href="http://sourceforge.net/tracker/?group_id=141358&atid=749176">bug tracker at sourceforge.net</a></li> </ul> - <p>If you think you could contribute to bitweaver in any way, please feel free to contact us. we appreciate all the help we can get.</p> + <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> - <hr /> <h2>Some final notes</h2> <ul> <li> @@ -26,32 +22,32 @@ <ul> <li> <strong>Linux</strong> - <br />Change the directory permission with '<span class="highlight">chmod 000 install/</span>'. If need to run the installer again, you will have to revert the permissions with '<span class="highlight">chmod 755 install/</span>'. + <br />Change the directory permission with <kbd>chmod 000 install/</kbd>. If 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 '<span class="highlight">install/install_inc.php</span>' to something like '<span class="highlight">install/install_inc.php.done</span>' + <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 <span class="highlight">kernel/config_inc.php</span> 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. + <br />We urge you to look at your <kbd>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 recommond you visit our <a class="external" href="http://www.bitweaver.org/wiki/bitweaverPerformance">bitweaverPerformance</a> page on how to optimise your bitweaver install.</li> - <li>Please also have a look at your <span class="highlight">kernel/config_inc.php</span> file. It contains various settings that cannot be set elsewhere and which might be of interest to you.</li> + <li>For production sites, we recommond 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>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> <br /> - <p class="help" style="text-align:center;">Finally, we thank you again for trying bitweaver.</p> + <p class="help" style="text-align:center;">Finally, we thank you again for trying Bitweaver.</p> <br /> <div class="row submit"> - <input type="submit" size="20" value="Enter Your bitweaver Site" /> + <input type="submit" size="20" value="Enter your Bitweaver site" /> </div> {/form} diff --git a/templates/install_options.tpl b/templates/install_options.tpl index 59cb3e7..8ad526f 100644 --- a/templates/install_options.tpl +++ b/templates/install_options.tpl @@ -1,56 +1,26 @@ -<h1>Database Options</h1> +<h1>Install Options</h1> -{form legend="Installation Options"} +{form legend="Install or upgrade Bitweaver" style="text-align:center"} <input type="hidden" name="step" value="{$next_step}" /> - <h2>Continue Installation</h2> - <p>Select this option if this is your first installation of bitweaver.</p> - - <div class="row submit"> - <input type="submit" name="continue_install" value="Continue Install Process" /> - </div> + <br /> + <input type="submit" name="continue_install" value="Install Bitweaver" /> + <p>Select this option if this is your first installation of Bitweaver.</p> + <hr /> - - <h2>Upgrade bitweaver Release 1</h2> - - <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 use the option - below.</p> - - <div class="row submit"> - <input type="submit" name="upgrade_r1" value="Upgrade bitweaver" /> - </div> + + <input type="submit" name="upgrade_r1" value="Upgrade from R1" /> + <p>Select this option, if you have an existing Bitweaver version 1 installed and would like to upgrade to version 2.</p> <hr /> - <h2>Upgrade an Existing Database</h2> - <p>Choosing this path will allow you to upgrade your database from an - application like TikiWiki to a bitweaver database. You will be brought - back to the installer once the upgrade process has been completed.</p> - - <div class="row submit"> - <input type="submit" name="upgrade" value="Upgrade an existing Database" /> - </div> + <input type="submit" name="upgrade" value="Upgrade database" /> + <p>Select this option, if you want to upgrade from Bitweaver versions prior to 1, or from other applications such as Tikiwiki. You will be brought back to the installer once the upgrade process has been completed.</p> <hr /> - <h2>Migrate a Database</h2> - <p>If you wish to migrate a database from one database source to another, - such as from MySQL to PostgreSQL, please select this option. You will - be brought back to the installer once the upgrade process has been - completed.</p> - - <p class="warning">This feature is currently not working. It was working - once and needs some attention since it hasn't been updated in a while. - If you know some PHP, please help us out if you are interested in this - feature.<p> + <input type="submit" name="migrate" value="Migrate database" /> + <p>Select this option, if you wish to migrate from one database source to another, such as from MySQL to PostgreSQL. You will be brought back to the installer once the upgrade process has been completed. <strong>This feature is currently not working. It was working once and needs some attention since it hasn't been updated in a while. If you know some PHP, please help us out if you are interested in this feature.</strong><p> - <div class="row submit"> - <input type="submit" name="migrate" value="Migrate a Database" /> - </div> -{/form} +{/form}
\ No newline at end of file diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl index 107317b..96849f9 100644 --- a/templates/install_packages.tpl +++ b/templates/install_packages.tpl @@ -2,18 +2,17 @@ {if $first_install} <h1>Package Installation</h1> {else} - <h1>Adding and Removing Packages</h1> + <h1>Adding and removing packages</h1> {/if} <br /> {if $error} {legend legend="Administrator Data Missing"} <p class="error"> - {biticon ipackage="icons" iname="dialog-error" iexplain=error} Unfortunately there seems to be a problem with your installation. We can't find the administrator information you entered. </p> - <p>Please go back one step (using the link to your right, rather than the back button on your browser) and enter the administrator data again. If this is the second time you see this screen, please confirm that php can write sessions and that any firewall / anti-virus software is turned off during the installation process. </p> - <p>If you just can't figure out what the hell is going on, please contact the bitweaver team via <a href="http://www.bitweaver.org/wiki/index.php?page=ConnectingToIrc">IRC</a> if possible or post to the forums on <a href="http://www.bitweaver.org">bitweaver.org</a>.</p> + <p>Please go back one step (using the link to your right, rather than the back button on your browser) and enter the administrator data again. If this is the second time you see this screen, please confirm that PHP can write sessions and that any firewall/anti-virus software is turned off during the installation process.</p> + <p>If you just can't figure out what the hell is going on, please contact the Bitweaver team via <a href="http://www.bitweaver.org/wiki/Live+Support">IRC</a> if possible or post to the forums on <a href="http://www.bitweaver.org">bitweaver.org</a>.</p> {/legend} {else} {formfeedback warning=$warning} @@ -37,9 +36,9 @@ {/foreach} {if $new_packages} - <p>This is a list with all available bitweaver packages that are ready for installation. Packages that are installed now, can later be deactivated and even deleted from your server if you don't need them anymore.<br />If you have any external packages such as <strong>phpBB</strong> or <strong>gallery2</strong> lined up for installation, you will have to do this separately after completing the bitweaver installation process.</p> + <p>This is a list with all available Bitweaver packages that are ready for installation. Packages that are installed now, can later be deactivated and even deleted from your server if you don't need them anymore.<br />If you have any external packages such as <strong>phpBB</strong> or <strong>gallery2</strong> lined up for installation, you will have to do this separately after completing the Bitweaver installation process.</p> - {formfeedback warning="Be conscientious about installing packages. The more packages you activate, the more computer power you will need. It is easy to install packages at a later date, so we advise initially installing just the packages you need."} + <p class="warning">Be conscientious about installing packages. The more packages you activate, the more computer power you will need. It is easy to install packages at a later date, so we advise initially installing just the packages you need.</p> <div class="row"> {forminput} @@ -51,7 +50,7 @@ <h2>Packages</h2> - <p>Packages are the parts of bitweaver that deal with content such as wiki pages, blogs or news articles.</p> + <p>Packages are the parts of Bitweaver that deal with content such as wiki pages, blogs or news articles.</p> {foreach from=$schema key=package item=item} {if !$item.installed and !$item.required and !$item.service} @@ -109,7 +108,7 @@ </p> {/if} <div class="row submit"> - Please press this button only once<br /> + Please press this button only once.<br /> Depending on the number of packages and the hardware,<br /> this process might take up to a few minutes.<br /><br /> <input type="hidden" name="resetdb" value="{$resetdb}" /> @@ -119,7 +118,7 @@ <div class="row"> {forminput} <label><input type="checkbox" name="debug" value="true" /> Debug mode</label> - {formhelp note="This will display SQL statements."} + {formhelp note="Display SQL statements."} {/forminput} </div> @@ -127,16 +126,16 @@ {/jstab} {if !$first_install} - {jstab title="Un / Reinstall Packages"} + {jstab title="Uninstall/Reinstall"} {form legend="Already Installed Packages"} <input type="hidden" name="step" value="{$next_step}" /> <div class="row"> - {formfeedback warning="These packages are already installed on your system. If you select any of these checkboxes, all the data associated with it, will be erased."} + {formfeedback warning="These packages are already installed on your system. If you select any of these checkboxes, all the data associated with it will be erased (depending on options below)."} </div> <div class="row"> - {formlabel label="Un / Reinstall packages"} + {formlabel label="selected packages:"} {forminput} <label><input type="radio" name="method" value="reinstall" checked="checked" /> Reinstall</label> <br /> @@ -146,14 +145,14 @@ </div> <div class="row"> - {formlabel label="Un / Reinstall options"} + {formlabel label=""} {forminput} - <label><input type="checkbox" name="remove_actions[]" value="tables" checked="checked" /> Delete package tables.</label> - {formhelp note="This will leave all package specific settings in tact and will also leave content in the liberty tables, which might lead to undesired results."} - <label><input type="checkbox" name="remove_actions[]" value="settings" checked="checked" /> Delete package settings.</label> - {formhelp note="This will remove all package specific settings. Select only this checkbox if you want to reset a package to it's default values including permissions."} - <label><input type="checkbox" name="remove_actions[]" value="content" checked="checked" /> Delete package content.</label> - {formhelp note="This will remove all content that has been stored in the common content storage area."} + <label><input type="checkbox" name="remove_actions[]" value="tables" checked="checked" /> Delete database tables</label> + {formhelp note="If selected, the package's database tables are deleted. If no other option is selected, specific settings might remain in Kernel configuration, and specific content might remain in Liberty tables, both of which might lead to undesired results."} + <label><input type="checkbox" name="remove_actions[]" value="settings" checked="checked" /> Delete package settings</label> + {formhelp note="If selected, all package specific settings are removed. Therefor the package is reset to it's default values, including permissions."} + <label><input type="checkbox" name="remove_actions[]" value="content" checked="checked" /> Delete stored content</label> + {formhelp note="If selected, all content that has been stored in the common content storage area is removed."} {/forminput} </div> @@ -178,27 +177,27 @@ {/foreach} <div class="row submit"> - Please press this button only once<br /> + Please press this button only once.<br /> Depending on the number of packages and the hardware,<br /> this process might take up to a few minutes.<br /><br /> - <input type="submit" name="submit_packages" value="Un / Reinstall Packages" onclick="return confirm( 'Are you sure you want to Un / Reinstall the selected packages?' );" /> + <input type="submit" name="submit_packages" value="Uninstall/Reinstall Packages" onclick="return confirm( 'Are you sure you want to uninstall/reinstall the selected packages?' );" /> </div> <div class="row"> {forminput} <label><input type="checkbox" name="debug" value="true" /> Debug mode</label> - {formhelp note="This will display SQL statements."} + {formhelp note="Display SQL statements."} {/forminput} </div> {/form} {/jstab} {/if} - {jstab title="Required Packages"} - {legend legend="Packages that are required by bitweaver"} + {jstab title="Required"} + {legend legend="Packages and services required by Bitweaver"} {if !$first_install} <div class="row"> - {formfeedback warning="If you wish to reset the data in your entire system, you will first have to create a new database or empty it manually."} + {formfeedback warning="To reset the entire system, first create a new database (or empty the existing database manually)."} </div> {/if} @@ -225,7 +224,7 @@ {form} <input type="hidden" name="step" value="{$next_step}" /> <div class="row submit"> - <input type="submit" name="cancel" value="Skip this Stage and resolve existing conflicts" /> + <input type="submit" name="cancel" value="Skip this stage and resolve existing conflicts" /> </div> {/form} {/if} diff --git a/templates/install_packages_done.tpl b/templates/install_packages_done.tpl index 21fa856..e846cce 100644 --- a/templates/install_packages_done.tpl +++ b/templates/install_packages_done.tpl @@ -8,7 +8,6 @@ <div class="row"> <ul class="result"> <li class="error"> - {biticon ipackage="icons" iname="dialog-error" iexplain=error} There was a problem during the installation </li> <li> @@ -21,7 +20,6 @@ {if $failedcommands} <div class="row"> <h2 class="warning"> - {biticon ipackage="icons" iname="dialog-error" iexplain=error} The following database operations failed </h2> {section loop=$failedcommands name=idx}<p class="error">{$errors[idx]|escape}:<br/> {$failedcommands[idx]|escape}</p>{/section} @@ -32,7 +30,6 @@ <div class="row"> <ul class="result"> <li class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} All Database operations completed succesfully </li> </ul> @@ -42,7 +39,6 @@ <div class="row"> <ul class="result"> <li class="warning"> - {biticon ipackage="icons" iname="dialog-warning" iexplain=warning} You have just successfully installed new packages. During installation, new permissions were probably added to the database, but not assigned to any groups. @@ -102,6 +98,6 @@ {/if} <div class="row submit"> - <input type="submit" value="Continue Install Process" /> + <input type="submit" value="Continue install process" /> </div> {/form} diff --git a/templates/install_welcome.tpl b/templates/install_welcome.tpl index 9cd9c76..a046c57 100644 --- a/templates/install_welcome.tpl +++ b/templates/install_welcome.tpl @@ -1,40 +1,49 @@ -<h1>Welcome to the bitweaver installer</h1> +{strip} +<h1>Welcome to the Bitweaver Installer</h1> -{form} - {legend legend="Begin the installation process"} +{form id="install_welcome"} + {legend legend=""} <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 access various pages of the installer. To install new packages, please visit <strong><a href="install.php?step=3">Packages</a></strong>.</p> {/if} - <p> Thank you for choosing bitweaver. This web application offers an - unparalleled 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> - - <p class="warning"> - If you want to upgrade from <strong>bitweaver R1</strong> please - follow the installation process. You can select the upgrader on the - <strong>Install Options</strong> page. - </p> + <p>Thank you for choosing Bitweaver. This web content management system offers an unparalleled consonance of simplicity, performance, and flexibility. For questions, comments, and support, please visit <a class="external" href="http://www.bitweaver.org">bitweaver.org</a>. Help is available via <a class="external" href="http://www.bitweaver.org/">the forum</a> and via <a title="#bitweaver IRC Channel on freenode.net" class="external" href="http://www.bitweaver.org/wiki/Live+Support">#bitweaver chat</a>. Click to begin the install process:</p> <div class="row submit"> - <input type="submit" name="install" value="Begin the Install process" /> + <input type="submit" name="install" value="Begin the install process" /> + <p><strong>This installer will guide you through the installation or upgrade.</strong></p> </div> + + {*<p class="warning">If you want to <strong>upgrade</strong> from Bitweaver version 1, begin the install process now. You will find the upgrader on the <strong>Install Options</strong> page.</p>*} + + <table> + <!-- thead> + <tr> + <th>you install:</th> + <th>your get:</th> + </tr> + </thead --> + <tbody> + <tr> + <td class="center"> + <img src="style/images/bitweaver_logo-trans.png" width="121" height="121" /> + </td> + </tr> + <tr> + <td class="center"> + <ul> + <li>free, gratis, and open source</li> + <li>modular, fast, and flexible</li> + <li>easy to use, easy to extend</li> + <li>many 1st class 3rd party components</li> + <li>a community that supports you</li> + </ul> + </td> + </tr> + </tbody> + </table> {/legend} {/form} +{/strip}
\ No newline at end of file diff --git a/templates/migrate_database.tpl b/templates/migrate_database.tpl index a6167a3..264bd81 100644 --- a/templates/migrate_database.tpl +++ b/templates/migrate_database.tpl @@ -10,7 +10,6 @@ {if $error_src} <ul class="result"> <li class="error"> - {biticon ipackage="icons" iname="dialog-error" iexplain=error} Database connection could not be established. <ul> <li>Perhaps your database is not available</li> @@ -30,12 +29,12 @@ </div> <div class="row"> - {formlabel label="Source Database type" for="db_src"} + {formlabel label="Source database type" for="db_src"} {forminput} {if $dbservers} {html_options name='db_src' options=$dbservers id=db_src selected=$db_src} {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>.'} + {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>.'} {/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."} @@ -43,19 +42,19 @@ </div> <div class="row"> - {formlabel label="Source Host" for="host_src"} + {formlabel label="Source host" for="host_src"} {forminput} <input type="text" size="25" name="host_src" id="host_src" value="{if $host_src ne '' }{$host_src}{/if}" /> {formhelp note="Hostname or IP for your MySQL database, example:<br /> Use 'localhost' if your database is on the same machine as your server.<br /> - If you use Oracle, insert your TNS Name here<br /> + If you use Oracle, insert your TNS name here<br /> If you use SQLite, insert the path and filename to your database file<br /> If you are not sure what to put in here, try using localhost."} {/forminput} </div> <div class="row"> - {formlabel label="Source User" for="user_src"} + {formlabel label="Source user" for="user_src"} {forminput} <input type="text" size="25" name="user_src" id="user_src" value="{$user_src}" /> {formhelp note="Database user"} @@ -71,32 +70,32 @@ </div> <div class="row"> - {formlabel label="Source Database name" for="name_src"} + {formlabel label="Source database name" for="name_src"} {forminput} <input type="text" size="25" name="name_src" id="name_src" value="{$name_src}" /> { if ( $fbpath ) } - {formhelp note="The name of the database where bitweaver will create tables. You can - create a Firebird alias for the bitweaver database in aliases.conf and then use that + {formhelp note="The name of the database where Bitweaver will create tables. You can + create a Firebird alias for the Bitweaver database in aliases.conf and then use that aliase as the database name, or provide a full path and file name to create the database in an existing directory."} {else} - {formhelp note="The name of the database where bitweaver will create tables. You can + {formhelp note="The name of the database where Bitweaver will create tables. You can create the database using mysqladmin, or PHPMyAdmin or ask your hosting service to create a MySQL database. - Normally bitweaver tables won't conflict with other product names."} + Normally Bitweaver tables won't conflict with other product names."} {/if} {/forminput} </div> <div class="row"> { if ( $fbpath ) } - {formhelp note="<strong>Do not use Prefix with Firebird, as the field and table names are already up to 30 characters.</strong>"} + {formhelp note="<strong>Do not use prefix with Firebird, as the field and table names are already up to 30 characters.</strong>"} {/if} {formlabel label="Source Database Prefix" for="prefix_src"} {forminput} <input type="text" size="25" name="prefix_src" id="prefix_src" value="{$prefix_src}" /> {formhelp note="This prefix will be prepended to the begining of every table name to allow multiple - independent install to share a single database. All bitweaver tables begin with 'bit_' or 'users_', + independent install to share a single database. All Bitweaver tables begin with 'bit_' or 'users_', so you rarely need to enter a prefix. If you are NOT running MySQL (i.e. Postgres, Oracle, etc.) you can end the prefix string with a '.' (period) to use a schema in systems that support it. <strong>MySQL does NOT support schemas.</strong>"} @@ -122,7 +121,6 @@ <div class="row"> {if $error_dst} <li class="error"> - {biticon ipackage="icons" iname="dialog-error" iexplain=error} Database connection could not be established. <ul> <li>Perhaps your database is not available</li> @@ -147,7 +145,7 @@ {if $dbservers} {html_options name='db_dst' options=$dbservers id=db_dst 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>.'} + {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>.'} {/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."} @@ -167,7 +165,7 @@ </div> <div class="row"> - {formlabel label="Destination User" for="user_dst"} + {formlabel label="Destination user" for="user_dst"} {forminput} <input type="text" size="25" name="user_dst" id="user_dst" value="{$gBitDbUser}" /> {formhelp note="Database user"} @@ -175,7 +173,7 @@ </div> <div class="row"> - {formlabel label="Destination Password" for="pass_dst"} + {formlabel label="Destination password" for="pass_dst"} {forminput} <input type="password" size="25" name="pass_dst" id="pass_dst" value="{$gBitDbPassword_input}" /> {formhelp note="Database password"} @@ -183,32 +181,32 @@ </div> <div class="row"> - {formlabel label="Destination Database name" for="name_dst"} + {formlabel label="Destination database name" for="name_dst"} {forminput} <input type="text" size="25" name="name_dst" id="name_dst" value="{$gBitDbName}" /> { if ( $fbpath ) } - {formhelp note="The name of the database where bitweaver will create tables. You can - create a Firebird alias for the bitweaver database in aliases.conf and then use that + {formhelp note="The name of the database where Bitweaver will create tables. You can + create a Firebird alias for the Bitweaver database in aliases.conf and then use that aliase as the database name, or provide a full path and file name to create the database in an existing directory."} {else} - {formhelp note="The name of the database where bitweaver will create tables. You can + {formhelp note="The name of the database where Bitweaver will create tables. You can create the database using mysqladmin, or PHPMyAdmin or ask your hosting service to create a MySQL database. - Normally bitweaver tables won't conflict with other product names."} + Normally Bitweaver tables won't conflict with other product names."} {/if} {/forminput} </div> <div class="row"> { if ( $fbpath ) } - {formhelp note="<strong>Do not use Prefix with Firebird, as the field and table names are already up to 30 characters.</strong>"} + {formhelp note="<strong>Do not use prefix with Firebird, as the field and table names are already up to 30 characters.</strong>"} {/if} {formlabel label="Destination Database Prefix" for="prefix_dst"} {forminput} <input type="text" size="25" name="prefix_dst" id="prefix_dst" value="{$db_prefix_bit}" /> {formhelp note="This prefix will be prepended to the begining of every table name to allow multiple - independent install to share a single database. All bitweaver tables begin with 'bit_' or 'users_', + independent install to share a single database. All Bitweaver tables begin with 'bit_' or 'users_', so you rarely need to enter a prefix. If you are NOT running MySQL (i.e. Postgres, Oracle, etc.) you can end the prefix string with a '.' (period) to use a schema in systems that support it. <strong>MySQL does NOT support schemas.</strong>"} @@ -217,7 +215,7 @@ { if ( $fbpath ) } <div class="row"> - {formlabel label="Firebird Installation Path" for="fbpath"} + {formlabel label="Firebird installation path" for="fbpath"} {forminput} <input type="text" size="50" name="fbpath" id="fbpath" value="{$fbpath}" /> {formhelp note="If you have modified your Firebird installation from the default please enter the correct @@ -228,11 +226,10 @@ {/if} <div class="row"> - {formlabel label="Site Base Url" for="baseurl"} + {formlabel label="Site Base URL" for="baseurl"} {forminput} <input type="text" size="25" name="baseurl" id="baseurl" value="{$bit_root_url}" /> - {formhelp note="This is the path from the server root to your bitweaver location.<br /> - i.e. if you access bitweaver as 'http://MyServer.com/applications/new/wiki/index.php' you should enter '/applications/new/'"} + {formhelp note="This is the path from the server root to your Bitweaver location, i.e., if you access Bitweaver as <kbd>http://MyServer.com/applications/new/wiki/index.php</kbd> you should enter <kbd>/applications/new/</kbd>"} {/forminput} </div> @@ -240,14 +237,14 @@ {formlabel label="Automatically submit bugs" for="auto_bug_submit"} {forminput} <input type="checkbox" name="auto_bug_submit" id="auto_bug_submit"{if $auto_bug_submit} checked="checked"{/if} /> - {formhelp note="Checking this box will automatically submit fatal database errors to the bitweaver team. If you are running a live site, we recommend you check this box, as it will also avoid horrible error messages from appearing in such cases."} + {formhelp note="Checking this box will automatically submit fatal database errors to the Bitweaver team. If you are running a live site, we recommend you check this box, as it will also avoid horrible error messages from appearing in such cases."} {/forminput} </div> {/legend} {/jstab} {jstab title="Options"} - {legend legend="Migration Options"} + {legend legend="Migration options"} <div class="row"> {formlabel label="Tables to be skipped" for="skip_tables"} {forminput} @@ -293,7 +290,7 @@ <div class="row"> {forminput} <label><input type="checkbox" name="debug" id="debug"{if $debug} checked="checked"{/if} /> Debug mode</label> - {formhelp note="This will display SQL statements."} + {formhelp note="Display SQL statements."} {/forminput} </div> {/legend} diff --git a/templates/migrate_database_done.tpl b/templates/migrate_database_done.tpl index e93baf0..5f421a7 100644 --- a/templates/migrate_database_done.tpl +++ b/templates/migrate_database_done.tpl @@ -12,7 +12,6 @@ <ul class="result"> {if $error} <li class="error"> - {biticon ipackage="icons" iname="dialog-error" iexplain=error} {$error} </li> {/if} @@ -20,6 +19,6 @@ </div> <div class="row submit"> - <input type="submit" value="Continue Process" /> + <input type="submit" value="Continue process" /> </div> {/form} diff --git a/templates/migrate_final_done.tpl b/templates/migrate_final_done.tpl index 00131f0..2c05d3a 100644 --- a/templates/migrate_final_done.tpl +++ b/templates/migrate_final_done.tpl @@ -1,6 +1,6 @@ <h1>Upgrade Process Completed</h1> {form legend="Select what you want to do next"} - <p>Go back to the installer to install additional packages that were not part of this migrate</p> + <p>Go back to the installer to install additional packages that were not part of this migrate.</p> <div class="row submit"> <input type="hidden" name="step" value="{$next_step}" /> <input type="submit" name="continue_install" value="Return to Installer" /> @@ -8,8 +8,8 @@ <hr /> - <p>Enter your bitweaver site now to see if the migrate process was successful</p> + <p>Enter your Bitweaver site now to see if the migrate process was successful.</p> <div class="row submit"> - <input type="submit" name="enter_bitweaver" value="Enter bitweaver" /> + <input type="submit" name="enter_bitweaver" value="Enter site" /> </div> {/form} diff --git a/templates/migrate_welcome.tpl b/templates/migrate_welcome.tpl index 3032f01..1d384af 100644 --- a/templates/migrate_welcome.tpl +++ b/templates/migrate_welcome.tpl @@ -1,19 +1,19 @@ -<h1>bitweaver Migrate Tool</h1> +<h1>Bitweaver migrate tool</h1> {form legend="Begin the migrate process"} <input type="hidden" name="step" value="{$next_step}" /> - <p>Welcome to the new and improved bitweaver migrate process. Our migrate 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 migrate 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 migrate stages.</p> - <ul class="result"> - <li 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.)</li> - <li class="warning"><strong>Do a Trial Run first</strong><br />You should run a trial migrate on an offline server, personal machine, etc. before you do this on your live site.</li> - <li class="warning">Migrates can <strong>take a long time</strong><br />Make sure your max_execution_time in your php.ini is large enough for your site.</li> - <strong>{formfeedback warning=$dbWarning}</strong> - </ul> - <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 migrate process. Our migrate 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 migrate process as reliable and complete as we possibly can. Due to this, we urge you to follow the instructions here carefully before you proceed. 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. Initial steps before beginning the actual migrate 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 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 migrate on an offline server, personal machine, etc. before you do this on your live site.</p> + + <p class="warning">Migrates 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> + + <strong>{formfeedback warning=$dbWarning}</strong> <div class="row submit"> - <input type="submit" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the Migrate process!"}" /> + <input type="submit" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the migrate process!"}" /> </div> {/form} diff --git a/templates/upgrade_final_done.tpl b/templates/upgrade_final_done.tpl index e732b99..d0f561a 100644 --- a/templates/upgrade_final_done.tpl +++ b/templates/upgrade_final_done.tpl @@ -9,7 +9,7 @@ </p> <div class="row submit"> <input type="hidden" name="step" value="{$next_step}" /> - <input type="submit" name="continue_install" value="Install more Packages" /> + <input type="submit" name="continue_install" value="Install more packages" /> </div> <hr /> @@ -17,9 +17,8 @@ <p> Due to the large number of changes that have been made, there might be permissions and other minor issues that need to be fixed. You can - return to the installer to let us analyse your bitweaver install and - try to <strong>resole conflicts</strong>. We will inform you what steps - need to be taken to fix these. This option is recommneded since it will + return to the installer to let Bitweaver analyse your install and + try to <strong>resolve conflicts</strong>. This option is recommended. It will inform you of the health of your install. </p> <div class="row submit"> @@ -29,12 +28,11 @@ <hr /> <p> - We recommend that you try to resolve conflicts now but if you can't - wait to see if your website is still working, you can enter your - bitweaver site now. You can return to the installer at any time to + It's recommended to resolve conflicts now, but if you want to see if your website is still working, you can enter your + Bitweaver now. You can return to the installer at any time to resolve potential issues and insert missing permissions and settings. </p> <div class="row submit"> - <input type="submit" name="enter_bitweaver" value="Enter bitweaver" /> + <input type="submit" name="enter_bitweaver" value="Enter Bitweaver" /> </div> {/form} diff --git a/templates/upgrade_packages.tpl b/templates/upgrade_packages.tpl index 15337d3..c0dcaea 100644 --- a/templates/upgrade_packages.tpl +++ b/templates/upgrade_packages.tpl @@ -4,16 +4,16 @@ <input type="hidden" name="step" value="{$next_step}" /> <div class="row"> - {formlabel label="Upgrade Application" for="db"} + {formlabel label="Upgrade application" for="db"} {forminput} {if $smarty.session.upgrade_r1} <input type="hidden" name="upgrade_from" value="BWR1" /> - bitweaver <strong>ReleaseOne</strong> <em>-R1-</em> + Bitweaver <strong>ReleaseOne</strong> <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> + <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> @@ -22,7 +22,7 @@ </select> {/if} <br />to - <br />bitweaver <strong>ReleaseTwo</strong> <em>-R2-</em> + <br />Bitweaver <strong>ReleaseTwo</strong> <em>-R2-</em> {formhelp note="The type of application you intend to upgrade"} {/forminput} </div> @@ -43,7 +43,7 @@ <div class="row"> {forminput} <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label> - {formhelp note="This will display SQL statements."} + {formhelp note="Display SQL statements."} {/forminput} </div> {/form} diff --git a/templates/upgrade_packages_done.tpl b/templates/upgrade_packages_done.tpl index 09cc4bc..9902665 100644 --- a/templates/upgrade_packages_done.tpl +++ b/templates/upgrade_packages_done.tpl @@ -13,7 +13,6 @@ <div class="row"> <ul class="result"> <li class="success"> - {biticon ipackage="icons" iname="dialog-ok" iexplain=success} All Database operations completed succesfully </li> </ul> @@ -32,6 +31,6 @@ {/if} <div class="row submit"> - <input type="submit" value="Continue Upgrade Process" /> + <input type="submit" value="Continue upgrade process" /> </div> {/form} diff --git a/templates/upgrade_ready.tpl b/templates/upgrade_ready.tpl index b9a1930..3fae707 100644 --- a/templates/upgrade_ready.tpl +++ b/templates/upgrade_ready.tpl @@ -15,7 +15,7 @@ <select name="upgrade_from"> <option value="TikiWiki 1.8">TikiWiki 1.8</option> <option value="TikiWiki 1.9">TikiWiki 1.9</option> - <option value="BWR0">bitweaver ReleaseZero -BONNIE-</option> + <option value="BWR0">Bitweaver ReleaseZero -BONNIE-</option> </select> {formhelp note="The type of application you intend to upgrade"} {/forminput} @@ -25,7 +25,7 @@ {forminput} <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label> {/forminput} - {formhelp note="This will display SQL statements."} + {formhelp note="Display SQL statements."} </div> <div class="row submit"> diff --git a/templates/upgrade_welcome.tpl b/templates/upgrade_welcome.tpl index efe6c80..d609419 100644 --- a/templates/upgrade_welcome.tpl +++ b/templates/upgrade_welcome.tpl @@ -1,30 +1,30 @@ -<h1>bitweaver Upgrade Tool</h1> +<h1>Bitweaver upgrade tool</h1> {form legend="Begin the upgrade process"} <input type="hidden" name="step" value="{$next_step}" /> <p> - Welcome to the new and improved bitweaver package manager. Using this + 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. + repository and apply the install or upgrade process easily. 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. + 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.) + course, you already have a 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 /> + <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 /> + <strong>Upgrades can take a long time. </strong> 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 @@ -33,7 +33,7 @@ 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> + <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} @@ -42,17 +42,13 @@ {$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> {if $smarty.session.upgrade_r1} <h2>Important</h2> <p class="danger"> - Since you are upgrading from R1 to R2, you need to visit the - <a class="external" href="http://www.bitweaver.org/wiki/bitweaver+R1+to+R2+Upgrade">R1 to R2 Upgrade</a> - page. It contains <strong>crucial</strong> information about the + Since you are upgrading from Bitweaver version 1 to version 2, please visit the + <strong><a class="external" href="http://www.bitweaver.org/wiki/bitweaver+R1+to+R2+Upgrade">Upgrade documentation page</a></strong>. + It contains <strong>crucial information</strong> about the changes that have occurred and how to fix certain upgrade issues that can not be dealt with by the installer. We can not stress enough that it is <strong>essential</strong> that you make a backup @@ -61,6 +57,6 @@ {/if} <div class="row submit"> - <input type="submit" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the Upgrade process!"}" /> + <input type="submit" name="fSubmitWelcome" value="{$warningSubmit|default:"Begin the upgrade process!"}" /> </div> {/form} |