mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source
This commit is contained in:
mrgoldy 2020-05-07 23:21:51 +02:00
commit 919597bfcf
11 changed files with 99 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
phpBB/adm/style/acp_attachments.html
View File

@ -59,10 +59,12 @@
<!-- END options --> <!-- END options -->
</fieldset> </fieldset>
<fieldset class="submit-buttons"> <fieldset>
<legend>{L_SUBMIT}</legend> <legend>{{ lang('ACP_SUBMIT_CHANGES') }}</legend>
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp; <p class="submit-buttons">
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
</p>
</fieldset> </fieldset>
<!-- IF not S_SECURE_DOWNLOADS --> <!-- IF not S_SECURE_DOWNLOADS -->
@ -207,10 +209,13 @@
<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd> <dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
</dl> </dl>
<p class="submit-buttons"> </fieldset>
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp; <fieldset>
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> <legend>{L_ACP_SUBMIT_CHANGES}</legend>
</p> <p class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
</p>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>
@ -311,10 +316,14 @@
</tbody> </tbody>
</table> </table>
<p class="submit-buttons"> </fieldset>
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp; <fieldset>
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> <legend>{L_ACP_SUBMIT_CHANGES}</legend>
</p> <p class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
</p>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>
</form> </form>
@ -385,10 +394,13 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF .orphan --> <!-- IF .orphan -->
<p class="submit-buttons"> </fieldset>
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp; <fieldset>
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> <legend>{L_ACP_SUBMIT_CHANGES}</legend>
</p> <p class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
</p>
<!-- ENDIF --> <!-- ENDIF -->
{S_FORM_TOKEN} {S_FORM_TOKEN}

14
phpBB/adm/style/acp_ban.html
View File

@ -73,12 +73,14 @@
<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt> <dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd> <dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
</dl> </dl>
</fieldset>
<p class="submit-buttons"> <fieldset>
<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp; <legend>{L_ACP_SUBMIT_CHANGES}</legend>
<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" /> <p class="submit-buttons">
</p> <input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
{S_FORM_TOKEN} <input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
</p>
{S_FORM_TOKEN}
</fieldset> </fieldset>
</form> </form>

9
phpBB/adm/style/acp_contact.html
View File

@ -66,9 +66,12 @@
</dl> </dl>
</fieldset> </fieldset>
<fieldset class="submit-buttons"> <fieldset>
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp; <legend>{L_ACP_SUBMIT_CHANGES}</legend>
<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" /> <p class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
</p>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>
</form> </form>

13
phpBB/adm/style/acp_database.html
View File

@ -76,12 +76,15 @@
</select></dd> </select></dd>
<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd> <dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
</dl> </dl>
</fieldset>
<p class="submit-buttons"> <fieldset>
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp; <legend>{L_ACP_SUBMIT_CHANGES}</legend>
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> <p class="submit-buttons">
</p> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
{S_FORM_TOKEN} <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
</p>
{S_FORM_TOKEN}
</fieldset> </fieldset>
</form> </form>

16
phpBB/adm/style/acp_groups_position.html
View File

@ -15,13 +15,15 @@
<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label> <label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
</dd> </dd>
</dl> </dl>
</fieldset>
<p class="submit-buttons"> <fieldset>
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp; <legend>{L_ACP_SUBMIT_CHANGES}</legend>
<input class="button2" type="reset" name="reset" value="{L_RESET}" /> <p class="submit-buttons">
<input type="hidden" name="action" value="set_config_legend" /> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
{S_FORM_TOKEN} <input class="button2" type="reset" name="reset" value="{L_RESET}" />
</p> <input type="hidden" name="action" value="set_config_legend" />
{S_FORM_TOKEN}
</p>
</fieldset> </fieldset>
</form> </form>

2
phpBB/adm/style/acp_help_phpbb.html
View File

@ -43,6 +43,7 @@
</script> </script>
<!-- EVENT acp_help_phpbb_stats_after --> <!-- EVENT acp_help_phpbb_stats_after -->
<fieldset> <fieldset>
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
<p class="submit-buttons"> <p class="submit-buttons">
<input type="hidden" name="help_send_statistics_time" value="{COLLECT_STATS_TIME}" /> <input type="hidden" name="help_send_statistics_time" value="{COLLECT_STATS_TIME}" />
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
@ -53,6 +54,7 @@
</form> </form>
<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form"> <form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
<fieldset> <fieldset>
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
<p class="submit-buttons"> <p class="submit-buttons">
{% for providers in providers %} {% for providers in providers %}
{% for values in providers.values %} {% for values in providers.values %}

