Skip to content

Commit bbbf5cf

Browse files
committed
Update phpBB to 3.2.11
Update styles to 3.2.11 - basic 3.2.11 - elegance 3.2.11
1 parent 781d0b4 commit bbbf5cf

File tree

377 files changed

+10642
-2174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

377 files changed

+10642
-2174
lines changed

adm/style/acp_attachments.html

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,21 @@ <h2>{L_UPLOADING_FILES}</h2>
5050
<dl>
5151
<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
5252
<dd>{options.CONTENT}</dd>
53+
{% if (options.KEY == 'allow_attachments' and S_EMPTY_POST_GROUPS) or (options.KEY == 'allow_pm_attach' and S_EMPTY_PM_GROUPS) %}
54+
<dd><span class="error">{{ lang(options.KEY == 'allow_attachments' ? 'NO_EXT_GROUP_ALLOWED_POST' : 'NO_EXT_GROUP_ALLOWED_PM', U_EXTENSION_GROUPS) }}</span></dd>
55+
{% endif %}
5356
</dl>
5457

5558
<!-- ENDIF -->
5659
<!-- END options -->
5760
</fieldset>
5861

59-
<fieldset class="submit-buttons">
60-
<legend>{L_SUBMIT}</legend>
61-
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
62-
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
62+
<fieldset>
63+
<legend>{{ lang('ACP_SUBMIT_CHANGES') }}</legend>
64+
<p class="submit-buttons">
65+
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
66+
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
67+
</p>
6368
</fieldset>
6469

6570
<!-- IF not S_SECURE_DOWNLOADS -->
@@ -110,7 +115,7 @@ <h2>{L_UPLOADING_FILES}</h2>
110115
<!-- ELSEIF S_EXTENSION_GROUPS -->
111116

