diff options
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/index.php | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/install_update.html | 51 |
2 files changed, 31 insertions, 22 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 727cf435c9..907fed3681 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -52,7 +52,7 @@ $phpbb_admin_path = './'; // Some oft used variables $safe_mode = (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on') ? true : false; -$file_uploads = (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false; +$file_uploads = (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false; $module_id = request_var('i', ''); $mode = request_var('mode', ''); diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index e19c8ca332..5cdf2eeea0 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -1,5 +1,15 @@ <!-- INCLUDE install_header.html --> +<script type="text/javascript"> +<!-- +function popup(url, width, height) +{ + window.open(url.replace(/&/g, '&'), '_popup', 'height=' + height + ',resizable=yes,scrollbars=yes,width=' + width); + return false; +} +//--> +</script> + <!-- IF S_ERROR --> <h1>{L_NOTICE}</h1> <p style="color: red;">{ERROR_MSG}</p> @@ -110,9 +120,6 @@ <p>{files.EXPLAIN}</p> - <!--table cellspacing="1"> - <col class="row1" /><col class="row2" /><col class="row2" /> - <tbody --> <fieldset> <legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend> <!-- ELSE --> @@ -129,7 +136,7 @@ <br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span> <!-- ENDIF --> </dt> - <dd>[ <a href="{files.U_SHOW_DIFF}" onclick="popup({files.UA_SHOW_DIFF}, 700, 500);">{files.L_SHOW_DIFF}</a> ]</dd> + <dd>[ <a href="{files.U_SHOW_DIFF}" onclick="popup('{files.U_SHOW_DIFF}', 700, 500); return false;">{files.L_SHOW_DIFF}</a> ]</dd> <!-- IF files.S_CUSTOM --> <dd><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</dd> <!-- ENDIF --> @@ -185,6 +192,25 @@ <p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p> + <form id="install_update" method="post" action="{U_ACTION}"> + + <fieldset> + <legend>{L_DOWNLOAD_AS}</legend> + <dl> + <dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt> + <dd>{RADIO_BUTTONS}</dd> + </dl> + </fieldset> + + <fieldset class="submit-buttons"> + {S_HIDDEN_FIELDS} + <input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" /> <input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" /> + </fieldset> + + </form> + + <br /><br /> + <p>{L_MAPPING_FILE_STRUCTURE}</p> <table cellspacing="1"> @@ -207,23 +233,6 @@ </tbody> </table> - <form id="install_update" method="post" action="{U_ACTION}"> - - <fieldset> - <legend>{L_DOWNLOAD_AS}</legend> - <dl> - <dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt> - <dd>{RADIO_BUTTONS}</dd> - </dl> - </fieldset> - - <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS} - <input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" /> <input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" /> - </fieldset> - - </form> - <!-- ELSEIF S_FTP_UPLOAD --> <h1>{L_SELECT_FTP_SETTINGS}</h1> |