makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'prototech/ticket/11138' into develop

Browse source 
* 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
This commit is contained in:
Joas Schilling 2013-10-24 14:08:27 +02:00
commit 6a2fef97d5
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/adm/style/acp_main.html
View file

@ -168,21 +168,21 @@
</dl> </dl>
</form> </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> <dl>
<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt> <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> <dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
</dl> </dl>
</form> </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> <dl>
<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt> <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> <dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
</dl> </dl>
</form> </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> <dl>
<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt> <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> <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>

4
phpBB/assets/javascript/core.js
View file

@ -27,12 +27,12 @@ phpbb.loadingAlert = function() {
} else { } else {
loadingAlert.show(); loadingAlert.show();
dark.fadeIn(phpbb.alertTime, function() { 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() { phpbbAlertTimer = setTimeout(function() {
if (loadingAlert.is(':visible')) { if (loadingAlert.is(':visible')) {
phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req')); phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req'));
} }
}, 5000); }, 15000);
}); });
} }

2
phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
View file

@ -20,7 +20,7 @@
<dt>&nbsp;</dt> <dt>&nbsp;</dt>
<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></dd> <dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></dd>
</dl> </dl>
<!-- ENDIF--> <!-- ENDIF -->
</fieldset> </fieldset>
{oauth.HIDDEN_FIELDS} {oauth.HIDDEN_FIELDS}
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}

2
phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html
View file

@ -23,7 +23,7 @@
<tr> <tr>
<td class="row1"><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></td> <td class="row1"><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></td>
</tr> </tr>
<!-- ENDIF--> <!-- ENDIF -->
</table> </table>
{oauth.HIDDEN_FIELDS} {oauth.HIDDEN_FIELDS}
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}