diff options
| author | Jim Wigginton <terrafrost@phpbb.com> | 2009-07-12 15:44:43 +0000 |
|---|---|---|
| committer | Jim Wigginton <terrafrost@phpbb.com> | 2009-07-12 15:44:43 +0000 |
| commit | 7909b729bbb1facce975b10da28754eb157723aa (patch) | |
| tree | 1301cfee49fa963d06526b430ff1a7b2a572566e /phpBB/adm/style | |
| parent | 2839f3a964d214b9c2741f047cf69f1f48662462 (diff) | |
| download | forums-7909b729bbb1facce975b10da28754eb157723aa.tar forums-7909b729bbb1facce975b10da28754eb157723aa.tar.gz forums-7909b729bbb1facce975b10da28754eb157723aa.tar.bz2 forums-7909b729bbb1facce975b10da28754eb157723aa.tar.xz forums-7909b729bbb1facce975b10da28754eb157723aa.zip | |
unified the transfer routines from the updater and from acp_language.php. still needs work..
git-svn-id: file:///svn/phpbb/trunk@9751 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/acp_language.html | 48 | ||||
| -rw-r--r-- | phpBB/adm/style/install/update.html | 107 | ||||
| -rw-r--r-- | phpBB/adm/style/update_options.html | 123 |
3 files changed, 129 insertions, 149 deletions
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index 95ac1d5852..6dbfe9e0f6 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -142,12 +142,8 @@ </tr> <!-- ENDIF --> <tr> - <td rowspan="2" class="row3"><strong>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></strong></td> - <td class="row3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" /> <input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td> - </tr> - <tr> - <td class="row3" style="text-align: right;"> - <!-- IF ALLOW_UPLOAD --> {L_UPLOAD_METHOD}: <!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" /> {buttons.VALUE} <!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td> + <td class="row3"><strong>{PRINT_MESSAGE}<!-- IF S_FROM_STORE --><br /><span style="color: red;">{L_FILE_FROM_STORAGE}</span><!-- ENDIF --></strong></td> + <td class="row3" style="text-align: right;"><input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td> </tr> </thead> <tbody> @@ -165,45 +161,9 @@ </table> </form> -<!-- ELSEIF S_UPLOAD --> - - <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - - <h1>{L_UPLOAD_SETTINGS}</h1> +<!-- ELSEIF S_UPDATE_OPTIONS --> - <form id="upload" method="post" action="{U_ACTION}"> - - <!-- IF S_CONNECTION_SUCCESS --> - <div class="successbox"> - <p>{L_CONNECTION_SUCCESS}</p> - </div> - <!-- ELSEIF S_CONNECTION_FAILED --> - <div class="errorbox"> - <p>{L_CONNECTION_FAILED}</p> - </div> - <!-- ENDIF --> - - <fieldset> - <legend>{L_UPLOAD_SETTINGS}</legend> - <dl> - <dt><label>{L_UPLOAD_METHOD}:</label></dt> - <dd><strong>{NAME}</strong></dd> - </dl> - <!-- BEGIN data --> - <dl> - <dt><label for="{data.DATA}">{data.NAME}:</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="quick"> - {HIDDEN} - {S_FORM_TOKEN} - <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> - <input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" /> - </fieldset> - </form> +<!-- INCLUDE update_options.html --> <!-- ELSE --> diff --git a/phpBB/adm/style/install/update.html b/phpBB/adm/style/install/update.html index 3d0ce31ffd..bf60207e46 100644 --- a/phpBB/adm/style/install/update.html +++ b/phpBB/adm/style/install/update.html @@ -55,19 +55,6 @@ </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_CHECK_FILES_AGAIN}" /> - </fieldset> - - </form> - <!-- ENDIF --> <!-- IF S_VERSION_CHECK --> @@ -378,99 +365,9 @@ <!-- 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}:</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"> - <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> +<!-- ELSEIF S_UPDATE_OPTIONS --> - <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}:</label></dt> - <dd><strong>{UPLOAD_METHOD}</strong></dd> - </dl> - <!-- BEGIN data --> - <dl> - <dt><label for="{data.DATA}">{data.NAME}:</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> +<!-- INCLUDE update_options.html --> <!-- ENDIF --> diff --git a/phpBB/adm/style/update_options.html b/phpBB/adm/style/update_options.html new file mode 100644 index 0000000000..e3ef01582c --- /dev/null +++ b/phpBB/adm/style/update_options.html @@ -0,0 +1,123 @@ + +<!-- IF 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}:</label></dt> + <dd>{RADIO_BUTTONS}</dd> + </dl> + </fieldset> + + <fieldset class="submit-buttons"> + {S_HIDDEN_FIELDS}{S_FORM_TOKEN} + <!-- IF S_CHECK_AGAIN --><input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" /> <!-- ENDIF --> + <input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" /> + </fieldset> + + </form> + + <br /><br /> + + <p>{L_MAPPING_FILE_STRUCTURE}</p> + + <table cellspacing="1"> + <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="update_options" 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}:</label></dt> + <dd><strong>{UPLOAD_METHOD}</strong></dd> + </dl> + <!-- BEGIN data --> + <dl> + <dt><label for="{data.DATA}">{data.NAME}:</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}{S_FORM_TOKEN} + <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="update" value="{L_UPDATE_FILES}" /> + </fieldset> + + </form> + +<!-- ELSEIF S_UPLOAD_SUCCESS --> + + <form id="update_options" method="post" action="{U_FINAL_ACTION}"> + + <h1>{L_UPDATE_SUCCESS}</h1> + <p>{L_UPDATE_SUCCESS_EXPLAIN}</p> + + <fieldset class="submit-buttons"> + <input class="button1" type="submit" name="clean_up" value="{L_CONTINUE_UPDATE}" /> + </fieldset> + + </form> + +<!-- ELSEIF S_UPDATE_OPTIONS --> + + <form id="update_options" method="post" action="{U_INITIAL_ACTION}"> + + <p>{L_UPDATE_METHOD_EXPLAIN}</p> + + <fieldset class="submit-buttons"> + {S_HIDDEN_FIELDS}{S_FORM_TOKEN} + <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 -->
\ No newline at end of file |