112117
<!-- IF S_EDIT_GROUP -->
113-
<script type="text/javascript" defer="defer">
118+
<script>
114119
// <![CDATA[
115120
function update_image(newimage)
116121
{
@@ -204,10 +209,13 @@ <h2>{L_UPLOADING_FILES}</h2>
204209
<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
205210
</dl>
206211

207-
<p class="submit-buttons">
208-
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
209-
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
210-
</p>
212+
</fieldset>
213+
<fieldset>
214+
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
215+
<p class="submit-buttons">
216+
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
217+
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
218+
</p>
211219
{S_FORM_TOKEN}
212220
</fieldset>
213221

@@ -308,10 +316,14 @@ <h2>{L_UPLOADING_FILES}</h2>
308316
</tbody>
309317
</table>
310318

311-
<p class="submit-buttons">
312-
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
313-
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
314-
</p>
319+
</fieldset>
320+
<fieldset>
321+
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
322+
<p class="submit-buttons">
323+
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
324+
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
325+
</p>
326+
315327
{S_FORM_TOKEN}
316328
</fieldset>
317329
</form>
@@ -382,10 +394,13 @@ <h2>{L_UPLOADING_FILES}</h2>
382394
<!-- ENDIF -->
383395

384396
<!-- IF .orphan -->
385-
<p class="submit-buttons">
386-
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
387-
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
388-
</p>
397+
</fieldset>
398+
<fieldset>
399+
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
400+
<p class="submit-buttons">
401+
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
402+
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
403+
</p>
389404
<!-- ENDIF -->
390405

391406
{S_FORM_TOKEN}

adm/style/acp_ban.html

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h1>{L_TITLE}</h1>
88

99
<p>{L_EXPLAIN}</p>
1010

11-
<script type="text/javascript">
11+
<script>
1212
// <![CDATA[
1313

1414
var ban_length = new Array();
@@ -73,12 +73,14 @@ <h1>{L_TITLE}</h1>
7373
<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
7474
<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
7575
</dl>
76-
77-
<p class="submit-buttons">
78-
<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
79-
<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
80-
</p>
81-
{S_FORM_TOKEN}
76+
</fieldset>
77+
<fieldset>
78+
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
79+
<p class="submit-buttons">
80+
<input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />&nbsp;
81+
<input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
82+
</p>
83+
{S_FORM_TOKEN}
8284
</fieldset>
8385
</form>
8486

adm/style/acp_contact.html

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- INCLUDE overall_header.html -->
22

3-
<script type="text/javascript">
3+
<script>
44
// <![CDATA[
55

66
var form_name = 'acp_contact';
@@ -66,9 +66,12 @@ <h1>{L_ACP_CONTACT_SETTINGS}</h1>
6666
</dl>
6767
</fieldset>
6868

69-
<fieldset class="submit-buttons">
70-
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
71-
<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
69+
<fieldset>
70+
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
71+
<p class="submit-buttons">
72+
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
73+
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
74+
</p>
7275
{S_FORM_TOKEN}
7376
</fieldset>
7477
</form>

adm/style/acp_database.html

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h1>{L_ACP_BACKUP}</h1>
3535

3636
<p>{L_ACP_BACKUP_EXPLAIN}</p>
3737

38-
<script type="text/javascript">
38+
<script>
3939
// <![CDATA[
4040

4141
function selector(bool)
@@ -67,12 +67,6 @@ <h1>{L_ACP_BACKUP}</h1>
6767
<label><input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" /> {methods.TYPE}</label>
6868
<!-- END methods --></dd>
6969
</dl>
70-
<dl>
71-
<dt><label for="where">{L_ACTION}{L_COLON}</label></dt>
72-
<dd>
73-
<label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label>
74-
</dd>
75-
</dl>
7670
<dl>
7771
<dt><label for="table">{L_TABLE_SELECT}{L_COLON}</label></dt>
7872
<dd><select id="table" name="table[]" size="10" multiple="multiple">
@@ -82,12 +76,15 @@ <h1>{L_ACP_BACKUP}</h1>
8276
</select></dd>
8377
<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
8478
</dl>
79+
</fieldset>
8580

86-
<p class="submit-buttons">
87-
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
88-
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
89-
</p>
90-
{S_FORM_TOKEN}
81+
<fieldset>
82+
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
83+
<p class="submit-buttons">
84+
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
85+
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
86+
</p>
87+
{S_FORM_TOKEN}
9188
</fieldset>
9289
</form>
9390

adm/style/acp_forums.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<!-- IF S_EDIT_FORUM -->
66

7-
<script type="text/javascript">
7+
<script>
88
// <![CDATA[
99
/**
1010
* Handle displaying/hiding several options based on the forum type
@@ -405,7 +405,7 @@ <h3>{L_WARNING}</h3>
405405

406406
<!-- ELSEIF S_CONTINUE_SYNC -->
407407

408-
<script type="text/javascript">
408+
<script>
409409
// <![CDATA[
410410
var close_waitscreen = 0;
411411
// no scrollbars...
@@ -421,7 +421,7 @@ <h1>{L_FORUM_ADMIN}</h1>
421421

422422
<!-- ELSE -->
423423

424-
<script type="text/javascript">
424+
<script>
425425
// <![CDATA[
426426
/**
427427
* Popup search progress bar
@@ -447,7 +447,7 @@ <h3>{L_WARNING}</h3>
447447
<!-- ENDIF -->
448448

449449
<!-- IF S_RESYNCED -->
450-
<script type="text/javascript">
450+
<script>
451451
// <![CDATA[
452452
var close_waitscreen = 1;
453453
// ]]>

adm/style/acp_groups.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ <h3>{L_WARNING}</h3>
3636
<dl>
3737
<dt><label for="group_type">{L_GROUP_TYPE}{L_COLON}</label><br /><span>{L_GROUP_TYPE_EXPLAIN}</span></dt>
3838
<dd>
39+
{% EVENT acp_group_types_prepend %}
3940
<label><input name="group_type" type="radio" class="radio" id="group_type" value="{GROUP_TYPE_FREE}"{GROUP_FREE} /> {L_GROUP_OPEN}</label>
4041
<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_OPEN}"{GROUP_OPEN} /> {L_GROUP_REQUEST}</label>
4142
<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_CLOSED}"{GROUP_CLOSED} /> {L_GROUP_CLOSED}</label>
4243
<label><input name="group_type" type="radio" class="radio" value="{GROUP_TYPE_HIDDEN}"{GROUP_HIDDEN} /> {L_GROUP_HIDDEN}</label>
44+
{% EVENT acp_group_types_append %}
4345
</dd>
4446
</dl>
4547
<!-- ELSE -->

adm/style/acp_groups_position.html

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ <h1>{L_MANAGE_LEGEND}</h1>
1515
<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
1616
</dd>
1717
</dl>
18-
19-
<p class="submit-buttons">
20-
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
21-
<input class="button2" type="reset" name="reset" value="{L_RESET}" />
22-
<input type="hidden" name="action" value="set_config_legend" />
23-
{S_FORM_TOKEN}
24-
</p>
18+
</fieldset>
19+
<fieldset>
20+
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
21+
<p class="submit-buttons">
22+
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
23+
<input class="button2" type="reset" name="reset" value="{L_RESET}" />
24+
<input type="hidden" name="action" value="set_config_legend" />
25+
{S_FORM_TOKEN}
26+
</p>
2527
</fieldset>
2628
</form>
2729

adm/style/acp_help_phpbb.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ <h2><i class="icon fa-bar-chart"></i>{L_SEND_STATISTICS}</h2>
4040
</div>
4141
<!-- EVENT acp_help_phpbb_stats_after -->
4242
<fieldset>
43+
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
4344
<p class="submit-buttons">
4445
<input type="hidden" name="systemdata" value="{RAW_DATA}" />
4546
<input type="hidden" name="help_send_statistics_time" value="{COLLECT_STATS_TIME}" />
@@ -51,6 +52,7 @@ <h2><i class="icon fa-bar-chart"></i>{L_SEND_STATISTICS}</h2>
5152
</form>
5253
<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
5354
<fieldset>
55+
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
5456
<p class="submit-buttons">
5557
<input type="hidden" name="systemdata" value="{RAW_DATA}" />
5658
<input class="button1" type="submit" id="submit_stats" name="submit" value="{L_SEND_STATISTICS}" />

adm/style/acp_icons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<!-- IF S_EDIT -->
66

7-
<script type="text/javascript" defer="defer">
7+
<script>
88
// <![CDATA[
99
<!-- IF S_ADD_CODE -->
1010

adm/style/acp_jabber.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,12 @@ <h3>{L_WARNING}</h3>
7070

7171
</fieldset>
7272

73-
<fieldset class="submit-buttons">
74-
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
75-
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
73+
<fieldset>
74+
<legend>{L_ACP_SUBMIT_CHANGES}</legend>
75+
<p class="submit-buttons">
76+
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
77+
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
78+
</p>
7679
{S_FORM_TOKEN}
7780
</fieldset>
7881
</form>

0 commit comments

Comments
 (0)