diff options
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/install_convert.html | 134 | ||||
| -rw-r--r-- | phpBB/adm/style/install_error.html | 8 | ||||
| -rw-r--r-- | phpBB/adm/style/install_footer.html | 21 | ||||
| -rw-r--r-- | phpBB/adm/style/install_header.html | 53 | ||||
| -rw-r--r-- | phpBB/adm/style/install_install.html | 77 | ||||
| -rw-r--r-- | phpBB/adm/style/install_main.html | 6 | ||||
| -rw-r--r-- | phpBB/adm/style/install_update.html | 491 | ||||
| -rw-r--r-- | phpBB/adm/style/install_update_diff.html | 254 |
8 files changed, 0 insertions, 1044 deletions
diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html deleted file mode 100644 index 7e22404f56..0000000000 --- a/phpBB/adm/style/install_convert.html +++ /dev/null @@ -1,134 +0,0 @@ -<!-- INCLUDE install_header.html --> - -<!-- IF S_NOT_INSTALLED --> - - <h1>{TITLE}</h1> - - <p>{BODY}</p> - -<!-- ELSE --> - - <form id="install_convert" method="post" action="{U_ACTION}"> - - <h1>{TITLE}</h1> - - <p>{BODY}</p> - - <!-- IF S_ERROR_BOX --> - <div class="errorbox"> - <h3>{ERROR_TITLE}</h3> - <p>{ERROR_MSG}</p> - </div> - <!-- ENDIF --> - - <!-- IF S_LIST --> - <table class="table1"> - <caption>{L_AVAILABLE_CONVERTORS}</caption> - <col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" /> - <thead> - <tr> - <th>{L_SOFTWARE}</th> - <th>{L_VERSION}</th> - <th>{L_AUTHOR}</th> - <th>{L_OPTIONS}</th> - </tr> - </thead> - <tbody> - <!-- IF .convertors --> - <!-- BEGIN convertors --> - <tr> - <td>{convertors.SOFTWARE}</td> - <td>{convertors.VERSION}</td> - <td>{convertors.AUTHOR}</td> - <td><a href="{convertors.U_CONVERT}">{L_CONVERT}</a></td> - </tr> - <!-- END convertors --> - <!-- ELSE --> - <tr> - <td>{L_NO_CONVERTORS}</td> - <td>-</td> - <td>-</td> - <td>-</td> - </tr> - <!-- ENDIF --> - </tbody> - </table> - <!-- ENDIF --> - - <!-- IF S_CONTINUE --> - </form> - - <fieldset class="submit-buttons"> - <form method="post" action="{U_NEW_ACTION}"> - <input class="button1" type="submit" name="submit_new" value="{L_NEW}" /> - </form> - <br /> - <form method="post" action="{U_CONTINUE_ACTION}"> - <input class="button1" type="submit" name="submit_cont" value="{L_CONTINUE}" /> - </form> - </fieldset> - - <form method="post" action="{U_ACTION}"> - <!-- ENDIF --> - - <!-- IF .checks --> - <fieldset> - - <!-- BEGIN checks --> - <!-- IF checks.S_LEGEND --> - <!-- IF not checks.S_FIRST_ROW --> - </fieldset> - - <fieldset> - <!-- ENDIF --> - <legend>{checks.LEGEND}</legend> - <!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF --> - <!-- ELSE --> - - <dl> - <dt><label>{checks.TITLE}{L_COLON}</label><!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> - <dd>{checks.RESULT}</dd> - </dl> - <!-- ENDIF --> - <!-- END checks --> - - </fieldset> - <!-- ENDIF --> - - <!-- IF .options --> - <fieldset> - - <!-- BEGIN options --> - <!-- IF options.S_LEGEND --> - <!-- IF not options.S_FIRST_ROW --> - </fieldset> - - <fieldset> - <!-- ENDIF --> - <legend>{options.LEGEND}</legend> - <!-- ELSE --> - - <dl> - <dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> - <dd>{options.CONTENT}</dd> - </dl> - - <!-- ENDIF --> - <!-- END options --> - - </fieldset> - <!-- ENDIF --> - - <!-- IF L_SUBMIT --> - <!-- IF L_MESSAGE --><p>{L_MESSAGE}</p><!-- ENDIF --> - - <fieldset class="submit-buttons"> - {S_HIDDEN} - <!-- IF L_SUBMIT --><input class="button1<!-- IF S_REFRESH --> disabled<!-- ENDIF -->" type="submit" id="submit" <!-- IF S_REFRESH -->disabled="disabled" <!-- ELSE --> onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" <!-- ENDIF -->name="submit" value="{L_SUBMIT}" /><!-- ENDIF --> - </fieldset> - <!-- ENDIF --> - - </form> -<!-- ENDIF --> - -<!-- INCLUDE install_footer.html --> diff --git a/phpBB/adm/style/install_error.html b/phpBB/adm/style/install_error.html deleted file mode 100644 index 3f7c8b9ed4..0000000000 --- a/phpBB/adm/style/install_error.html +++ /dev/null @@ -1,8 +0,0 @@ -<!-- INCLUDE install_header.html --> - -<div class="errorbox"> - <h3>{MESSAGE_TITLE}</h3> - <p>{MESSAGE_TEXT}</p> -</div> - -<!-- INCLUDE install_footer.html --> diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html deleted file mode 100644 index a29fce6c5a..0000000000 --- a/phpBB/adm/style/install_footer.html +++ /dev/null @@ -1,21 +0,0 @@ - </div> - </div><!-- /#main --> - </div> - </div><!-- /#acp --> - </div> - - <div id="page-footer"> - <div class="copyright"> - Powered by <a href="https://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Limited - </div> - </div> -</div> - -<script type="text/javascript" src="{T_JQUERY_LINK}"></script> -<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> -<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> -<!-- INCLUDEJS admin.js --> -{$SCRIPTS} - -</body> -</html> diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html deleted file mode 100644 index 6f7f129d39..0000000000 --- a/phpBB/adm/style/install_header.html +++ /dev/null @@ -1,53 +0,0 @@ -<!DOCTYPE html> -<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> -<head> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1" /> -<!-- IF META -->{META}<!-- ENDIF --> -<title>{PAGE_TITLE}</title> - -<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" /> -</head> - -<body class="{S_CONTENT_DIRECTION} nojs"> -<div id="wrap"> - <div id="page-header"> - <h1>{L_INSTALL_PANEL}</h1> - <p id="skip"><a href="#acp">{L_SKIP}</a></p> - <!-- IF S_LANG_SELECT --> - <form method="post" action="#"> - <fieldset class="nobg"> - <label for="language">{L_SELECT_LANG}{L_COLON}</label> - {S_LANG_SELECT} - <input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" /> - </fieldset> - </form> - <!-- ENDIF --> - </div> - - <div id="page-body"> - <div id="tabs"> - <ul> - <!-- BEGIN t_block1 --> - <li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li> - <!-- END t_block1 --> - </ul> - </div> - - <div id="acp"> - <div id="content"> - <div id="menu"> - <div class="menu-block no-header"> - <ul> - <!-- BEGIN l_block1 --> - <li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li> - <!-- END l_block1 --> - <!-- BEGIN l_block2 --> - <li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li> - <!-- END l_block2 --> - </ul> - </div> - </div> - - <div id="main" class="install-body"> - <div class="main"> diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html deleted file mode 100644 index 1a809a3588..0000000000 --- a/phpBB/adm/style/install_install.html +++ /dev/null @@ -1,77 +0,0 @@ -<!-- INCLUDE install_header.html --> - -<form id="install_install" method="post" action="{U_ACTION}" onsubmit="submit.disabled = 'disabled';"> - -<!-- IF TITLE --><h1>{TITLE}</h1><!-- ENDIF --> -<!-- IF BODY --><p>{BODY}</p><!-- ENDIF --> - -<!-- IF .checks --> - <fieldset> - - <!-- BEGIN checks --> - <!-- IF checks.S_LEGEND --> - <!-- IF not checks.S_FIRST_ROW --> - </fieldset> - - <fieldset> - <!-- ENDIF --> - <legend>{checks.LEGEND}</legend> - <!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF --> - <!-- ELSE --> - - <dl> - <dt>{checks.TITLE}{L_COLON}<!-- IF checks.S_EXPLAIN --><br /><span class="explain">{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> - <dd>{checks.RESULT}</dd> - </dl> - <!-- ENDIF --> - <!-- END checks --> - - </fieldset> -<!-- ENDIF --> - -<!-- IF .options --> - <fieldset> - - <!-- BEGIN options --> - <!-- IF options.S_LEGEND --> - <!-- IF not options.S_FIRST_ROW --> - </fieldset> - - <fieldset> - <!-- ENDIF --> - <legend>{options.LEGEND}</legend> - <!-- ELSE --> - - <dl> - <dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> - <dd>{options.CONTENT}</dd> - </dl> - - <!-- ENDIF --> - <!-- END options --> - - </fieldset> -<!-- ENDIF --> - -<!-- IF S_SHOW_DOWNLOAD --> - <h1>{L_DL_CONFIG}</h1> - <p>{L_DL_CONFIG_EXPLAIN}</p> - - <fieldset class="submit-buttons"> - <legend>{L_DL_CONFIG}</legend> - {S_HIDDEN} - <input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" /> <input class="button1" type="submit" id="dldone" name="dldone" value="{L_DL_DONE}" /> - </fieldset> -<!-- ENDIF --> - -<!-- IF L_SUBMIT --> - <fieldset class="submit-buttons"> - <legend>{L_SUBMIT}</legend> - {S_HIDDEN} - <!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" onclick="this.className = 'button1 disabled';" name="submit" value="{L_SUBMIT}" /><!-- ENDIF --> - </fieldset> -<!-- ENDIF --> - -</form> - -<!-- INCLUDE install_footer.html --> diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html deleted file mode 100644 index 73e73ad578..0000000000 --- a/phpBB/adm/style/install_main.html +++ /dev/null @@ -1,6 +0,0 @@ -<!-- INCLUDE install_header.html --> - - <h1>{TITLE}</h1> - <p>{BODY}</p> - -<!-- INCLUDE install_footer.html --> diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html deleted file mode 100644 index 898233f72d..0000000000 --- a/phpBB/adm/style/install_update.html +++ /dev/null @@ -1,491 +0,0 @@ -<!-- INCLUDE install_header.html --> - -<script type="text/javascript"> -// <![CDATA[ - function popup(url, width, height, name) - { - if (!name) - { - name = '_popup'; - } - - window.open(url.replace(/&/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width); - return false; - } - - function diff_popup(url) - { - popup(url, 950, 600, '_diff'); - return false; - } -// ]]> -</script> - -<!-- IF S_ERROR --> - <div class="errorbox" style="margin-top: 0;"> - <h3>{L_NOTICE}</h3> - <p>{ERROR_MSG}</p> - </div> -<!-- ENDIF --> - -<!-- IF S_IN_PROGRESS --> - - <div class="successbox" style="margin-top: 0;"> - <h3>{L_IN_PROGRESS}</h3> - <p>{L_IN_PROGRESS_EXPLAIN}</p> - </div> - -<!-- ELSEIF S_INTRO --> - - <!-- IF S_WARNING --> - <div class="successbox" style="margin-top: 0;"> - <h3>{L_NOTICE}</h3> - <p>{WARNING_MSG}</p> - </div> - <!-- ENDIF --> - - <div class="errorbox" style="margin-top: 0;"> - <h3>{L_NOTICE}</h3> - <p>{L_BACKUP_NOTICE}</p> - </div> - - <form id="install_update" method="post" action="{U_ACTION}"> - - <h1>{L_UPDATE_INSTALLATION}</h1> - <p>{L_UPDATE_INSTALLATION_EXPLAIN}</p> - - <fieldset class="submit-buttons"> - <input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" /> - </fieldset> - - </form> - -<!-- ELSEIF S_UPLOAD_SUCCESS --> - - <form id="install_update" method="post" action="{U_ACTION}"> - - <h1>{L_UPDATE_SUCCESS}</h1> - <p>{L_UPDATE_SUCCESS_EXPLAIN}</p> - - <fieldset class="submit-buttons"> - <input class="button1" type="submit" name="check_again" value="{L_CONTINUE_UPDATE}" /> - </fieldset> - - </form> - -<!-- ENDIF --> - -<!-- IF S_VERSION_CHECK --> - - <h1>{L_VERSION_CHECK}</h1> - - <p>{L_VERSION_CHECK_EXPLAIN}</p> - - <!-- IF S_UP_TO_DATE --> - <div class="successbox"> - <p>{L_VERSION_UP_TO_DATE}</p> - </div> - <!-- ELSE --> - <div class="errorbox"> - <p>{L_VERSION_NOT_UP_TO_DATE}</p> - </div> - <!-- ENDIF --> - - <fieldset> - <legend></legend> - <dl> - <dt><label>{L_CURRENT_VERSION}</label></dt> - <dd><strong>{CURRENT_VERSION}</strong></dd> - </dl> - <dl> - <dt><label>{L_LATEST_VERSION}</label></dt> - <dd><strong>{LATEST_VERSION}</strong></dd> - </dl> - <!-- IF PACKAGE_VERSION and not S_UP_TO_DATE --> - <dl> - <dt><label>{L_PACKAGE_UPDATES_TO}</label></dt> - <dd><strong>{PACKAGE_VERSION}</strong></dd> - </dl> - <!-- ENDIF --> - </fieldset> - - <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> - - </form> - -<!-- ELSEIF S_DB_UPDATE --> - - <!-- IF not S_DB_UPDATE_FINISHED --> - - <h1>{L_PERFORM_DATABASE_UPDATE}</h1> - - <p> - {L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br /> - </p> - - <br /><br /> - - <form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}"> - - <fieldset class="submit-buttons"> - <a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a> - - <!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / --> - </fieldset> - - </form> - - <!-- ELSE --> - - <div class="successbox"> - <h3>{L_UPDATE_SUCCESS}</h3> - <p>{L_EVERYTHING_UP_TO_DATE}</p> - </div> - - <!-- ENDIF --> - -<!-- ELSEIF S_FILE_CHECK --> - - <!-- IF S_ALL_UP_TO_DATE --> - - <h1>{L_UPDATE_FILE_SUCCESS}</h1> - <p>{L_ALL_FILES_UP_TO_DATE}</p> - - <p>{L_UPDATE_DATABASE_EXPLAIN}</p> - - <form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}"> - - <fieldset class="submit-buttons"> - <input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" /> - </fieldset> - - </form> - - <!-- 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 .deleted --> - <h2>{L_FILES_DELETED}</h2> - <div style="float: {S_CONTENT_FLOW_END};">» <a href="#" onclick="phpbb.toggleDisplay('deleted', 0); return false;">{L_TOGGLE_DISPLAY}</a></div> - <p>{L_FILES_DELETED_EXPLAIN}</p> - - <fieldset id="deleted"> - <legend><img src="{T_IMAGE_PATH}icon_delete.gif" alt="{L_STATUS_DELETED}" /></legend> - <!-- BEGIN deleted --> - <dl> - <dt style="width: 60%;"><strong><!-- IF deleted.DIR_PART -->{deleted.DIR_PART}<br /><!-- ENDIF -->{deleted.FILE_PART}</strong></dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}: 60%;"> - <!-- IF not deleted.S_BINARY -->[<a href="{deleted.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{deleted.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --> - </dd> - </dl> - <!-- END deleted --> - </fieldset> - - <!-- ENDIF --> - - <!-- IF .conflict --> - <h2>{L_FILES_CONFLICT}</h2> - <div style="float: {S_CONTENT_FLOW_END};">» <a href="#" onclick="phpbb.toggleDisplay('conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div> - <p>{L_FILES_CONFLICT_EXPLAIN}</p> - - <!-- BEGIN conflict --> - <fieldset id="conflict"> - <legend><img src="{T_IMAGE_PATH}file_conflict.gif" alt="{L_STATUS_CONFLICT}" /></legend> - <dl> - <dt style="width: 60%;"><strong><!-- IF conflict.DIR_PART -->{conflict.DIR_PART}<br /><!-- ENDIF -->{conflict.FILE_PART}</strong> - <!-- IF conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF --> - <!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}</span><!-- ENDIF --> - </dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"> - <!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN} - <!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --> - </dd> - <!-- IF conflict.S_CUSTOM --> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> - <!-- ENDIF --> - </dl> - <!-- IF conflict.S_BINARY --> - <dl> - <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"> </dd> - </dl> - <!-- ELSE --> - <dl> - <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="3" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}</label></dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd> - </dl> - <dl> - <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_MODIFIED}</a>]</dd> - </dl> - <dl> - <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> - </dl> - <dl> - <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{conflict.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;">[<a href="{conflict.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> - </dl> - <!-- ENDIF --> - </fieldset> - <!-- END conflict --> - - <!-- ENDIF --> - - <!-- IF .new_conflict --> - <h2>{L_FILES_NEW_CONFLICT}</h2> - <div style="float: {S_CONTENT_FLOW_END};">» <a href="#" onclick="phpbb.toggleDisplay('new_conflict', 0); return false;">{L_TOGGLE_DISPLAY}</a></div> - <p>{L_FILES_NEW_CONFLICT_EXPLAIN}</p> - - <fieldset id="new_conflict"> - <legend><img src="{T_IMAGE_PATH}file_new_conflict.gif" alt="{L_STATUS_NEW_CONFLICT}" /></legend> - <!-- BEGIN new_conflict --> - <dl> - <dt style="width: 60%;"><strong><!-- IF new_conflict.DIR_PART -->{new_conflict.DIR_PART}<br /><!-- ENDIF -->{new_conflict.FILE_PART}</strong> - <!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF --> - </dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"> - <!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --> - </dd> - <!-- IF new_conflict.S_CUSTOM --> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> - <!-- ENDIF --> - </dl> - <!-- END new_conflict --> - </fieldset> - - <!-- ENDIF --> - - <!-- IF .modified --> - <h2>{L_FILES_MODIFIED}</h2> - <div style="float: {S_CONTENT_FLOW_END};">» <a href="#" onclick="phpbb.toggleDisplay('modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div> - <p>{L_FILES_MODIFIED_EXPLAIN}</p> - - <!-- BEGIN modified --> - <fieldset id="modified"> - <legend><img src="{T_IMAGE_PATH}file_modified.gif" alt="{L_STATUS_MODIFIED}" /></legend> - <dl> - <dt style="width: 60%;"><strong><!-- IF modified.DIR_PART -->{modified.DIR_PART}<br /><!-- ENDIF -->{modified.FILE_PART}</strong> - <!-- IF modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{modified.CUSTOM_ORIGINAL}</span><!-- ENDIF --> - </dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"> </dd> - <!-- IF modified.S_CUSTOM --> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> - <!-- ENDIF --> - </dl> - <dl> - <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> - </dl> - <dl> - <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> - </dl> - <dl> - <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> - </dl> - </fieldset> - <!-- END modified --> - - <!-- ENDIF --> - - <!-- IF .new --> - <h2>{L_FILES_NEW}</h2> - <div style="float: {S_CONTENT_FLOW_END};">» <a href="#" onclick="phpbb.toggleDisplay('new_files', 0); return false;">{L_TOGGLE_DISPLAY}</a></div> - <p>{L_FILES_NEW_EXPLAIN}</p> - - <fieldset id="new_files" style="display: none;"> - <legend><img src="{T_IMAGE_PATH}file_new.gif" alt="{L_STATUS_NEW}" /></legend> - <!-- BEGIN new --> - <dl> - <dt style="width: 60%;"><strong><!-- IF new.DIR_PART -->{new.DIR_PART}<br /><!-- ENDIF -->{new.FILE_PART}</strong> - <!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF --> - </dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"> - <!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --> - </dd> - <!-- IF new.S_CUSTOM --> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> - <!-- ENDIF --> - </dl> - <!-- END new --> - </fieldset> - - <!-- ENDIF --> - - <!-- IF .not_modified --> - <h2>{L_FILES_NOT_MODIFIED}</h2> - <div style="float: {S_CONTENT_FLOW_END};">» <a href="#" onclick="phpbb.toggleDisplay('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div> - <p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p> - - <fieldset id="not_modified" style="display: none;"> - <legend><img src="{T_IMAGE_PATH}file_not_modified.gif" alt="{L_STATUS_NOT_MODIFIED}" /></legend> - <!-- BEGIN not_modified --> - <dl> - <dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong> - <!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}{L_COLON} </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF --> - </dt> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> - <!-- IF not_modified.S_CUSTOM --> - <dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> - <!-- ENDIF --> - </dl> - <!-- END not_modified --> - </fieldset> - - <!-- ENDIF --> - - <!-- IF .up_to_date --> - <h2>{L_FILES_UP_TO_DATE}</h2> - <div style="float: {S_CONTENT_FLOW_END};">» <a href="#" onclick="phpbb.toggleDisplay('up_to_date', 0); return false;">{L_TOGGLE_DISPLAY}</a></div> - <p>{L_FILES_UP_TO_DATE_EXPLAIN}</p> - - <fieldset id="up_to_date" style="display: none;"> - <legend><img src="{T_IMAGE_PATH}file_up_to_date.gif" alt="{L_STATUS_UP_TO_DATE}" /></legend> - <!-- BEGIN up_to_date --> - <dl> - <dd class="full" style="text-align: {S_CONTENT_FLOW_BEGIN};"><strong>{up_to_date.FILENAME}</strong></dd> - </dl> - <!-- END up_to_date --> - </fieldset> - - <!-- ENDIF --> - - <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> - - <fieldset class="submit-buttons"> - <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_BUTTON}" /> - </fieldset> - - </form> - - <!-- ENDIF --> - -<!-- ELSEIF S_DOWNLOAD_FILES --> - - <h1>{L_DOWNLOAD_UPDATE_METHOD}</h1> - - <p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p> - - <form id="install_update" method="post" action="{U_ACTION}"> - - <fieldset> - <legend>{L_SELECT_DOWNLOAD_FORMAT}</legend> - <dl> - <dt><label for="use_method">{L_DOWNLOAD_AS}{L_COLON}</label></dt> - <dd>{RADIO_BUTTONS}</dd> - </dl> - </fieldset> - - <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS} - <input type="submit" class="button2" value="{L_CONTINUE_UPDATE}" name="check_again" /> <input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" /> - </fieldset> - - </form> - - <br /><br /> - - <p>{L_MAPPING_FILE_STRUCTURE}</p> - - <table class="table1"> - <col class="row1" /><col class="row2" /><col class="row1" /> - <thead> - <tr> - <th style="width: 49%">{L_ARCHIVE_FILE}</th> - <th style="width: 2%"> </th> - <th style="width: 49%">{L_DESTINATION}</th> - </tr> - </thead> - <tbody> - <!-- BEGIN location --> - <tr> - <td>{location.SOURCE}</td> - <td><strong>»</strong></td> - <td>{location.DESTINATION}</td> - </tr> - <!-- END location --> - </tbody> - </table> - -<!-- ELSEIF S_FTP_UPLOAD --> - - <h1>{L_SELECT_FTP_SETTINGS}</h1> - - <form id="install_update" method="post" action="{U_ACTION}"> - - <!-- IF S_CONNECTION_SUCCESS --> - <div class="successbox"> - <p>{L_CONNECTION_SUCCESS}</p> - </div> - <!-- ELSEIF S_CONNECTION_FAILED --> - <div class="successbox"> - <p>{L_TRY_DOWNLOAD_METHOD}</p> - - <fieldset class="quick"> - <input class="button1" type="submit" name="download" value="{L_TRY_DOWNLOAD_METHOD_BUTTON}" /> - </fieldset> - </div> - - <div class="errorbox"> - <p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p> - </div> - <!-- ENDIF --> - - <fieldset> - <legend>{L_FTP_SETTINGS}</legend> - <dl> - <dt><label>{L_UPLOAD_METHOD}{L_COLON}</label></dt> - <dd><strong>{UPLOAD_METHOD}</strong></dd> - </dl> - <!-- BEGIN data --> - <dl> - <dt><label for="{data.DATA}">{data.NAME}{L_COLON}</label><br /><span>{data.EXPLAIN}</span></dt> - <dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd> - </dl> - <!-- END data --> - </fieldset> - - <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS} - <input class="button2" type="submit" name="check_again" value="{L_BACK}" /> - <input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" /> - <input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}" /> - </fieldset> - - </form> - -<!-- ENDIF --> - -<!-- INCLUDE install_footer.html --> diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html deleted file mode 100644 index 5f80084705..0000000000 --- a/phpBB/adm/style/install_update_diff.html +++ /dev/null @@ -1,254 +0,0 @@ -<!DOCTYPE html> -<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> -<head> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1" /> -<!-- IF META -->{META}<!-- ENDIF --> -<title>{PAGE_TITLE}</title> - -<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" /> - -<script type="text/javascript"> -// <![CDATA[ -function resize_panel() -{ - var block = document.getElementById('diff_content'); - var height; - - if (window.innerHeight) - { - height = window.innerHeight - 200; - block.style.height = height + 'px'; - } - else - { - //whatever IE needs to do this - } -} - -window.onresize = resize_panel; - -// ]]> -</script> - -<style type="text/css"> -/* <![CDATA[ */ - -#main, .rtl #main { - font-size: 1em; - line-height: 0.7em; - margin: 0; - padding: 0; - width: 99%; -} - -#diff_content { - padding: 30px 10px 10px; - overflow: hidden; -} - -<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> -div#codepanel { - width: 100%; -} -<!-- ELSE --> -div#codepanel { - background-color: #eee; -} -<!-- ENDIF --> - -<!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side' --> -div#diff_content pre { - overflow: auto; - height: 414px; - width: 100% !important; -} -<!-- ENDIF --> - -<!-- IF not S_DIFF_NEW_FILE --> -/** -* Unified Diff -*/ -.file { - line-height: .7em; - overflow: auto; - height: 414px; -} - -.diff { - margin: 0; -} - -.added { - background-color: #dfd; -} - -.removed { - background-color: #fdd; -} - -.info { - color: #888; -} - -.context { - background-color: #eee; -} - -/** -* Inline Diff -*/ -.ins { - background-color: #dfd; - text-decoration: underline; -} - -.del { - background-color: #fdd; - text-decoration: line-through; -} - -/** -* Column Diff -*/ -table.hrdiff { - margin: 0 0 8px 5px; - width: 100%; - overflow: hidden; - border-bottom: 1px solid #999; - table-layout: fixed; - background: transparent; -} - -table.hrdiff th { - text-align: left; - width: 50%; - color: #333; - font-family: Verdana,Helvetica,sans-serif; - font-size: 11px; - border-bottom: 1px solid #999; - border-right: 1px solid #999; - background: #D9D9D9; -} - -table.hrdiff thead th { - font-weight: bold; - font-size: 110%; - padding: 2px; -} - -table.hrdiff tr:first-child th { - border-top: none; -} - -table.hrdiff tbody th { - font-size: 80%; - border-top: 1px solid #999; -} - -table.hrdiff tbody td { - border-right: 1px solid #999; -} - -table.hrdiff td pre { - font-family: "Consolas", monospace; - font-size: 1.1em; - white-space: pre-wrap; /* css-3 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ -} - -table.hrdiff .unmodified { - background: transparent; -} - -table.hrdiff .added { - background: #9f9; -} - -table.hrdiff .added_empty { - background: #cfc; -} - -table.hrdiff .modified { - background: #fd9; -} - -table.hrdiff .removed { - background: #f99; -} - -table.hrdiff .removed_empty { - background: #fcc; -} - -table.hrdiff caption { - caption-side: top; - text-align: left; - margin: 0 0 8px 5px; - font-size: 90%; - font-weight: bold; - padding: 5px; -} - -table.hrdiff caption span { - height: 10px; - width: 10px; - line-height: 10px; - letter-spacing: 10px; - border: 1px solid #000; - margin-left: 0.5em; - vertical-align: baseline; -} - -<!-- ENDIF --> - -/* ]]> */ -</style> - -</head> - -<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> -<body onload="resize_panel();"> -<!-- ELSE --> -<body> -<!-- ENDIF --> - -<div id="wrap"> - <div id="page-header"> -<!-- IF S_DIFF_NEW_FILE --> - - <h1>{L_VIEWING_FILE_CONTENTS}</h1> -<!-- ELSE --> - <h1>{L_VIEWING_FILE_DIFF}</h1> -<!-- ENDIF --> -<!-- IF not S_DIFF_NEW_FILE --> - <p id="skip"><a href="#acp">{L_SKIP}</a></p> - <form method="post" action="#"> - <fieldset class="quick"> - <label for="diff_mode">{L_SELECT_DIFF_MODE}{L_COLON}</label> - <select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select> - - <input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" /> - </fieldset> - </form> -<!-- ENDIF --> -<!-- IF S_DIFF_CONFLICT_FILE --> - <div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}{L_COLON} {NUM_CONFLICTS}</strong></div> - <br style="clear: both;" /> -<!-- ENDIF --> - </div> - - <div id="page-body"> - <div id="acp"> - <div id="codepanel"> - <div id="diff_content"> - <div id="main"> - {DIFF_CONTENT} - </div> - </div> - </div> - </div> - </div> - - -<!-- INCLUDE simple_footer.html --> |