diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-10 14:33:21 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-10 14:33:21 +0000 |
| commit | 4e2d04dd4af4ee8d7be21788fe7e079bfd53e7d7 (patch) | |
| tree | c291eb5af353f7671fc4a19b6213433a505e3587 /phpBB/adm/style/install_update.html | |
| parent | 94476d05e09bcc70f4f2ea42472b5f22538f3235 (diff) | |
| download | forums-4e2d04dd4af4ee8d7be21788fe7e079bfd53e7d7.tar forums-4e2d04dd4af4ee8d7be21788fe7e079bfd53e7d7.tar.gz forums-4e2d04dd4af4ee8d7be21788fe7e079bfd53e7d7.tar.bz2 forums-4e2d04dd4af4ee8d7be21788fe7e079bfd53e7d7.tar.xz forums-4e2d04dd4af4ee8d7be21788fe7e079bfd53e7d7.zip | |
implemented updater changes
git-svn-id: file:///svn/phpbb/trunk@6736 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style/install_update.html')
| -rw-r--r-- | phpBB/adm/style/install_update.html | 224 |
1 files changed, 125 insertions, 99 deletions
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index be4fd0961b..9eef17200f 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -71,14 +71,16 @@ function popup(url, width, height) </fieldset> <!-- IF not S_UP_TO_DATE --> - <form id="install_update" method="post" action="{U_ACTION}"> + + <form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}"> <fieldset class="submit-buttons"> - <p>{L_CHECK_FILES_EXPLAIN}</p> - <input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" /> + <p>{L_UPDATE_DATABASE_EXPLAIN}</p> + <input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" /> </fieldset> </form> + <!-- ELSE --> <form id="install_update" method="post" action="{U_ACTION}"> @@ -90,113 +92,147 @@ function popup(url, width, height) </form> <!-- ENDIF --> -<!-- ELSEIF S_FILE_CHECK --> - - <h1>{L_COLLECTED_INFORMATION}</h1> +<!-- ELSEIF S_DB_UPDATE --> - <p>{L_COLLECTED_INFORMATION_EXPLAIN}</p> + <!-- IF not S_DB_UPDATE_FINISHED --> - <!-- IF S_NO_UPDATE_FILES --> - <div class="errorbox"> - <h3>{L_NO_UPDATE_FILES}</h3> + <h1>{L_PERFORM_DATABASE_UPDATE}</h1> - <p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br /> + <p> + {L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br /> + <br /> + <a href="{U_DB_UPDATE}" target="update"><strong>» {L_RUN_DATABASE_SCRIPT} «</strong></a> + </p> - <strong>{NO_UPDATE_FILES}</strong> - - </div> - <!-- ENDIF --> + <br /><br /> - <form id="install_update" method="post" action="{U_UPDATE_ACTION}"> + <form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}"> - <!-- IF .files --> - <!-- BEGIN files --> - <!-- IF files.S_STATUS --> - <!-- IF not files.S_FIRST_ROW --> - </fieldset> - <!-- ENDIF --> + <fieldset class="submit-buttons"> + <input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" /> + </fieldset> - <h2>{files.TITLE}</h2> + </form> - <p>{files.EXPLAIN}</p> + <!-- ELSE --> - <fieldset> - <legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend> - <!-- ELSE --> - <dl> - <!-- IF files.STATUS eq 'up_to_date' --> - <dd class="full" style="text-align: left;"><strong>{files.FILENAME}</strong></dd> - <!-- ELSE --> - <dt style="width: 60%;"> - <strong><!-- IF files.DIR_PART -->{files.DIR_PART}<br /><!-- ENDIF -->{files.FILE_PART}</strong> - <!-- IF files.S_CUSTOM --> - <br /><span><em>{L_FILE_USED}: </em>{files.CUSTOM_ORIGINAL}</span> - <!-- ENDIF --> - <!-- IF files.NUM_CONFLICTS --> - <br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span> - <!-- ENDIF --> - </dt> - <dd style="margin-left: 60%;">[ <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 style="margin-left: 60%;"><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</dd> - <!-- ENDIF --> - <!-- IF files.STATUS eq 'conflict' --> - </dl> - <dl> - <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</dt> - <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="popup('{files.U_VIEW_NO_MERGE_NEW}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> - </dl> - <dl> - <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</dt> - <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="popup('{files.U_VIEW_NO_MERGE_MOD}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> - </dl> - <dl> - <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</dt> - <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="popup('{files.U_VIEW_NEW_FILE}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> - </dl> - <dl> - <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</dt> - <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="popup('{files.U_VIEW_MOD_FILE}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> - </dl> - <!-- IF not files.S_LAST_ROW --> - </fieldset> + <h1>{L_UPDATE_DB_SUCCESS}</h1> - <fieldset> - <legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend> - <!-- ENDIF --> + <br /><br /> - <!-- ENDIF --> - <!-- ENDIF --> - <!-- IF files.STATUS neq 'conflict' --></dl><!-- ENDIF --> - <!-- ENDIF --> - <!-- END files --> + <form id="install_update" method="post" action="{U_ACTION}"> + <fieldset class="submit-buttons"> + <p>{L_CHECK_FILES_EXPLAIN}</p> + <input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" /> </fieldset> - <!-- ENDIF --> - <br /> + </form> - <fieldset class="quick"> - <input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" /> - </fieldset> + <!-- ENDIF --> - <br /> +<!-- ELSEIF S_FILE_CHECK --> <!-- IF S_ALL_UP_TO_DATE --> - </form> - <!-- IF S_VERSION_UP_TO_DATE --> - <p>{L_NO_DATABASE_UPDATE_NEEDED}</p> - <!-- ELSE --> - <form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}"> + <div class="successbox"> + <h3>{L_UPDATE_SUCCESS}</h3> + <p>{L_ALL_FILES_UP_TO_DATE}</p> + </div> + + <!-- ELSE --> + <h1>{L_COLLECTED_INFORMATION}</h1> + + <p>{L_COLLECTED_INFORMATION_EXPLAIN}</p> + + <!-- IF S_NO_UPDATE_FILES --> + <div class="errorbox"> + <h3>{L_NO_UPDATE_FILES}</h3> + + <p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br /> + + <strong>{NO_UPDATE_FILES}</strong> + + </div> + <!-- ENDIF --> + + <form id="install_update" method="post" action="{U_UPDATE_ACTION}"> + + <!-- IF .files --> + <!-- BEGIN files --> + <!-- IF files.S_STATUS --> + <!-- IF not files.S_FIRST_ROW --> + </fieldset> + <!-- ENDIF --> + + <h2>{files.TITLE}</h2> + + <p>{files.EXPLAIN}</p> + + <fieldset> + <legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend> + <!-- ELSE --> + <dl> + <!-- IF files.STATUS eq 'up_to_date' --> + <dd class="full" style="text-align: left;"><strong>{files.FILENAME}</strong></dd> + <!-- ELSE --> + <dt style="width: 60%;"> + <strong><!-- IF files.DIR_PART -->{files.DIR_PART}<br /><!-- ENDIF -->{files.FILE_PART}</strong> + <!-- IF files.S_CUSTOM --> + <br /><span><em>{L_FILE_USED}: </em>{files.CUSTOM_ORIGINAL}</span> + <!-- ENDIF --> + <!-- IF files.NUM_CONFLICTS --> + <br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span> + <!-- ENDIF --> + </dt> + <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="popup('{files.U_SHOW_DIFF}', 700, 500); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> + <!-- IF files.S_CUSTOM --> + <dd style="margin-left: 60%;"><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</dd> + <!-- ENDIF --> + <!-- IF files.STATUS eq 'conflict' --> + </dl> + <dl> + <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</dt> + <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="popup('{files.U_VIEW_NO_MERGE_NEW}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> + </dl> + <dl> + <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</dt> + <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="popup('{files.U_VIEW_NO_MERGE_MOD}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> + </dl> + <!-- IF not files.S_BINARY --> + <dl> + <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</dt> + <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="popup('{files.U_VIEW_NEW_FILE}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> + </dl> + <dl> + <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</dt> + <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="popup('{files.U_VIEW_MOD_FILE}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> + </dl> + <!-- ENDIF --> + <!-- IF not files.S_LAST_ROW --> + </fieldset> + + <fieldset> + <legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend> + <!-- ENDIF --> + + <!-- ENDIF --> + <!-- ENDIF --> + <!-- IF files.STATUS neq 'conflict' --></dl><!-- ENDIF --> + <!-- ENDIF --> + <!-- END files --> - <fieldset class="submit-buttons"> - <p>{L_ALL_FILES_UP_TO_DATE}</p> - <input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" /> </fieldset> <!-- ENDIF --> - <!-- ELSE --> + <br /> + + <fieldset class="quick"> + <input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" /> + </fieldset> + + <br /> + <h1>{L_UPDATE_METHOD}</h1> <p>{L_UPDATE_METHOD_EXPLAIN}</p> @@ -205,9 +241,9 @@ function popup(url, width, height) <input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" /> <input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD}" /> </fieldset> - <!-- ENDIF --> + </form> - </form> + <!-- ENDIF --> <!-- ELSEIF S_DOWNLOAD_FILES --> @@ -295,16 +331,6 @@ function popup(url, width, height) </form> -<!-- ELSEIF S_DB_UPDATE --> - - <h1>{L_PERFORM_DATABASE_UPDATE}</h1> - - <p> - {L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br /> - <br /> - <a href="{U_DB_UPDATE}"><strong>» {L_RUN_DATABASE_SCRIPT} «</strong></a> - </p> - <!-- ENDIF --> <!-- INCLUDE install_footer.html --> |