From aff1ce6e9bbf3db0cb3631462f3d9562ca3f1289 Mon Sep 17 00:00:00 2001 From: santo spider Date: Tue, 26 Aug 2014 14:11:46 -0400 Subject: bootstrap 3 cleanup of installer --- templates/install.tpl | 23 ++++++++++++++++------- templates/install_admin_inc.tpl | 10 +++++----- templates/install_database.tpl | 14 +++++++------- templates/install_login.tpl | 4 ++-- templates/migrate_database.tpl | 26 +++++++++++++------------- 5 files changed, 43 insertions(+), 34 deletions(-) diff --git a/templates/install.tpl b/templates/install.tpl index 3002cfe..17fe1ce 100644 --- a/templates/install.tpl +++ b/templates/install.tpl @@ -32,9 +32,18 @@
-
-
-
Install Bitweaver {$gBitSystem->getBitVersion()}
+
-
-
+
-
+
{include file=$install_file}
diff --git a/templates/install_admin_inc.tpl b/templates/install_admin_inc.tpl index 819e733..0b980b7 100644 --- a/templates/install_admin_inc.tpl +++ b/templates/install_admin_inc.tpl @@ -8,7 +8,7 @@ {formfeedback error=$errors.real_name} {formlabel label="Full Name" for="real_name"} {forminput} - + {formhelp note="Administrator full name."} {/forminput}
@@ -17,7 +17,7 @@ {formfeedback error=$errors.login} {formlabel label="Admin login" for="login"} {forminput} - + {formhelp note="Administrator login username."} {/forminput}
@@ -26,7 +26,7 @@ {formfeedback error=$errors.password} {formlabel label="Password" for="password"} {forminput} - + {formhelp note="The administrator's password should be at least 4 characters in length."} {/forminput} @@ -34,7 +34,7 @@
{formlabel label="Re-enter password" for="pass_confirm"} {forminput} - + {formhelp note="Please confirm the administrators password."} {/forminput}
@@ -43,7 +43,7 @@ {formfeedback error=$errors.email} {formlabel label="Email" for="email"} {forminput} - + {formhelp note="Administrator email address, in case of site malfunction this email will be showen to users."} {/forminput} diff --git a/templates/install_database.tpl b/templates/install_database.tpl index 22936a2..4fc890f 100644 --- a/templates/install_database.tpl +++ b/templates/install_database.tpl @@ -68,7 +68,7 @@
{formlabel label="Host" for="host"} {forminput} - + {formhelp note="Hostname or IP for your MySQL database, example:
Use 'localhost' if your database is on the same machine as your server.
If you use Oracle, insert your TNS name here.
@@ -80,7 +80,7 @@
{formlabel label="User" for="user"} {forminput} - + {formhelp note="Database user"} {/forminput}
@@ -88,7 +88,7 @@
{formlabel label="Password" for="pass"} {forminput} - + {formhelp note="Database password"} {/forminput}
@@ -96,7 +96,7 @@
{formlabel label="Database name" for="name"} {forminput} - + {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 aliase as the database name, or provide a full path and file name to create the database in an existing directory."} {else} @@ -111,7 +111,7 @@ {/if} {formlabel label="Database prefix" for="prefix"} {forminput} - + {formhelp note="This prefix will be prepended to the begining of every table name to allow multiple independent install to share a single database. To ensure problem free usage of Bitweaver with other applications in the same database, we highly recommend using 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. MySQL does NOT support schemas."} {/forminput}
@@ -120,7 +120,7 @@
{formlabel label="Firebird installation path" for="fbpath"} {forminput} - + {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 operating system."} {/forminput}
@@ -129,7 +129,7 @@
{formlabel label="Site base URL" for="baseurl"} {forminput} - + {formhelp note="This is the path from the server root to your Bitweaver location.
i.e. if you access Bitweaver as http://MyServer.com/applications/new/wiki/index.php you should enter /applications/new/"} {/forminput} diff --git a/templates/install_login.tpl b/templates/install_login.tpl index c680bf0..8df50ac 100644 --- a/templates/install_login.tpl +++ b/templates/install_login.tpl @@ -7,7 +7,7 @@ {formfeedback error="$error"} {formlabel label="Username or Email" for="user"} {forminput} - + {formhelp note=""} {/forminput}
@@ -15,7 +15,7 @@
{formlabel label="Password" for="pass"} {forminput} - + {/forminput}
diff --git a/templates/migrate_database.tpl b/templates/migrate_database.tpl index a3df19a..e42bac8 100644 --- a/templates/migrate_database.tpl +++ b/templates/migrate_database.tpl @@ -44,7 +44,7 @@
{formlabel label="Source host" for="host_src"} {forminput} - + {formhelp note="Hostname or IP for your MySQL database, example:
Use 'localhost' if your database is on the same machine as your server.
If you use Oracle, insert your TNS name here
@@ -56,7 +56,7 @@
{formlabel label="Source user" for="user_src"} {forminput} - + {formhelp note="Database user"} {/forminput}
@@ -64,7 +64,7 @@
{formlabel label="Source Password" for="pass_src"} {forminput} - + {formhelp note="Database password"} {/forminput}
@@ -72,7 +72,7 @@
{formlabel label="Source database name" for="name_src"} {forminput} - + { 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 @@ -93,7 +93,7 @@ {/if} {formlabel label="Source Database Prefix" for="prefix_src"} {forminput} - + {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_', so you rarely need to enter a prefix. If you are NOT running MySQL (i.e. Postgres, Oracle, etc.) @@ -106,7 +106,7 @@
{formlabel label="Firebird Installation Path" for="fbpath"} {forminput} - + {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."} @@ -155,7 +155,7 @@
{formlabel label="Destination Host" for="host_dst"} {forminput} - + {formhelp note="Hostname or IP for your MySQL database, example:
Use 'localhost' if your database is on the same machine as your server.
If you use Oracle, insert your TNS Name here
@@ -167,7 +167,7 @@
{formlabel label="Destination user" for="user_dst"} {forminput} - + {formhelp note="Database user"} {/forminput}
@@ -175,7 +175,7 @@
{formlabel label="Destination password" for="pass_dst"} {forminput} - + {formhelp note="Database password"} {/forminput}
@@ -183,7 +183,7 @@
{formlabel label="Destination database name" for="name_dst"} {forminput} - + { 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 @@ -204,7 +204,7 @@ {/if} {formlabel label="Destination Database Prefix" for="prefix_dst"} {forminput} - + {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_', so you rarely need to enter a prefix. If you are NOT running MySQL (i.e. Postgres, Oracle, etc.) @@ -217,7 +217,7 @@
{formlabel label="Firebird installation path" for="fbpath"} {forminput} - + {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."} @@ -228,7 +228,7 @@
{formlabel label="Site Base URL" for="baseurl"} {forminput} - + {formhelp note="This is the path from the server root to your Bitweaver location, i.e., if you access Bitweaver as http://MyServer.com/applications/new/wiki/index.php you should enter /applications/new/"} {/forminput}
-- cgit v1.3