Updates to installer

This commit is contained in:
Ice
2008-08-10 00:10:43 +00:00
parent 33e2e026f7
commit c1baa68e02
5 changed files with 11 additions and 12 deletions

View File

@@ -22,7 +22,6 @@ if( !defined('IN_PHPBB') || !defined('IN_PORTAL_INSTALL') )
<div id="page-header"> <div id="page-header">
<h1><?php echo $page_title; ?></h1> <h1><?php echo $page_title; ?></h1>
<p><a href="<?php echo $phpbb_root_path . '">' . $user->lang['INDEX']; ?></a></p> <p><a href="<?php echo $phpbb_root_path . '">' . $user->lang['INDEX']; ?></a></p>
<p id="skip"><a href="#acp">Skip to content</a></p>
</div> </div>
<div id="page-body"> <div id="page-body">
<div id="acp"> <div id="acp">
@@ -41,7 +40,7 @@ if( !defined('IN_PHPBB') || !defined('IN_PORTAL_INSTALL') )
if( $old_version != 0 && $phpbb3portal === false ) if( $old_version != 0 && $phpbb3portal === false )
{ {
?> ?>
<li<?php echo ( ($mode == 'uninstall') ? ' id="activemenu"' : '' ); ?>><a href="install.<?php echo $phpEx; ?>?mode=uninstall"><span><?php echo $user->lang['INSTALLER_UNINSTALL']; ?></span></a></li> <li<?php echo ( ($mode == 'uninstall') ? ' id="activemenu"' : '' ); ?>><a href="<?php echo append_sid('install.'.$phpEx, 'mode=uninstall'); ?>"><span><?php echo $user->lang['INSTALLER_UNINSTALL']; ?></span></a></li>
<?php <?php
} }
?> ?>

View File

@@ -23,7 +23,7 @@ else
<h1><?php echo $user->lang['INSTALLER_INSTALL_TITLE']; ?></h1> <h1><?php echo $user->lang['INSTALLER_INSTALL_TITLE']; ?></h1>
<p><?php echo $user->lang['INSTALLER_INSTALL_NOTE']; ?></p> <p><?php echo $user->lang['INSTALLER_INSTALL_NOTE']; ?></p>
<form id="acp_board" method="post" action="install.php?mode=install"> <form id="acp_board" method="post" action="<?php echo append_sid('install.'.$phpEx, 'mode=install'); ?>">
<fieldset> <fieldset>
<legend><?php echo $user->lang['INSTALLER_INSTALL']; ?></legend> <legend><?php echo $user->lang['INSTALLER_INSTALL']; ?></legend>
<dl> <dl>
@@ -31,8 +31,8 @@ else
<dd><label><input name="confirm" value="1" class="radio" type="radio" /><?php echo $user->lang['YES']; ?></label><label><input name="confirm" value="0" checked="checked" class="radio" type="radio" /><?php echo $user->lang['NO']; ?></label></dd> <dd><label><input name="confirm" value="1" class="radio" type="radio" /><?php echo $user->lang['YES']; ?></label><label><input name="confirm" value="0" checked="checked" class="radio" type="radio" /><?php echo $user->lang['NO']; ?></label></dd>
</dl> </dl>
<p class="submit-buttons"> <p class="submit-buttons">
<input class="button1" id="submit" name="submit" value="Submit" type="submit" />&nbsp; <input class="button1" id="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" type="submit" />&nbsp;
<input class="button2" id="reset" name="reset" value="Reset" type="reset" /> <input class="button2" id="reset" name="reset" value="<?php echo $user->lang['RESET']; ?>" type="reset" />
</p> </p>
</fieldset> </fieldset>
</form> </form>

View File

@@ -32,6 +32,6 @@ case 'none':
<?php <?php
break; break;
} }
include $phpbb_root_path.'style/layout_footer.' . $phpEx; include $phpbb_root_path.'install_portal/style/layout_footer.' . $phpEx;
?> ?>

