summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--css/install.css84
-rw-r--r--templates/install.tpl6
-rw-r--r--templates/install_beta1_beta2.tpl13
-rw-r--r--templates/install_cleanup.tpl10
-rw-r--r--templates/install_packages.tpl16
-rw-r--r--templates/install_upgrade.tpl10
-rw-r--r--templates/install_version.tpl10
-rw-r--r--templates/install_welcome.tpl10
-rw-r--r--templates/migrate_database.tpl10
-rw-r--r--templates/upgrade_packages.tpl6
10 files changed, 94 insertions, 81 deletions
diff --git a/css/install.css b/css/install.css
index fc5f0f5..f2a96fd 100644
--- a/css/install.css
+++ b/css/install.css
@@ -1,3 +1,50 @@
+
+/* global */
+html {background:#5BA6F8}
+body {
+
+background-image: -moz-linear-gradient(top, #BCEAFF, #5BA6F8);
+background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#BCEAFF), to(#5BA6F8));
+background-image: -webkit-linear-gradient(top, #BCEAFF, #5BA6F8);
+background-image: -o-linear-gradient(top, #BCEAFF, #5BA6F8);
+background-image: linear-gradient(to bottom, #BCEAFF, #5BA6F8);
+background-repeat: repeat-x;
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFBCEAFF', endColorstr='#ff5BA6F8', GradientType=0);
+
+}
+table {border-collapse:collapse;padding:0;margin:0;width:100%;table-layout:fixed}
+caption {font-weight:bold}
+th {text-align:left;overflow:hidden}
+th a {color:#ff0}
+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%;}
+h2 {font-size:120%;}
+h3 {font-size:110%}
+h1,h2,h3 {font-weight:700;}
+.clear {clear:both}
+.center {text-align:center}
+.alright {text-align:right}
+
+/* links */
+a {text-decoration:none}
+a.external {background:transparent url(images/external.gif) no-repeat right 4px;padding-right:10px}
+a:hover {text-decoration:underline}
+.icon {border:0;vertical-align:middle}
+a img {border:0}
+
+
+
+/* forms */
+form {clear:both}
+form,
+input,
+textarea,
+select {margin:0;padding:0;border-width:1px;padding:0.2em}
+textarea {width:99%}
+
/* layout */
div#container {width:93%;margin:0 auto;max-width:1100px}
@@ -48,43 +95,6 @@ a#bitweaver_logo em {display:none}
-
-/* global */
-html {background:#FFFED4}
-body {background:#FFFED4 url(images/bg_body.png) repeat-x left top}
-table {border-collapse:collapse;padding:0;margin:0;width:100%;table-layout:fixed}
-caption {font-weight:bold}
-th {text-align:left;overflow:hidden}
-th a {color:#ff0}
-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%;}
-h2 {font-size:120%;}
-h3 {font-size:110%}
-h1,h2,h3 {font-weight:700;}
-.clear {clear:both}
-.center {text-align:center}
-.alright {text-align:right}
-
-/* links */
-a {text-decoration:none}
-a.external {background:transparent url(images/external.gif) no-repeat right 4px;padding-right:10px}
-a:hover {text-decoration:underline}
-.icon {border:0;vertical-align:middle}
-a img {border:0}
-
-
-
-/* forms */
-form {clear:both}
-form,
-input,
-textarea,
-select {margin:0;padding:0;border-width:1px;padding:0.2em}
-textarea {width:99%}
-
.odd {background:#f4f4f3;color:#000}
.even {color:#000}
diff --git a/templates/install.tpl b/templates/install.tpl
index 1c54f14..9989c2a 100644
--- a/templates/install.tpl
+++ b/templates/install.tpl
@@ -71,11 +71,9 @@
</div>
<section>
</div>
-
+{include file="bitpackage:kernel/bot_bar.tpl"}
<footer class="container aligncenter">
- <a href="http://bitweaver.org">
- www.bitweaver.org
- </a>
+
</footer>
</body>
</html>
diff --git a/templates/install_beta1_beta2.tpl b/templates/install_beta1_beta2.tpl
index e524f77..15e938a 100644
--- a/templates/install_beta1_beta2.tpl
+++ b/templates/install_beta1_beta2.tpl
@@ -28,6 +28,13 @@
<div class="control-group">
{forminput}
+ <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+ {formhelp note="Display SQL statements."}
+ {/forminput}
+ </div>
+
+ <div class="control-group">
+ {forminput}
Please press this button only once<br />
{/forminput}
Depending on the number of packages and the hardware,<br />
@@ -36,11 +43,5 @@
<input type="submit" class="btn" name="fSubmitDbCreate" value="Install Packages" />
</div>
- <div class="control-group">
- {forminput}
- <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
- {formhelp note="Display SQL statements."}
- {/forminput}
- </div>
{/form}
{/strip}
diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl
index ebd4592..ebbb683 100644
--- a/templates/install_cleanup.tpl
+++ b/templates/install_cleanup.tpl
@@ -56,15 +56,15 @@
{/if}
<div class="control-group">
- {forminput}
- <input type="submit" class="btn" name="create_tables" value="Try to create missing table/s" />
- {/forminput}
+ {forminput}
+ <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+ {formhelp note="Display SQL statements."}
+ {/forminput}
</div>
<div class="control-group">
{forminput}
- <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
- {formhelp note="Display SQL statements."}
+ <input type="submit" class="btn" name="create_tables" value="Try to create missing table/s" />
{/forminput}
</div>
{else}
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index 0f15760..ea42a32 100644
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -87,21 +87,21 @@
{/if}
<div class="control-group">
{forminput}
- <div class="alert alert-info">
- <strong>Please press the install 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" />
+ <label><input type="checkbox" name="debug" value="true" /> Debug mode</label>
+ {formhelp note="Display SQL statements."}
{/forminput}
</div>
-
<div class="control-group">
{forminput}
- <label><input type="checkbox" name="debug" value="true" /> Debug mode</label>
- {formhelp note="Display SQL statements."}
+ <div class="alert alert-info">
+ <strong>Please press the install 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>
+
{/jstab}
{if !$first_install}
diff --git a/templates/install_upgrade.tpl b/templates/install_upgrade.tpl
index 5aa0cb9..e3d96fb 100644
--- a/templates/install_upgrade.tpl
+++ b/templates/install_upgrade.tpl
@@ -153,15 +153,15 @@
{/if}
<div class="control-group">
- {forminput}
- <input type="submit" class="btn" name="upgrade_packages" value="Upgrade Packages" />
- {/forminput}
+ {forminput}
+ <label><input type="checkbox" name="debug" value="true" /> Debug mode</label>
+ {formhelp note="Display SQL statements."}
+ {/forminput}
</div>
<div class="control-group">
{forminput}
- <label><input type="checkbox" name="debug" value="true" /> Debug mode</label>
- {formhelp note="Display SQL statements."}
+ <input type="submit" class="btn" name="upgrade_packages" value="Upgrade Packages" />
{/forminput}
</div>
{/form}
diff --git a/templates/install_version.tpl b/templates/install_version.tpl
index 3f3b588..c499669 100644
--- a/templates/install_version.tpl
+++ b/templates/install_version.tpl
@@ -72,15 +72,15 @@
</table>
<div class="control-group">
- {forminput}
- <input type="submit" class="btn" name="fix_version_210beta" value="Fix Permissions" />
- {/forminput}
+ {forminput}
+ <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+ {formhelp note="Display SQL statements."}
+ {/forminput}
</div>
<div class="control-group">
{forminput}
- <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
- {formhelp note="Display SQL statements."}
+ <input type="submit" class="btn" name="fix_version_210beta" value="Fix Permissions" />
{/forminput}
</div>
{else}
diff --git a/templates/install_welcome.tpl b/templates/install_welcome.tpl
index 88bf92d..f19dc5a 100644
--- a/templates/install_welcome.tpl
+++ b/templates/install_welcome.tpl
@@ -10,13 +10,17 @@
<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 btn-primary" name="install" value="Begin the install process" />
+ {if $gBitUser->isAdmin()}
+ <a class="btn" href="{$smart.const.INSTALL_PKG_URL}?step=4">Upgrade</a> <a class="btn" href="{$smart.const.INSTALL_PKG_URL}?step=3">Install Packages</a>
+ <a class="btn btn-danger pull-right" href="{$smart.const.INSTALL_PKG_URL}?step=1">Restart Installation</a>
+ {else}
+ <input type="hidden" name="step" value="{$next_step}" />
+ <input type="submit" class="btn btn-primary" name="install" value="Begin the install process" />
+ {/if}
{/forminput}
- <p><strong>This installer will guide you through the installation or upgrade.</strong></p>
</div>
{/form}
</div>
diff --git a/templates/migrate_database.tpl b/templates/migrate_database.tpl
index 8131678..a1712a8 100644
--- a/templates/migrate_database.tpl
+++ b/templates/migrate_database.tpl
@@ -280,17 +280,17 @@
</div>
<div class="control-group">
- {formlabel label="Stop on Errors" for="stop_on_errors"}
{forminput}
- <input type="checkbox" name="stop_on_errors" id="stop_on_errors"{if $stop_on_errors} checked="checked"{/if} />
- {formhelp note="Checking this box will cause the script to stop on the first error."}
+ <label><input type="checkbox" name="debug" id="debug"{if $debug} checked="checked"{/if} /> Debug mode</label>
+ {formhelp note="Display SQL statements."}
{/forminput}
</div>
<div class="control-group">
+ {formlabel label="Stop on Errors" for="stop_on_errors"}
{forminput}
- <label><input type="checkbox" name="debug" id="debug"{if $debug} checked="checked"{/if} /> Debug mode</label>
- {formhelp note="Display SQL statements."}
+ <input type="checkbox" name="stop_on_errors" id="stop_on_errors"{if $stop_on_errors} checked="checked"{/if} />
+ {formhelp note="Checking this box will cause the script to stop on the first error."}
{/forminput}
</div>
{/legend}
diff --git a/templates/upgrade_packages.tpl b/templates/upgrade_packages.tpl
index 5ba0023..3092af9 100644
--- a/templates/upgrade_packages.tpl
+++ b/templates/upgrade_packages.tpl
@@ -38,14 +38,14 @@
<div class="control-group">
{forminput}
- <input type="submit" class="btn" name="upgrade" value="Upgrade Packages" />
+ <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
+ {formhelp note="Display SQL statements."}
{/forminput}
</div>
<div class="control-group">
{forminput}
- <label><input type="checkbox" name="debug" id="debug" value="true" /> Debug mode</label>
- {formhelp note="Display SQL statements."}
+ <input type="submit" class="btn" name="upgrade" value="Upgrade Packages" />
{/forminput}
</div>
{/form}
generated by cgit v1.3 (git 2.53.0) at 2026-07-01 20:38:16 +0000