diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-10-24 14:08:27 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-10-24 14:08:27 +0200 |
| commit | 6a2fef97d5f55bad92898b34db9810afe1dd106d (patch) | |
| tree | a7e64fa1c7a9ef626fe4c6c6fa0fb50e7f88bf9a /phpBB | |
| parent | d612041cd19d5bea7d08f80a2d952123699aa30e (diff) | |
| parent | 963dbed106bf4662fe5317baf1c56e901a3d7ba6 (diff) | |
| download | forums-6a2fef97d5f55bad92898b34db9810afe1dd106d.tar forums-6a2fef97d5f55bad92898b34db9810afe1dd106d.tar.gz forums-6a2fef97d5f55bad92898b34db9810afe1dd106d.tar.bz2 forums-6a2fef97d5f55bad92898b34db9810afe1dd106d.tar.xz forums-6a2fef97d5f55bad92898b34db9810afe1dd106d.zip | |
Merge remote-tracking branch 'prototech/ticket/11138' into develop
* prototech/ticket/11138:
[ticket/11138] Do not use AJAX for ACP resync features.
[ticket/11138] Increase AJAX timeout period to 15 seconds.
[ticket/11872] Template syntax typos in oauth templates
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_main.html | 6 | ||||
| -rw-r--r-- | phpBB/assets/javascript/core.js | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_auth_link_oauth.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index b644862ce1..d9e7fb7eeb 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -168,21 +168,21 @@ </dl> </form> - <form id="action_stats_form" method="post" action="{U_ACTION}" data-ajax="true"> + <form id="action_stats_form" method="post" action="{U_ACTION}"> <dl> <dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt> <dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd> </dl> </form> - <form id="action_user_form" method="post" action="{U_ACTION}" data-ajax="true"> + <form id="action_user_form" method="post" action="{U_ACTION}"> <dl> <dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt> <dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd> </dl> </form> - <form id="action_db_track_form" method="post" action="{U_ACTION}" data-ajax="true"> + <form id="action_db_track_form" method="post" action="{U_ACTION}"> <dl> <dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt> <dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd> diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index ab0891e70c..7bd3b85d7d 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -27,12 +27,12 @@ phpbb.loadingAlert = function() { } else { loadingAlert.show(); dark.fadeIn(phpbb.alertTime, function() { - // Wait five seconds and display an error if nothing has been returned by then. + // Wait fifteen seconds and display an error if nothing has been returned by then. phpbbAlertTimer = setTimeout(function() { if (loadingAlert.is(':visible')) { phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req')); } - }, 5000); + }, 15000); }); } diff --git a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html index a3e27328cd..18316613b0 100644 --- a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html +++ b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html @@ -20,7 +20,7 @@ <dt> </dt> <dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></dd> </dl> - <!-- ENDIF--> + <!-- ENDIF --> </fieldset> {oauth.HIDDEN_FIELDS} {S_HIDDEN_FIELDS} diff --git a/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html b/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html index 56a4c89125..80564d207b 100644 --- a/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html +++ b/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html @@ -23,7 +23,7 @@ <tr> <td class="row1"><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></td> </tr> - <!-- ENDIF--> + <!-- ENDIF --> </table> {oauth.HIDDEN_FIELDS} {S_HIDDEN_FIELDS} |