diff options
| author | spiderr <spider@viovio.com> | 2013-04-08 12:51:48 -0400 |
|---|---|---|
| committer | spiderr <spider@viovio.com> | 2013-04-08 12:51:48 -0400 |
| commit | 8d5fa8c7b9cff761c4cfa990b192048c5715808b (patch) | |
| tree | a85fd83c77166662176d846c7209e0b7a56a23eb | |
| parent | 527c9b56e833412fb000a1da5818d8ccb17495a7 (diff) | |
| download | install-8d5fa8c7b9cff761c4cfa990b192048c5715808b.tar.gz install-8d5fa8c7b9cff761c4cfa990b192048c5715808b.tar.bz2 install-8d5fa8c7b9cff761c4cfa990b192048c5715808b.zip | |
smarty3 cleanup of templates
| -rw-r--r-- | install_cleanup.php | 1 | ||||
| -rw-r--r-- | templates/install_cleanup.tpl | 6 | ||||
| -rw-r--r-- | templates/install_login.tpl | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/install_cleanup.php b/install_cleanup.php index 1e730d9..a9d0dd8 100644 --- a/install_cleanup.php +++ b/install_cleanup.php @@ -196,6 +196,7 @@ if( !empty( $_REQUEST['resolve_conflicts'] ) ) { } elseif( !empty( $_REQUEST['skip'] ) ) { // if there were no conflicts, we move on to the next page header( "Location: ".$_SERVER['SCRIPT_NAME']."?step=".++$step ); + die; } // make sure everything is up to date after the above changes diff --git a/templates/install_cleanup.tpl b/templates/install_cleanup.tpl index e636bd7..619d907 100644 --- a/templates/install_cleanup.tpl +++ b/templates/install_cleanup.tpl @@ -133,11 +133,7 @@ </table> {else} <p class="alert alert-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 - Maintenance" ipackage=users ifile=admin/permissions.php} page - at some point to ensure that all permissions are active. + 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 Maintenance" ipackage=users ifile="admin/permissions.php"} page at some point to ensure that all permissions are active. </p> {/if} {/legend} diff --git a/templates/install_login.tpl b/templates/install_login.tpl index 3f44022..90482cc 100644 --- a/templates/install_login.tpl +++ b/templates/install_login.tpl @@ -3,7 +3,7 @@ <h1>{$title|default:"You must be logged in as an administrator to run the installer."}</h1> {form class="form-horizontal" name="login" legend="Please sign in to continue" secure=$gBitSystem->isFeatureActive("site_https_login_required")} - <div class="row"> + <div class="control-group"> {formfeedback error="$error"} {formlabel label="Username or Email" for="user"} {forminput} @@ -12,7 +12,7 @@ {/forminput} </div> - <div class="row"> + <div class="control-group"> {formlabel label="Password" for="pass"} {forminput} <input type="password" name="pass" id="pass" size="25" /> @@ -21,7 +21,7 @@ <div class="control-group"> {forminput} - <input type="submit" class="btn" name="login" value="{tr}Log in to {$gBitSystem->getConfig('site_title')|default:"this site"}{/tr}" /> + <input type="submit" class="btn btn-primary" name="login" value="{tr}Log in to {$gBitSystem->getConfig('site_title')|default:"this site"}{/tr}" /> {/forminput} {if $gBitSystem->isFeatureActive('site_https_login_required') || $smarty.server.HTTPS=='on'} {booticon iname="icon-lock" ipackage="icons" iexplain="Secure Login"} @@ -32,6 +32,6 @@ <div class="center"> <a href="http://www.bitweaver.org/"> - <img src="{$smarty.const.INSTALL_PKG_URL}style/images/bitweaver_logo-trans.png" width="121" height="121" alt="bitweaver logo" title="Click here to visit the upgrade instructions" /> + <img src="{$smarty.const.INSTALL_PKG_URL}css/images/bitweaver_logo-trans.png" width="121" height="121" alt="bitweaver logo" title="Click here to visit the upgrade instructions" /> </a> </div> |