summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--css/install.css26
-rw-r--r--get_databases_inc.php14
-rw-r--r--install.php2
-rw-r--r--templates/install.tpl20
-rw-r--r--templates/install_admin_inc.tpl8
-rw-r--r--templates/install_admin_inc_done.tpl32
-rw-r--r--templates/install_checks.tpl66
-rw-r--r--templates/install_cleanup.tpl10
-rw-r--r--templates/install_database.tpl17
-rw-r--r--templates/install_database_done.tpl27
-rw-r--r--templates/install_database_reset.tpl2
-rw-r--r--templates/install_packages.tpl83
-rw-r--r--templates/install_packages_done.tpl62
-rw-r--r--templates/install_upgrade.tpl12
-rw-r--r--templates/install_welcome.tpl62
-rw-r--r--templates/migrate_welcome.tpl6
-rw-r--r--templates/upgrade_welcome.tpl8
17 files changed, 187 insertions, 270 deletions
diff --git a/css/install.css b/css/install.css
index f5662b3..fc5f0f5 100644
--- a/css/install.css
+++ b/css/install.css
@@ -12,7 +12,7 @@ a#bitweaver_logo:hover {background-position:0 0}
a#bitweaver_logo em {display:none}
*/
-#header h1 {display:block;text-align:center;margin:0;padding:0;font-size:13px;line-height:17px;font-family:monospace}
+#header h1 {display:block;margin:0;padding:0;font-size:13px;line-height:17px;font-family:monospace}
#header h1 strong {color:#fff;font-weight:500}
#header h1 em {color:#fff;font-style:normal;padding:0 0 0 0.6em}
@@ -24,14 +24,6 @@ a#bitweaver_logo em {display:none}
#footer a,#footer:visited {color:#00e;border-bottom:1px solid #f0f0f0}
#footer a:hover {color:#00f;border-bottom:1px solid #ddd;text-decoration:none}
-/* navigation, progress */
-div.progressbar em {font-style:normal;display:block;width:123px;float:left;padding-left:1em}
-div.progressbar div.bar {margin-left:133px}
-div.progressbar div.progress {background:#e0ffb0;text-align:center;border:1px solid white}
-div.progressbar div.progress100 {background:#8de817}
-div.progressbar div.progress0 {background:#fdf9ea;width:3em !important}
-
-
/* extra */
@@ -60,7 +52,6 @@ div.progressbar div.progress0 {background:#fdf9ea;width:3em !important}
/* global */
html {background:#FFFED4}
body {background:#FFFED4 url(images/bg_body.png) repeat-x left top}
-body {font:13px/22px sans-serif;margin:0 auto;padding:0}
table {border-collapse:collapse;padding:0;margin:0;width:100%;table-layout:fixed}
caption {font-weight:bold}
th {text-align:left;overflow:hidden}
@@ -69,10 +60,10 @@ td {vertical-align:top}
hr {border:1px dotted #bab7ac;border-width:1px 0 0 0;background:transparent;margin:2em 0}
p {margin:1em auto}
code {font-family:monospace}
-h1 {font-size:140%;margin-top:1.5em}
-h2 {font-size:120%;margin-top:4em}
+h1 {font-size:140%;}
+h2 {font-size:120%;}
h3 {font-size:110%}
-h1,h2,h3 {font-weight:700;text-align:center}
+h1,h2,h3 {font-weight:700;}
.clear {clear:both}
.center {text-align:center}
.alright {text-align:right}
@@ -94,15 +85,6 @@ textarea,
select {margin:0;padding:0;border-width:1px;padding:0.2em}
textarea {width:99%}
-fieldset {padding:0;margin:1em;border:0px solid #fff}
-legend {background:transparent;padding:1em 1em 1em 0}
-
-.row {overflow:auto;clear:both;margin:0 0 1.5em 0}
-.formlabel {float:left;width:24%;text-align:right;padding:0 0.5em 1em 0;font-weight:bold}
-.formfeedback {}
-.formfeedback .icon {display:none}
-.formfeedback div {padding:4px;border-bottom:1px dotted #aaa}
-
.odd {background:#f4f4f3;color:#000}
.even {color:#000}
diff --git a/get_databases_inc.php b/get_databases_inc.php
index 66f8cd4..b935407 100644
--- a/get_databases_inc.php
+++ b/get_databases_inc.php
@@ -9,19 +9,7 @@
$gBitDbCaseSensitivity = TRUE;
$dbtodsn = array();
if( function_exists( 'mysql_connect' ) ) {
- // check version of mysql server - only server that allows check without actually connecting to it... (who knows how that works)
- if( @mysql_get_server_info() ) {
- $version = mysql_get_server_info();
- // Check for versions less than 4.0
- if ($version[0] < 4 || ($version[0] == 4 && $version[2] == 0)) {
- $gBitSmarty->assign("mysqlWarning", TRUE);
- }
- $dbtodsn['mysql'] = 'MySQL '.mysql_get_server_info();
- } else {
- $dbtodsn['mysql'] = 'MySQL';
- // Can't get the version output the warning.
- $gBitSmarty->assign("mysqlWarning", TRUE);
- }
+ $dbtodsn['mysql'] = 'MySQL';
}
if( function_exists( 'mysqli_connect' ) ) {
$dbtodsn['mysqli'] = 'MySQLi';
diff --git a/install.php b/install.php
index 2004d3d..b4bf65f 100644
--- a/install.php
+++ b/install.php
@@ -43,7 +43,7 @@ if( get_cfg_var( 'memory_limit' ) !== FALSE && preg_replace( '/M/i','',get_cfg_v
<form action="'.$dir.'/install.php">
<fieldset>
<legend>Unable to run installer</legend>
- <p class="error">The memory limit of <strong>"'.get_cfg_var( 'memory_limit' ).'"</strong> is not high enough to run the bitweaver installer. Please up the memory limit in you php.ini to at least 16M to install and run bitweaver.</p>
+ <p class="alert alert-error">The memory limit of <strong>"'.get_cfg_var( 'memory_limit' ).'"</strong> is not high enough to run the bitweaver installer. Please up the memory limit in you php.ini to at least 16M to install and run bitweaver.</p>
</fieldset>
<div class="row submit">
<input type="submit" value="Reload" size="20"/>
diff --git a/templates/install.tpl b/templates/install.tpl
index afabd15..1c54f14 100644
--- a/templates/install.tpl
+++ b/templates/install.tpl
@@ -36,15 +36,17 @@
<div style="margin:10px;overflow:visible;">
<div class="brand">Install Bitweaver {$gBitSystem->getBitVersion()} </div>
<nav class="pull-right width60p" style="padding:10px 20px 0 0;">
- <div class="pull-right">
- <a href="http://www.bitweaver.org/wiki/index.php?page={$section|default:"Install"}bitweaverDoc"><i class="icon-question-sign"></i> Help</a>
- </div>
- <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 class="pull-right">
+ <a href="http://www.bitweaver.org/wiki/index.php?page={$section|default:"Install"}bitweaverDoc"><i class="icon-question-sign"></i> Help</a>
+ </div>
+
+ <div class="pull-right width50p" style="padding:0 10px;">
+ <div class="progress">
+ <div class="bar bar-success" style="width: {$progress|default:0}%;"></div>
</div>
- <span class="clear"><!-- --></span>
+ </div>
+ <div class="pull-right">
+ <em>{$section|default:"Install"} Progress</em>
</div>
</nav>
</div>
@@ -64,7 +66,9 @@
<div class="container">
<section class="row maincontent">
+ <div class="span12">
{include file=$install_file}
+ </div>
<section>
</div>
diff --git a/templates/install_admin_inc.tpl b/templates/install_admin_inc.tpl
index e77cb63..09b9a6a 100644
--- a/templates/install_admin_inc.tpl
+++ b/templates/install_admin_inc.tpl
@@ -49,16 +49,18 @@
</div>
<div class="control-group">
- {formlabel label="Email Transport" for="testemail"}
{forminput}
- <input type="checkbox" name="testemail" id="testemail" value="y" checked="checked" />
+ <label class="checkbox">
+ <input type="checkbox" name="testemail" id="testemail" value="y" checked="checked" />
+ {tr}Test Email Transport{/tr}
+ </label>
{formhelp note="Check this box to send a test email to the above address. This will let you know if the mailing system is working."}
{/forminput}
</div>
<div class="control-group">
{forminput}
- <input type="submit" class="btn" name="admin_submit" value="Submit Admin Information" />
+ <input type="submit" class="btn btn-primary" name="admin_submit" value="Submit Admin Information" />
{/forminput}
</div>
{/form}
diff --git a/templates/install_admin_inc_done.tpl b/templates/install_admin_inc_done.tpl
index 0d2d324..43a8e9c 100644
--- a/templates/install_admin_inc_done.tpl
+++ b/templates/install_admin_inc_done.tpl
@@ -5,23 +5,23 @@
{form class="form-horizontal" legend="Administrator Information"}
<input type="hidden" name="step" value="{$next_step}" />
- <div class="control-group">
- <ul class="result">
- {if $warning}
- {foreach from=$warning item=warn}
- <li class="warning">
- {biticon ipackage="icons" iname="dialog-warning" iexplain=warning}
- &nbsp;
- {$warn}
- </li>
- {/foreach}
- {else}
- <li class="success">
- Administrator configured successfully
+ {if $warning}
+ <div class="alert alert-warning">
+ <ul class="result">
+ {foreach from=$warning item=warn}
+ <li class="warning">
+ {biticon ipackage="icons" iname="dialog-warning" iexplain=warning}
+ &nbsp;
+ {$warn}
</li>
- {/if}
+ {/foreach}
+ </div>
</ul>
- </div>
+ {else}
+ <div class="alert alert-success">
+ Administrator configured successfully
+ </div>
+ {/if}
<div class="control-group">
{formlabel label="Admin name"}
@@ -68,7 +68,7 @@
<div class="control-group">
{forminput}
- <input type="submit" class="btn" value="Continue install process" />
+ <input type="submit" class="btn btn-primary" value="Continue install process" />
{/forminput}
</div>
{/form}
diff --git a/templates/install_checks.tpl b/templates/install_checks.tpl
index 06b015a..14c0104 100644
--- a/templates/install_checks.tpl
+++ b/templates/install_checks.tpl
@@ -16,17 +16,17 @@
{if $check.passed}
<p class="alert alert-success">{$check.note}</p>
{else}
- <p class="error">{$check.note}</p>
+ <p class="alert alert-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>
+ <p class="alert alert-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>
+ <p class="alert alert-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="control-group">
{forminput}
<input type="submit" class="btn" name="reload" value="Reload Page" />
@@ -38,37 +38,31 @@
- <h2>PHP Settings</h2>
+ <h2>Recommended 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="control-group">
- {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>
+ <table class="table" 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 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>
+ {/foreach}
+ </table>
{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>
+ <p class="alert alert-block">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>
+ <p class="alert alert-block">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="alert alert-success">All recommended settings have been met.</p>
{/if}
@@ -87,14 +81,14 @@
<p class="alert alert-success">{$check.note}</p>
{else}
{assign var=extwarning value=1}
- <p class="warning">{$check.note}</p>
+ <p class="alert alert-block">{$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>
+ <p class="alert alert-block">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="alert alert-success">All recommended extensions are installed.</p>
{/if}
@@ -109,7 +103,7 @@
{forminput}
{if !$pearexts.PEAR.passed}
{assign var=pearinstall value=1}
- <p class="warning">{$pearexts.PEAR.note}</p>
+ <p class="alert alert-block">{$pearexts.PEAR.note}</p>
<p>Extensions we can make use of:</p>
<ul>
{foreach from=$pearexts key=ext item="check"}
@@ -124,7 +118,7 @@
<p class="alert alert-success">{$check.note}</p>
{else}
{assign var=pearextswarning value=1}
- <p class="warning">{$check.note}</p>
+ <p class="alert alert-block">{$check.note}</p>
{/if}
{/foreach}
{/if}
@@ -132,7 +126,7 @@
</div>
{if $pearinstall or $pearextswarning}
- <p class="warning">
+ <p class="alert alert-block">
<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
@@ -182,14 +176,14 @@
<p class="alert alert-success">{$check.note}</p>
{else}
{assign var=executableswarning value=1}
- <p class="warning">{$check.note}</p>
+ <p class="alert alert-block">{$check.note}</p>
{/if}
{/foreach}
{/forminput}
</div>
{if $executableswarning}
- <p class="warning">
+ <p class="alert alert-block">
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
@@ -228,10 +222,8 @@
{if !$error}
<div class="control-group">
{forminput}
- <input type="submit" class="btn" name="reload" value="Reload page" />
+ <input type="submit" class="btn" name="reload" value="Reload page" /> <input type="submit" class="btn btn-primary" name="continue" value="Continue install process" />
{/forminput}
- &nbsp;
- <input type="submit" class="btn" name="continue" value="Continue install process" />
</div>
{/if}
diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl
index 8709d36..2d6012d 100644
--- a/templates/install_cleanup.tpl
+++ b/templates/install_cleanup.tpl
@@ -6,7 +6,7 @@
{legend legend="Database Integrity Check"}
{if $dbIntegrity}
- <p class="warning">
+ <p class="alert alert-block">
We have scanned the database for missing tables and have found that the following tables have not been installed:
</p>
<ul>
@@ -37,14 +37,14 @@
</ul>
<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">
+ <p class="alert alert-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, 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">
+ <p class="alert alert-block">
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
@@ -79,7 +79,7 @@
{legend legend="Fix Permissioning"}
{if $delPerms || $insPerms}
- <p class="warning">
+ <p class="alert alert-block">
Some permissions require your attention.
{if $insPerms}
<br />Some of these permissions might be from packages that have
@@ -145,7 +145,7 @@
{legend legend="Resolve Service Conflicts"}
{if $serviceList}
- <p class="warning">
+ <p class="alert alert-block">
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 &#8211;
diff --git a/templates/install_database.tpl b/templates/install_database.tpl
index fb01a92..a2cd380 100644
--- a/templates/install_database.tpl
+++ b/templates/install_database.tpl
@@ -7,7 +7,7 @@
<div class="control-group">
{if $warning or $error or $success}
{if $warning}
- <p class="warning">
+ <p class="alert alert-block">
We have already set up a working connection with your database. Change these settings at your own peril.
</p>
{elseif $error}
@@ -48,20 +48,20 @@
{formlabel label="Database type" for="db"}
{forminput}
{if $section eq 'Upgrade'}
- <p class="warning">If you intend to upgrade an existing MySQL database, the required server version is greater than 4.1.</p>
+ <p class="alert alert-block">If you intend to upgrade an existing MySQL database, the required server version is greater than 4.1.</p>
{/if}
{if $dbservers}
{html_options name='db' options=$dbservers id=db selected=$gBitDbType style="width:50%"}
{formhelp note="The type of database you intend to use."}
{if $mysqlWarning}
- <p class="warning">
+ <p class="alert alert-block">
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="alert alert-block">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}
- <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>
+ <p class="alert alert-block">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>
@@ -166,9 +166,10 @@
<div class="control-group">
{forminput}
- <input type="hidden" name="dbcase" value="{$gBitDbCaseSensitivity}" />
+ <input type="submit" class="btn btn-primary" value="Confirm Settings" name="submit_db_info" />
{/forminput}
- <input type="hidden" name="resetdb" value="{$resetdb}" />
- <input type="submit" class="btn" value="Confirm Settings" name="submit_db_info" />
</div>
+
+ <input type="hidden" name="dbcase" value="{$gBitDbCaseSensitivity}" />
+ <input type="hidden" name="resetdb" value="{$resetdb}" />
{/form}
diff --git a/templates/install_database_done.tpl b/templates/install_database_done.tpl
index 17b972d..ea9b3ed 100644
--- a/templates/install_database_done.tpl
+++ b/templates/install_database_done.tpl
@@ -1,5 +1,15 @@
<h1>Database Connection Information</h1>
+ {if substr( PHP_OS, 0, 3 ) == 'WIN'}
+ <p class="alert alert-info">
+ Your server seems to run under Microsoft Windows. Please set the PHP_MAGIC_PATH constant in the configuration file.
+ </p>
+ {/if}
+ <div class="alert alert-success">
+ Your configuration was successfully created at <strong>{$smarty.const.CONFIG_PKG_PATH}kernel/config_inc.php</strong>
+ <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 helps with theme creation.</p>
+ </div>
+
{form class="form-horizontal" legend="Your database connection information"}
<input type="hidden" name="step" value="{$next_step}" />
@@ -66,21 +76,6 @@
{/forminput}
</div>
- <div class="control-group">
- <p class="alert alert-success">
- This information was stored in the file:<br />
- <strong>{$smarty.const.CONFIG_PKG_PATH}kernel/config_inc.php</strong>
- </p>
- {if substr( PHP_OS, 0, 3 ) == 'WIN'}
- <p class="warning">
- 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 helps with theme creation.
- </p>
- </div>
-
{if isset( $has_innodb_support )}
<div class="control-group">
{formlabel label="Use InnoDB tables" for="use_innodb"}
@@ -93,7 +88,7 @@
<div class="control-group">
{forminput}
- <input type="submit" class="btn" value="Continue {$section|default:"install"} process" />
+ <input type="submit" class="btn btn-primary" value="Continue {$section|default:"install"} process" />
{/forminput}
</div>
{/form}
diff --git a/templates/install_database_reset.tpl b/templates/install_database_reset.tpl
index 9dbc5dd..25796c0 100644
--- a/templates/install_database_reset.tpl
+++ b/templates/install_database_reset.tpl
@@ -15,7 +15,7 @@
<div class="control-group">
<p>Your database information is stored in the file <kbd>{$smarty.const.BIT_ROOT_PATH}config/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 class="alert alert-block">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 <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>
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index 62bd4c0..ef8e5d6 100644
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -4,21 +4,20 @@
{else}
<h1>Adding and removing packages</h1>
{/if}
-<br />
{if $error}
- {legend legend="Administrator Data Missing"}
- <p class="error">
- Unfortunately there seems to be a problem with your installation. We can't find the administrator information you entered.
- </p>
+ <div class="alert alert-error">
+ <strong>Administrator Data Missing</strong>
+ <p>Unfortunately there seems to be a problem with your installation. We can't find the administrator information you entered.</p>
+ </div>
<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}
+ {form class="form-horizontal"}
{jstabs tab=0}
{jstab title="Install Packages"}
- {form class="form-horizontal" id="package_select" id="package_select"}
+ <input type="hidden" name="resetdb" value="{$resetdb}" />
<input type="hidden" name="step" value="{$next_step}" />
<input type="hidden" name="method" value="install" />
@@ -36,10 +35,11 @@
{/foreach}
{if $new_packages}
- <h2>Please select packages and services you wish to install</h2>
- <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>
+ {legend legend="Please select packages and services you wish to install"}
- <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>
+ <p>Packages are apps in Bitweaver that deal with content such as wiki pages, blogs or news articles. Below 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.</p>
+
+ <p class="alert alert-block">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="control-group">
{forminput}
@@ -49,16 +49,10 @@
{/forminput}
</div>
- <h2>Packages</h2>
-
- <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}
<div class="control-group">
- <div class="formlabel">
- <label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=`$package`}</label>
- </div>
+ <label class="control-label" for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=`$package`}</label>
{forminput}
<label><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" checked="checked" /> <strong>{$package|capitalize}</strong></label>
{formhelp note=$item.info is_installer=1}
@@ -68,6 +62,7 @@
</div>
{/if}
{/foreach}
+ {/legend}
{elseif $first_install}
<h2>Core System Installation</h2>
<p>{tr}Only the core required packages will be installed{/tr}</p>
@@ -91,32 +86,30 @@
</p>
{/if}
<div class="control-group">
- {forminput}
- Please press this button only once.<br />
- {/forminput}
- 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}" />
- <input type="submit" class="btn" name="submit_packages" value="Install Packages" />
+ {forminput}
+ <div class="alert alert-info">
+ <strong>Please press this button only once.</strong>
+ <p> Depending on the number of packages and the hardware, this process might take up to a few minutes.</p>
+ </div>
+ <input type="submit" class="btn btn-primary" name="submit_packages" value="Install Packages" />
+ {/forminput}
</div>
+
<div class="control-group">
{forminput}
<label><input type="checkbox" name="debug" value="true" /> Debug mode</label>
{formhelp note="Display SQL statements."}
{/forminput}
</div>
-
- {/form}
{/jstab}
{if !$first_install}
{jstab title="Uninstall/Reinstall"}
- {form class="form-horizontal" legend="Already Installed Packages"}
<input type="hidden" name="step" value="{$next_step}" />
<div class="control-group">
- <p class="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).</p>
+ <p class="alert alert-block">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).</p>
</div>
<div class="control-group">
@@ -147,9 +140,9 @@
{if $item.tables || $item.defaults}
{if $item.installed and !$item.required}
<div class="control-group">
- <div class="formlabel">
+ <label class="control-label">
<label for="{$package}">{biticon ipackage=$package iname="pkg_$package" iexplain=`$package`}</label>
- </div>
+ </label>
{forminput}
<label><input type="checkbox" name="packages[]" value="{$package}" id="{$package}" /> <strong>{$package|capitalize}</strong></label>
{formhelp note=$item.info is_installer=1}
@@ -162,12 +155,14 @@
{/foreach}
<div class="control-group">
- {forminput}
- Please press this button only once.<br />
- {/forminput}
- Depending on the number of packages and the hardware,<br />
- this process might take up to a few minutes.<br /><br />
- <input type="submit" class="btn" name="submit_packages" value="Uninstall/Reinstall Packages" onclick="return confirm( 'Are you sure you want to uninstall/reinstall the selected packages?' );" />
+ {forminput}
+ <input type="submit" class="btn" name="submit_packages" value="Uninstall/Reinstall Packages" onclick="return confirm( 'Are you sure you want to uninstall/reinstall the selected packages?' );" />
+ {/forminput}
+ </div>
+
+ <div class="alert alert-info">
+ <strong>Please press this button only once.</strong>
+ <p> Depending on the number of packages and the hardware, this process might take up to a few minutes.</p>
</div>
<div class="control-group">
@@ -176,7 +171,6 @@
{formhelp note="Display SQL statements."}
{/forminput}
</div>
- {/form}
{/jstab}
{/if}
@@ -184,16 +178,16 @@
{legend legend="Packages and services required by Bitweaver"}
{if !$first_install}
<div class="control-group">
- <p class="warning">To reset the entire system, first create a new database (or empty the existing database manually).</p>
+ <p class="alert alert-block">To reset the entire system, first create a new database (or empty the existing database manually).</p>
</div>
{/if}
{foreach from=$schema key=package item=item}
{if $item.required}
<div class="control-group">
- <div class="formlabel">
+ <label class="control-label">
{biticon ipackage=$package iname="pkg_$package" iexplain=`$package`}
- </div>
+ </label>
{forminput}
<strong>{$package|capitalize}</strong>
{formhelp note=$item.info is_installer=1}
@@ -208,14 +202,13 @@
{/jstabs}
{if !$first_install}
- {form}
<input type="hidden" name="step" value="{$next_step}" />
<div class="control-group">
- {forminput}
- &nbsp;&nbsp;<input type="submit" class="btn" name="cancel" value="Skip this stage" />
- {/forminput}
+ {forminput}
+ <input type="submit" class="btn" name="cancel" value="Skip this stage" />
+ {/forminput}
</div>
- {/form}
{/if}
+ {/form}
{/if}
{/strip}
diff --git a/templates/install_packages_done.tpl b/templates/install_packages_done.tpl
index 0171a85..c099b24 100644
--- a/templates/install_packages_done.tpl
+++ b/templates/install_packages_done.tpl
@@ -5,65 +5,43 @@
{if $failedcommands or $error}
{if $error}
- <div class="control-group">
- <ul class="result">
- <li class="error">
- There was a problem during the installation
- </li>
- <li>
- It seems the administrators information got lost during the process. Please go back to the admin setup page and enter the information again and follow through with the installation.<br />
- Please <strong>don't use the back button</strong>.
- </li>
- </ul>
+ <div class="alert alert-error">
+ <p>There was a problem during the installation</p>
+ <p>
+ It seems the administrators information got lost during the process. Please go back to the admin setup page and enter the information again and follow through with the installation.<br />
+ Please <strong>don't use the back button</strong>.
+ </p>
</div>
{/if}
{if $failedcommands}
- <div class="control-group">
+ <div class="alert alert-error">
<h2 class="warning">
The following database operations failed
</h2>
- {section loop=$failedcommands name=idx}<p class="error">{$errors[idx]|escape}:<br/>&nbsp;&nbsp;&nbsp;&nbsp;{$failedcommands[idx]|escape}</p>{/section}
+ {section loop=$failedcommands name=idx}<p class="">{$errors[idx]|escape}:<br/>&nbsp;&nbsp;&nbsp;&nbsp;{$failedcommands[idx]|escape}</p>{/section}
<h3>Some errors occured. Your site may not be ready to run. You can revisit the previous page to rerun the installation.</h3>
</div>
{/if}
{else}
- <div class="control-group">
- <ul class="result">
- <li class="success">
- All Database operations completed succesfully
- </li>
- </ul>
+ <div class="alert alert-success">
+ All Database operations completed succesfully
</div>
{if !$first_install}
- <div class="control-group">
- <ul class="result">
- <li class="warning">
- You have just successfully installed new packages.
- During installation, new permissions were probably
- added to the database, but not assigned to any groups.
- You can use the <strong>{smartlink ititle="permission
- maintenance" ipackage=users ifile=admin/permissions.php}
- </strong> page to assign these permissions quickly and
- easily.
- </li>
- </ul>
+ <div class="alert alert-warning">
+ You have just successfully installed new packages. During installation, new permissions were probably added to the database, but not assigned to any groups. You can use the <strong>{smartlink ititle="permission maintenance" ipackage=users ifile=admin/permissions.php} </strong> page to assign these permissions quickly and easily.
</div>
{/if}
{if $packageList.install}
- <div class="control-group">
- {formlabel label="Packages that were installed"}
- {forminput}
- <ul>
- {foreach from=$packageList.install item=package}
- <li>{$package}</li>
- {foreachelse}
- <li>No packages were installed<li>
- {/foreach}
- </ul>
- {/forminput}
- </div>
+ <h2>Packages that were installed</h2>
+ <ul>
+ {foreach from=$packageList.install item=package}
+ <li>{$package}</li>
+ {foreachelse}
+ <li>No packages were installed<li>
+ {/foreach}
+ </ul>
{/if}
{if $packageList.uninstall}
diff --git a/templates/install_upgrade.tpl b/templates/install_upgrade.tpl
index 5e85029..5aa0cb9 100644
--- a/templates/install_upgrade.tpl
+++ b/templates/install_upgrade.tpl
@@ -21,7 +21,7 @@
<dt>{$data.version}</dt>
<dd>{$data.description}</dd>
{if $errors.$package.$version}
- <p class="error">SQL errors that occurred during the {$version} upgrade:<br />
+ <p class="alert alert-error">SQL errors that occurred during the {$version} upgrade:<br />
<kbd>
{if $errors.$package.$version.failedcommands}
{foreach from=$errors.$package.$version.failedcommands item=command}
@@ -128,23 +128,23 @@
</table>
{if $missing}
- <p class="warning">At least one required package is missing. Please install that package before proceeding with the upgrade.</p>
+ <p class="alert alert-block">At least one required package is missing. Please install that package before proceeding with the upgrade.</p>
{/if}
{if $min_dep}
- <p class="warning">At least one package did not meet the minimum version requirement in our calculations. If possible, please get a newer version of those packages and upgrade them as well.</p>
+ <p class="alert alert-block">At least one package did not meet the minimum version requirement in our calculations. If possible, please get a newer version of those packages and upgrade them as well.</p>
{/if}
{if $max_dep}
- <p class="warning">At least one package recommend a version lower to the one you have installed or are about to upgrade to. The package you wish to upgrade might work with this combination, but no guarantees can be given.</p>
+ <p class="alert alert-block">At least one package recommend a version lower to the one you have installed or are about to upgrade to. The package you wish to upgrade might work with this combination, but no guarantees can be given.</p>
{/if}
{if $inactive}
- <p class="warning">At least one required package is disabled. Please activate that package once your install is complete.</p>
+ <p class="alert alert-block">At least one required package is disabled. Please activate that package once your install is complete.</p>
{/if}
{if $confused}
- <p class="warning">At least one required package is in an unknown state. The upgrade may not work because of this. It is probably worth reinstalling the latest version of that package or contacting its developer.</p>
+ <p class="alert alert-block">At least one required package is in an unknown state. The upgrade may not work because of this. It is probably worth reinstalling the latest version of that package or contacting its developer.</p>
{/if}
{if !$min_dep && !$max_dep && !$missing}
diff --git a/templates/install_welcome.tpl b/templates/install_welcome.tpl
index 7aa2152..88bf92d 100644
--- a/templates/install_welcome.tpl
+++ b/templates/install_welcome.tpl
@@ -1,51 +1,33 @@
{strip}
-<h1>Welcome to the Bitweaver Installer</h1>
-
-{form class="form-horizontal" id="install_welcome"}
- {legend legend=""}
- <input type="hidden" name="step" value="{$next_step}" />
+<div class="row">
+ <div class="span8">
+ <h1>Welcome to the Bitweaver Installer</h1>
{if $gBitUser->isAdmin()}
- <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>
+ <p class="alert alert-block">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 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>
+ {form class="" id="install_welcome"}
+ <input type="hidden" name="step" value="{$next_step}" />
+
<div class="control-group">
- {forminput}
- <input type="submit" class="btn" name="install" value="Begin the install process" />
- {/forminput}
+ {forminput}
+ <input type="submit" class="btn btn-primary" name="install" value="Begin the install process" />
+ {/forminput}
<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="{$smarty.const.INSTALL_PKG_URL}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}
+ {/form}
+ </div>
+ <div class="span3">
+ <div class="aligncenter"><img src="{$smarty.const.INSTALL_PKG_URL}css/images/bitweaver_logo-trans.png" alt="logo" /></div>
+ <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>
+ </ul>
+ </div>
+</div>
{/strip}
diff --git a/templates/migrate_welcome.tpl b/templates/migrate_welcome.tpl
index f259db6..a6b9ad8 100644
--- a/templates/migrate_welcome.tpl
+++ b/templates/migrate_welcome.tpl
@@ -5,11 +5,11 @@
<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="alert alert-block"><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="alert alert-block"><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>
+ <p class="alert alert-block">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>
diff --git a/templates/upgrade_welcome.tpl b/templates/upgrade_welcome.tpl
index 3ee29cb..28d04f2 100644
--- a/templates/upgrade_welcome.tpl
+++ b/templates/upgrade_welcome.tpl
@@ -11,19 +11,19 @@
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">
+ <p class="alert alert-block">
<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">
+ <p class="alert alert-block">
<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">
+ <p class="alert alert-block">
<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
@@ -38,7 +38,7 @@
</p>
{/if}
{if $dbWarning}
- <p class="warning">
+ <p class="alert alert-block">
{$dbWarning}
</p>
{/if}
generated by cgit v1.3 (git 2.53.0) at 2026-07-02 10:51:54 +0000