diff options
| -rw-r--r-- | templates/install.tpl | 23 | ||||
| -rw-r--r-- | templates/install_admin_inc.tpl | 10 | ||||
| -rw-r--r-- | templates/install_database.tpl | 14 | ||||
| -rw-r--r-- | templates/install_login.tpl | 4 | ||||
| -rw-r--r-- | 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 @@ </head> <body id="step{$smarty.request.step}"> <header class="container"> - <div class="navbar"> - <div style="margin:10px;overflow:visible;"> - <div class="brand">Install Bitweaver {$gBitSystem->getBitVersion()} </div> + <nav class="navbar navbar-default" role="navigation"> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bit-install-navbar-collapse"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <div class="navbar-brand">Install Bitweaver {$gBitSystem->getBitVersion()} </div> + </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> @@ -50,8 +59,8 @@ </div> </nav> </div> - <div class="navbar-inner"> - <ul class="nav"> + <div class="collapse navbar-collapse" id="bit-install-navbar-collapse"> + <ul class="nav navbar-nav"> {foreach from=$menu_steps item=step key=key} <li class="{if $smarty.request.step == $key}active{/if}"> <a href="{$menu_path|default:$smarty.const.INSTALL_PKG_URL}{$menu_file|default:"install.php"}?step={$key}" {if $step.state eq 'uncompleted'}onclick="return false;"{/if}> @@ -61,12 +70,12 @@ {/foreach} </ul> </div> - </div> + </nav> </header> <div class="container"> <section class="row maincontent"> - <div class="span12"> + <div class="col-xs-12 col-sm-9"> {include file=$install_file} </div> <section> 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} - <input type="text" name="real_name" id="real_name" value="{$smarty.session.real_name|default:'Administrator'}" /> + <input type="text" class="form-control" name="real_name" id="real_name" value="{$smarty.session.real_name|default:'Administrator'}" /> {formhelp note="Administrator full name."} {/forminput} </div> @@ -17,7 +17,7 @@ {formfeedback error=$errors.login} {formlabel label="Admin login" for="login"} {forminput} - <input type="text" name="login" id="login" value="{$smarty.session.login|default:'admin'}" /> + <input type="text" class="form-control" name="login" id="login" value="{$smarty.session.login|default:'admin'}" /> {formhelp note="Administrator login username."} {/forminput} </div> @@ -26,7 +26,7 @@ {formfeedback error=$errors.password} {formlabel label="Password" for="password"} {forminput} - <input type="password" name="password" id="password" maxlength="32" value="{$smarty.session.password}" /> + <input type="password" class="form-control" name="password" id="password" maxlength="32" value="{$smarty.session.password}" /> {formhelp note="The administrator's password should be at least 4 characters in length."} {/forminput} </div> @@ -34,7 +34,7 @@ <div class="form-group"> {formlabel label="Re-enter password" for="pass_confirm"} {forminput} - <input type="password" name="pass_confirm" id="pass_confirm" maxlength="32" value="{$smarty.session.password}" /> + <input type="password" class="form-control" name="pass_confirm" id="pass_confirm" maxlength="32" value="{$smarty.session.password}" /> {formhelp note="Please confirm the administrators password."} {/forminput} </div> @@ -43,7 +43,7 @@ {formfeedback error=$errors.email} {formlabel label="Email" for="email"} {forminput} - <input type="text" name="email" id="email" value="{$smarty.session.email}" /> + <input type="text" class="form-control" name="email" id="email" value="{$smarty.session.email}" /> {formhelp note="Administrator email address, in case of site malfunction this email will be showen to users."} {/forminput} </div> 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 @@ <div class="form-group"> {formlabel label="Host" for="host"} {forminput} - <input type="text" size="25" name="host" id="host" value="{if $gBitDbHost ne '' }{$gBitDbHost}{/if}" /> + <input type="text" class="form-control" 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 /> @@ -80,7 +80,7 @@ <div class="form-group"> {formlabel label="User" for="user"} {forminput} - <input type="text" size="25" name="user" id="user" value="{$gBitDbUser}" /> + <input type="text" class="form-control" name="user" id="user" value="{$gBitDbUser}" /> {formhelp note="Database user"} {/forminput} </div> @@ -88,7 +88,7 @@ <div class="form-group"> {formlabel label="Password" for="pass"} {forminput} - <input type="password" size="25" name="pass" id="pass" value="{$gBitDbPassword_input}" /> + <input type="password" class="form-control" name="pass" id="pass" value="{$gBitDbPassword_input}" /> {formhelp note="Database password"} {/forminput} </div> @@ -96,7 +96,7 @@ <div class="form-group"> {formlabel label="Database name" for="name"} {forminput} - <input type="text" size="25" name="name" id="name" value="{$gBitDbName}" /> + <input type="text" class="form-control" 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 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} - <input type="text" size="25" name="prefix" id="prefix" value="{$db_prefix_bit|replace:'`':''}" /> + <input type="text" class="form-control" 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 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. <strong>MySQL does NOT support schemas.</strong>"} {/forminput} </div> @@ -120,7 +120,7 @@ <div class="form-group"> {formlabel label="Firebird installation path" for="fbpath"} {forminput} - <input type="text" size="50" name="fbpath" id="fbpath" value="{$fbpath}" /> + <input type="text" class="form-control" 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 operating system."} {/forminput} </div> @@ -129,7 +129,7 @@ <div class="form-group"> {formlabel label="Site base URL" for="baseurl"} {forminput} - <input type="text" size="25" name="baseurl" id="baseurl" value="{$bit_root_url}" /> + <input type="text" class="form-control" 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 <kbd>http://MyServer.com/applications/new/wiki/index.php</kbd> you should enter <kbd>/applications/new/</kbd>"} {/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} - <input type="text" name="user" id="user" size="25" /> + <input type="text" class="form-control" name="user" id="user" /> {formhelp note=""} {/forminput} </div> @@ -15,7 +15,7 @@ <div class="form-group"> {formlabel label="Password" for="pass"} {forminput} - <input type="password" name="pass" id="pass" size="25" /> + <input type="password" class="form-control" name="pass" id="pass" /> {/forminput} </div> 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 @@ <div class="form-group"> {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}" /> + <input type="text" class="form-control" 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 /> @@ -56,7 +56,7 @@ <div class="form-group"> {formlabel label="Source user" for="user_src"} {forminput} - <input type="text" size="25" name="user_src" id="user_src" value="{$user_src}" /> + <input type="text" class="form-control" name="user_src" id="user_src" value="{$user_src}" /> {formhelp note="Database user"} {/forminput} </div> @@ -64,7 +64,7 @@ <div class="form-group"> {formlabel label="Source Password" for="pass_src"} {forminput} - <input type="password" size="25" name="pass_src" id="pass_src" value="{$pass_src}" /> + <input type="password" class="form-control" name="pass_src" id="pass_src" value="{$pass_src}" /> {formhelp note="Database password"} {/forminput} </div> @@ -72,7 +72,7 @@ <div class="form-group"> {formlabel label="Source database name" for="name_src"} {forminput} - <input type="text" size="25" name="name_src" id="name_src" value="{$name_src}" /> + <input type="text" class="form-control" 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 @@ -93,7 +93,7 @@ {/if} {formlabel label="Source Database Prefix" for="prefix_src"} {forminput} - <input type="text" size="25" name="prefix_src" id="prefix_src" value="{$prefix_src}" /> + <input type="text" class="form-control" 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_', so you rarely need to enter a prefix. If you are NOT running MySQL (i.e. Postgres, Oracle, etc.) @@ -106,7 +106,7 @@ <div class="form-group"> {formlabel label="Firebird Installation Path" for="fbpath"} {forminput} - <input type="text" size="50" name="fbpath" id="fbpath" value="{$fbpath}" /> + <input type="text" class="form-control" 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."} @@ -155,7 +155,7 @@ <div class="form-group"> {formlabel label="Destination Host" for="host_dst"} {forminput} - <input type="text" size="25" name="host_dst" id="host_dst" value="{if $gBitDbHost ne '' }{$gBitDbHost}{/if}" /> + <input type="text" class="form-control" name="host_dst" id="host_dst" 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 /> @@ -167,7 +167,7 @@ <div class="form-group"> {formlabel label="Destination user" for="user_dst"} {forminput} - <input type="text" size="25" name="user_dst" id="user_dst" value="{$gBitDbUser}" /> + <input type="text" class="form-control" name="user_dst" id="user_dst" value="{$gBitDbUser}" /> {formhelp note="Database user"} {/forminput} </div> @@ -175,7 +175,7 @@ <div class="form-group"> {formlabel label="Destination password" for="pass_dst"} {forminput} - <input type="password" size="25" name="pass_dst" id="pass_dst" value="{$gBitDbPassword_input}" /> + <input type="password" class="form-control" name="pass_dst" id="pass_dst" value="{$gBitDbPassword_input}" /> {formhelp note="Database password"} {/forminput} </div> @@ -183,7 +183,7 @@ <div class="form-group"> {formlabel label="Destination database name" for="name_dst"} {forminput} - <input type="text" size="25" name="name_dst" id="name_dst" value="{$gBitDbName}" /> + <input type="text" class="form-control" 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 @@ -204,7 +204,7 @@ {/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}" /> + <input type="text" class="form-control" 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_', so you rarely need to enter a prefix. If you are NOT running MySQL (i.e. Postgres, Oracle, etc.) @@ -217,7 +217,7 @@ <div class="form-group"> {formlabel label="Firebird installation path" for="fbpath"} {forminput} - <input type="text" size="50" name="fbpath" id="fbpath" value="{$fbpath}" /> + <input type="text" class="form-control" 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."} @@ -228,7 +228,7 @@ <div class="form-group"> {formlabel label="Site Base URL" for="baseurl"} {forminput} - <input type="text" size="25" name="baseurl" id="baseurl" value="{$bit_root_url}" /> + <input type="text" class="form-control" name="baseurl" id="baseurl" value="{$bit_root_url}" /> {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> |