View File

@@ -23,7 +23,7 @@ else
<h1><?php echo $user->lang['INSTALLER_UNINSTALL_TITLE']; ?></h1> <h1><?php echo $user->lang['INSTALLER_UNINSTALL_TITLE']; ?></h1>
<p><?php echo $user->lang['INSTALLER_UNINSTALL_NOTE']; ?></p> <p><?php echo $user->lang['INSTALLER_UNINSTALL_NOTE']; ?></p>
<form id="acp_board" method="post" action="install.php?mode=uninstall"> <form id="acp_board" method="post" action="<?php echo append_sid('install.'.$phpEx, 'mode=uninstall'); ?>">
<fieldset> <fieldset>
<legend><?php echo $user->lang['INSTALLER_UNINSTALL']; ?></legend> <legend><?php echo $user->lang['INSTALLER_UNINSTALL']; ?></legend>
<dl> <dl>
@@ -31,8 +31,8 @@ else
<dd><label><input name="confirm" value="1" class="radio" type="radio" /><?php echo $user->lang['YES']; ?></label><label><input name="confirm" value="0" checked="checked" class="radio" type="radio" /><?php echo $user->lang['NO']; ?></label></dd> <dd><label><input name="confirm" value="1" class="radio" type="radio" /><?php echo $user->lang['YES']; ?></label><label><input name="confirm" value="0" checked="checked" class="radio" type="radio" /><?php echo $user->lang['NO']; ?></label></dd>
</dl> </dl>
<p class="submit-buttons"> <p class="submit-buttons">
<input class="button1" id="submit" name="submit" value="Submit" type="submit" />&nbsp; <input class="button1" id="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" type="submit" />&nbsp;
<input class="button2" id="reset" name="reset" value="Reset" type="reset" /> <input class="button2" id="reset" name="reset" value="<?php echo $user->lang['RESET']; ?>" type="reset" />
</p> </p>
</fieldset> </fieldset>
</form> </form>

View File

@@ -26,7 +26,7 @@ else
<h1><?php echo $user->lang['INSTALLER_UPDATE_TITLE']; ?></h1> <h1><?php echo $user->lang['INSTALLER_UPDATE_TITLE']; ?></h1>
<p><?php echo sprintf($user->lang['INSTALLER_UPDATE_NOTE'], $old_version, $current_version); ?></p> <p><?php echo sprintf($user->lang['INSTALLER_UPDATE_NOTE'], $old_version, $current_version); ?></p>
<form id="acp_board" method="post" action="install.php?mode=update"> <form id="acp_board" method="post" action="<?php echo append_sid('install.'.$phpEx, 'mode=update'); ?>">
<fieldset> <fieldset>
<legend><?php echo $user->lang['INSTALLER_UPDATE']; ?></legend> <legend><?php echo $user->lang['INSTALLER_UPDATE']; ?></legend>
<dl> <dl>
@@ -34,8 +34,8 @@ else
<dd><label><input name="confirm" value="1" class="radio" type="radio" /><?php echo $user->lang['YES']; ?></label><label><input name="confirm" value="0" checked="checked" class="radio" type="radio" /><?php echo $user->lang['NO']; ?></label></dd> <dd><label><input name="confirm" value="1" class="radio" type="radio" /><?php echo $user->lang['YES']; ?></label><label><input name="confirm" value="0" checked="checked" class="radio" type="radio" /><?php echo $user->lang['NO']; ?></label></dd>
</dl> </dl>
<p class="submit-buttons"> <p class="submit-buttons">
<input class="button1" id="submit" name="submit" value="Submit" type="submit" />&nbsp; <input class="button1" id="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" type="submit" />&nbsp;
<input class="button2" id="reset" name="reset" value="Reset" type="reset" /> <input class="button2" id="reset" name="reset" value="<?php echo $user->lang['RESET']; ?>" type="reset" />
</p> </p>
</fieldset> </fieldset>
</form> </form>