1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-21 00:02:18 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2021-01-18 20:41:08 +01:00
commit 64ee69b519
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
22 changed files with 14 additions and 23 deletions

View File

@ -81,7 +81,7 @@
</div>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="bansubmit" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>
@ -118,7 +118,7 @@
</div>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="button1 button button-form" />
</fieldset>

View File

@ -19,7 +19,6 @@
</div>
<fieldset class="submit-buttons">
<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -42,7 +42,7 @@
</div>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="action[add_feedback]" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -21,7 +21,6 @@
</div>
<fieldset class="submit-buttons">
<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -69,7 +69,6 @@
<!-- EVENT mcp_warn_post_add_warning_field_after -->
<fieldset class="submit-buttons">
<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -53,7 +53,6 @@
<!-- EVENT mcp_warn_user_add_warning_field_after -->
<fieldset class="submit-buttons">
<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -76,7 +76,6 @@
<hr />
<fieldset class="submit-buttons">
<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
<input type="submit" name="submit" value="{L_SEARCH}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -96,7 +96,7 @@
<div class="inner">
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SEARCH}" class="button1 button button-form" />
</fieldset>

View File

@ -39,7 +39,6 @@
</div>
<!-- IF not S_GROUP_MANAGE -->
<fieldset class="submit-buttons">
<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" /> &nbsp;
<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
</fieldset>
<!-- ENDIF -->

View File

@ -74,7 +74,6 @@
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
<input type="submit" name="update" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -16,7 +16,7 @@
</div>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SAVE}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -79,7 +79,7 @@
</div>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -44,7 +44,7 @@
</div>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -89,7 +89,7 @@
</div>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -42,7 +42,7 @@
</div>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -50,7 +50,7 @@
</div>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -42,7 +42,6 @@
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
<input type="reset" name="reset" value="{L_RESET}" class="button1 button button-form-bold" />&nbsp;
<input type="submit" name="preview" value="{L_PREVIEW}" class="button1 button button-form-bold" />&nbsp;
<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}

View File

@ -105,7 +105,6 @@
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
<input type="submit" tabindex="9" name="submit" id="submit" value="{L_SUBMIT}" class="button1 button button-form default-submit-action" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -20,7 +20,7 @@
</dl>
<dl>
<dt>&nbsp;</dt>
<dd>{S_HIDDEN_FIELDS}{S_FORM_TOKEN}<input type="submit" name="submit" id="submit" class="button1 button button-form" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" /></dd>
<dd>{S_HIDDEN_FIELDS}{S_FORM_TOKEN}<input type="submit" name="submit" id="submit" class="button1 button button-form" value="{L_SUBMIT}" tabindex="2" /></dd>
</dl>
</fieldset>
</div>

View File

@ -36,7 +36,7 @@
{% endif %}
<dl>
<dt>&nbsp;</dt>
<dd>{{ S_HIDDEN_FIELDS }}<input type="submit" name="submit" id="submit" class="button1" value="{{ lang('SUBMIT') }}" tabindex="2" />&nbsp; <input type="reset" value="{{ lang('RESET') }}" name="reset" class="button2" /></dd>
<dd>{{ S_HIDDEN_FIELDS }}<input type="submit" name="submit" id="submit" class="button1" value="{{ lang('SUBMIT') }}" tabindex="2" /></dd>
</dl>
{{ S_FORM_TOKEN }}
</fieldset>

View File

@ -32,7 +32,7 @@
</div>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>

View File

@ -34,7 +34,7 @@
</div>
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
{S_HIDDEN_FIELDS}
<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
{S_FORM_TOKEN}
</fieldset>