9
phpBB/adm/style/acp_jabber.html
View File

@ -70,9 +70,12 @@
</fieldset> </fieldset>
<fieldset class="submit-buttons"> <fieldset>
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp; <legend>{L_ACP_SUBMIT_CHANGES}</legend>
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> <p class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
</p>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>
</form> </form>

9
phpBB/adm/style/acp_permissions.html
View File

@ -340,9 +340,12 @@
<br class="responsive-hide" /><br class="responsive-hide" /> <br class="responsive-hide" /><br class="responsive-hide" />
<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
<input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" /> <legend>{L_ACP_SUBMIT_CHANGES}</legend>
<input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" /> <p class="submit-buttons">
{S_FORM_TOKEN} <input class="button1" type="submit" id="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />&nbsp;
<input class="button2" type="button" id="reset" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
{S_FORM_TOKEN}
</p>
</fieldset> </fieldset>
<br class="responsive-hide" /><br class="responsive-hide" /> <br class="responsive-hide" /><br class="responsive-hide" />

20
phpBB/adm/style/acp_prune_users.html
View File

@ -66,15 +66,19 @@
<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label> <dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>
<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd> <label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>
</dl> </dl>
<p class="submit-buttons">
<input type="hidden" name="prune" value="1" />
<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
{S_FORM_TOKEN}
</p>
</fieldset> </fieldset>
<fieldset>
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
<p class="submit-buttons">
<input type="hidden" name="prune" value="1" />
<input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
{S_FORM_TOKEN}
</p>
</fieldset>
</form> </form>
<!-- INCLUDE overall_footer.html --> <!-- INCLUDE overall_footer.html -->

20
phpBB/adm/style/acp_search.html
View File

@ -59,10 +59,12 @@
<!-- END backend --> <!-- END backend -->
<fieldset class="submit-buttons"> <fieldset>
<legend>{L_SUBMIT}</legend> <legend>{L_ACP_SUBMIT_CHANGES}</legend>
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp; <p class="submit-buttons">
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
</p>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>
</form> </form>
@ -89,10 +91,12 @@
<p>{L_CONTINUE_EXPLAIN}</p> <p>{L_CONTINUE_EXPLAIN}</p>
<form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}"> <form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}">
<fieldset class="submit-buttons"> <fieldset>
<legend>{L_SUBMIT}</legend> <legend>{L_ACP_SUBMIT_CHANGES}</legend>
<input class="button1" type="submit" id="continue" name="continue" value="{L_CONTINUE}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');" />&nbsp; <p class="submit-buttons">
<input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" /> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
</p>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>
</form> </form>

6
phpBB/includes/acp/acp_board.php
View File

@ -134,12 +134,10 @@ class acp_board
'title' => 'ACP_AVATAR_SETTINGS', 'title' => 'ACP_AVATAR_SETTINGS',
'vars' => array( 'vars' => array(
'legend1' => 'ACP_AVATAR_SETTINGS', 'legend1' => 'ACP_AVATAR_SETTINGS',
'avatar_min_width' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false), 'avatar_min_width' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false),
'avatar_min_height' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false), 'avatar_min_height' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false),
'avatar_max_width' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false), 'avatar_max_width' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false),
'avatar_max_height' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false), 'avatar_max_height' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false),
'allow_avatar' => array('lang' => 'ALLOW_AVATARS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'allow_avatar' => array('lang' => 'ALLOW_AVATARS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'avatar_min' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int:0', 'type' => 'dimension:0', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), 'avatar_min' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int:0', 'type' => 'dimension:0', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
'avatar_max' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => 'dimension:0', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), 'avatar_max' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => 'dimension:0', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
@ -151,9 +149,7 @@ class acp_board
$display_vars['vars'] += $avatar_vars; $display_vars['vars'] += $avatar_vars;
} }
$display_vars['vars'] += [ $display_vars['vars']['legend2'] = 'ACP_SUBMIT_CHANGES';
'legend2' => 'ACP_SUBMIT_CHANGES'
];
break; break;
case 'message': case 'message':