Merge remote-tracking branch 'upstream/prep-release-3.1.11'

author: Maat <maat-pub@mageia.biz> 2020-05-08 18:29:30 +0200
committer: Maat <maat-pub@mageia.biz> 2020-05-08 21:36:04 +0200
commit: 36bc1870f21fac04736a1049c1d5b8e127d729f4 (patch)
tree: 9d102331eeaf1ef3cd23e656320d7c08e65757ed /phpBB/styles/subsilver2/template/posting_body.html
parent: 8875d385d0579b451dac4d9bda465172b4f69ee0 (diff)
parent: 149375253685b3a38996f63015a74b7a0f53aa14 (diff)
download: forums-36bc1870f21fac04736a1049c1d5b8e127d729f4.tar
forums-36bc1870f21fac04736a1049c1d5b8e127d729f4.tar.gz
forums-36bc1870f21fac04736a1049c1d5b8e127d729f4.tar.bz2
forums-36bc1870f21fac04736a1049c1d5b8e127d729f4.tar.xz
forums-36bc1870f21fac04736a1049c1d5b8e127d729f4.zip
1 files changed, 59 insertions, 39 deletions
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 8e9934c173..95f817e838 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -5,7 +5,7 @@
 <!-- ENDIF -->
 
 <!-- IF S_FORUM_RULES -->
-	<div class="forumrules">
+	<div class="forumrules<!-- IF U_FORUM_RULES --> rules-link<!-- ENDIF -->">
 		<!-- IF U_FORUM_RULES -->
 			<h3>{L_FORUM_RULES}</h3><br />
 			<a href="{U_FORUM_RULES}"><b>{L_FORUM_RULES_LINK}</b></a>
@@ -20,13 +20,13 @@
 
 <!-- IF not S_PRIVMSGS -->
 	<div id="pageheader">
-		<h2><!-- IF TOPIC_TITLE --><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- ENDIF --></h2>
+		<h2><!-- IF TOPIC_TITLE --><!-- EVENT posting_topic_title_before --><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a><!-- EVENT posting_topic_title_after --><!-- ELSE --><a class="titles" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><!-- ENDIF --></h2>
 
 		<!-- IF MODERATORS -->
-			<p class="moderators">{L_MODERATORS}: {MODERATORS}</p>
+			<p class="moderators">{L_MODERATORS}{L_COLON} {MODERATORS}</p>
 		<!-- ENDIF -->
-		<!-- IF U_MCP -->
-			<p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p>
+		<!-- IF U_MCP or U_ACP -->
+			<p class="linkmcp">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p>
 		<!-- ENDIF -->
 	</div>
 
@@ -69,8 +69,8 @@
 
 		<td class="postdetails" style="padding: 4px;">{draftrow.DATE}</td>
 		<td style="padding: 4px;"><b class="gen">{draftrow.DRAFT_SUBJECT}</b>
-			<!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span>
-			<!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}: <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span>
+			<!-- IF draftrow.S_LINK_TOPIC --><br /><span class="gensmall">{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span>
+			<!-- ELSEIF draftrow.S_LINK_FORUM --><br /><span class="gensmall">{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a></span>
 			<!-- ELSEIF draftrow.S_LINK_PM --><br /><span class="gensmall">{L_PRIVATE_MESSAGE}</span>
 			<!-- ELSE --><br /><span class="gensmall">{L_NO_TOPIC_FORUM}</span><!-- ENDIF -->
 		</td>
@@ -114,20 +114,13 @@
 	</tr>
 <!-- ENDIF -->
 
-<!-- IF S_DELETE_ALLOWED -->
-	<tr>
-		<td class="row1"><b class="genmed">{L_DELETE_POST}:</b></td>
-		<td class="row2"><input type="checkbox" class="radio" name="delete" /> <span class="gensmall">[ {L_DELETE_POST_WARN} ]</span></td>
-	</tr>
-<!-- ENDIF -->
-
 <!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS -->
 	<tr>
-		<td class="row1"><b class="genmed">{L_ICON}:</b></td>
+		<td class="row1"><b class="genmed">{L_ICON}{L_COLON}</b></td>
 		<td class="row2">
 			<table width="100%" cellspacing="0" cellpadding="0" border="0">
 			<tr>
-				<td><input type="radio" class="radio" name="icon" value="0"{S_NO_ICON_CHECKED} tabindex="1" /><span class="genmed"><!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></span> <!-- BEGIN topic_icon --><span style="white-space: nowrap;"><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /></span> <!-- END topic_icon --></td>
+				<td><input type="radio" class="radio" name="icon" value="0"{S_NO_ICON_CHECKED} tabindex="1" /><span class="genmed"><!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></span> <!-- BEGIN topic_icon --><span style="white-space: nowrap;"><input type="radio" class="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="{topic_icon.ICON_NAME}" title="" hspace="2" vspace="2" /></span> <!-- END topic_icon --></td>
 			</tr>
 			</table>
 		</td>
@@ -136,14 +129,14 @@
 
 <!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME -->
 	<tr>
-		<td class="row1"><b class="genmed">{L_USERNAME}:</b></td>
+		<td class="row1"><b class="genmed">{L_USERNAME}{L_COLON}</b></td>
 		<td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" value="{USERNAME}" /></td>
 	</tr>
 <!-- ENDIF -->
 
 <!-- IF S_PRIVMSGS -->
 	<tr>
-		<td class="row1"><b class="genmed">{L_TO}:</b></td>
+		<td class="row1"><b class="genmed">{L_TO}{L_COLON}</b></td>
 		<td class="row2">
 			{S_HIDDEN_ADDRESS_FIELD}
 		<!-- BEGIN to_recipient -->
@@ -157,7 +150,7 @@
 	</tr>
 	<!-- IF S_ALLOW_MASS_PM -->
 	<tr>
-		<td class="row1"><b class="genmed">{L_BCC}:</b></td>
+		<td class="row1"><b class="genmed">{L_BCC}{L_COLON}</b></td>
 		<td class="row2">
 		<!-- BEGIN bcc_recipient -->
 			<span class="genmed nowrap"><strong>
@@ -170,13 +163,19 @@
 	</tr>
 	<!-- ENDIF -->
 <!-- ENDIF -->
-
+<!-- EVENT posting_editor_subject_before -->
 <tr>
-	<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td>
-	<td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}" /></td>
+	<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}{L_COLON}</b></td>
+	<td class="row2" width="78%">
+		<!-- EVENT posting_editor_subject_prepend -->
+		<input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}" />
+		<!-- EVENT posting_editor_subject_append -->
+	</td>
 </tr>
+<!-- EVENT posting_editor_subject_after -->
 <tr>
-	<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}:</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}&nbsp;</span><br /><br />
+	<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}{L_COLON}</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}&nbsp;</span><br /><br />
+	<!-- EVENT posting_editor_smilies_before -->
 	<!-- IF S_SMILIES_ALLOWED -->
 		<table width="100%" cellspacing="5" cellpadding="0" border="0" align="center">
 		<tr>
@@ -198,6 +197,7 @@
 
 		</table>
 	<!-- ENDIF -->
+	<!-- EVENT posting_editor_smilies_after -->
 	</td>
 	<td class="row2" valign="top">
 		<script type="text/javascript">
@@ -209,32 +209,29 @@
 
 		<table width="100%" cellspacing="0" cellpadding="0" border="0">
 		<!-- INCLUDE posting_buttons.html -->
+		<!-- EVENT posting_editor_message_before -->
 		<tr>
 			<td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" style="width: 700px; height: 270px; min-width: 98%; max-width: 98%;">{MESSAGE}</textarea></td>
 			<!-- IF S_BBCODE_ALLOWED -->
-			<td width="80" align="center" valign="top">
-				<script type="text/javascript">
-				// <![CDATA[
-					colorPalette('v', 7, 6)
-				// ]]>
-				</script>
+			<td width="80" align="center" valign="top" id="color_palette_placeholder" data-orientation="v" data-width="11" data-height="10" data-bbcode="true">
 			</td>
 			<!-- ENDIF -->
 	 	</tr>
+	 	<!-- EVENT posting_editor_message_after -->
 		</table>
 	</td>
 </tr>
 
 <!-- IF S_INLINE_ATTACHMENT_OPTIONS -->
 	<tr>
-		<td class="row1"><b class="genmed">{L_ATTACHMENTS}:</b></td>
-		<td class="row2"><select name="attachments">{S_INLINE_ATTACHMENT_OPTIONS}</select>&nbsp;<input type="button" class="btnbbcode" accesskey="a" value="{L_PLACE_INLINE}" name="attachinline" onclick="attach_form = document.forms[form_name].elements['attachments']; attach_inline(attach_form.value, attach_form.options[attach_form.selectedIndex].text);" onmouseover="helpline('a')" onmouseout="helpline('tip')" />
+		<td class="row1"><b class="genmed">{L_ATTACHMENTS}{L_COLON}</b></td>
+		<td class="row2"><select name="attachments">{S_INLINE_ATTACHMENT_OPTIONS}</select>&nbsp;<input type="button" class="btnbbcode" accesskey="a" value="{L_PLACE_INLINE}" name="attachinline" onclick="attach_form = document.forms[form_name].elements['attachments']; attachInline(attach_form.value, attach_form.options[attach_form.selectedIndex].text);" onmouseover="helpline('a')" onmouseout="helpline('tip')" />
 		</td>
 	</tr>
 <!-- ENDIF -->
 
 <tr>
-	<td class="row1" valign="top"><b class="genmed">{L_OPTIONS}:</b><br />
+	<td class="row1" valign="top"><b class="genmed">{L_OPTIONS}{L_COLON}</b><br />
 		<table cellspacing="2" cellpadding="0" border="0">
 		<tr>
 			<td class="gensmall">{BBCODE_STATUS}</td>
@@ -255,8 +252,10 @@
 		</tr>
 		</table>
 	</td>
+	<!-- EVENT posting_editor_bbcode_status_after -->
 	<td class="row2">
 		<table cellpadding="1">
+		<!-- EVENT posting_editor_options_prepend -->
 		<!-- IF S_BBCODE_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
@@ -309,8 +308,8 @@
 
 			<!-- IF S_TYPE_TOGGLE -->
 				<tr>
-					<td>&nbsp;</td>
-					<td class="gen"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->: <!-- BEGIN topic_type --><input type="radio" class="radio" name="topic_type" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE}&nbsp;&nbsp;<!-- END topic_type --></td>
+					<td></td>
+					<td class="gen"><!-- IF S_EDIT_POST -->{L_CHANGE_TOPIC_TO}<!-- ELSE -->{L_POST_TOPIC_AS}<!-- ENDIF -->{L_COLON} <!-- BEGIN topic_type --><input type="radio" class="radio" name="topic_type" value="{topic_type.VALUE}"{topic_type.S_CHECKED} />{topic_type.L_TOPIC_TYPE}&nbsp;&nbsp;<!-- END topic_type --></td>
 				</tr>
 			<!-- ENDIF -->
 		<!-- ENDIF -->
@@ -318,16 +317,36 @@
 	</td>
 </tr>
 
+<!-- IF S_SOFTDELETE_ALLOWED or S_DELETE_ALLOWED -->
+	<tr>
+		<td class="row1" valign="top"><b class="genmed">{L_DELETE_POST}{L_COLON}</b></td>
+		<td class="row2">
+			<table cellpadding="1">
+				<tr>
+					<td><input type="checkbox" class="radio" name="delete" /></td>
+					<td class="gen">{L_DELETE_POST_WARN}</td>
+				</tr>
+				<!-- IF S_SOFTDELETE_ALLOWED and S_DELETE_ALLOWED -->
+					<tr>
+						<td><input type="checkbox" class="radio" name="delete_permanent" /></td>
+						<td class="gen">{L_DELETE_POST_PERMANENTLY}</td>
+					</tr>
+				<!-- ENDIF -->
+			</table>
+		</td>
+	</tr>
+<!-- ENDIF -->
+
 <!-- IF S_TOPIC_TYPE_ANNOUNCE or S_TOPIC_TYPE_STICKY -->
 	<tr>
-		<td class="row1"><b class="genmed">{L_STICK_TOPIC_FOR}:</b><br /><span class="gensmall">{L_STICKY_ANNOUNCE_TIME_LIMIT}</span></td>
-		<td class="row2"><input class="post" type="text" name="topic_time_limit" size="3" maxlength="3" value="{TOPIC_TIME_LIMIT}" />&nbsp;<b class="gen">{L_DAYS}</b> <span class="gensmall">{L_STICK_TOPIC_FOR_EXPLAIN}</span></td>
+		<td class="row1"><b class="genmed">{L_STICK_TOPIC_FOR}{L_COLON}</b><br /><span class="gensmall">{L_STICKY_ANNOUNCE_TIME_LIMIT}</span></td>
+		<td class="row2"><input class="post" type="number" min="0" max="999" name="topic_time_limit" value="{TOPIC_TIME_LIMIT}" />&nbsp;<b class="gen">{L_DAYS}</b> <span class="gensmall">{L_STICK_TOPIC_FOR_EXPLAIN}</span></td>
 	</tr>
 <!-- ENDIF -->
 
 <!-- IF S_EDIT_REASON -->
 	<tr>
-		<td class="row1" valign="top"><b class="genmed">{L_EDIT_REASON}:</b></td>
+		<td class="row1" valign="top"><b class="genmed">{L_EDIT_REASON}{L_COLON}</b></td>
 		<td class="row2"><input class="post" type="text" name="edit_reason" size="50" value="{EDIT_REASON}" /></td>
 	</tr>
 <!-- ENDIF -->
@@ -355,7 +374,7 @@
 		<!-- INCLUDE posting_poll_body.html -->
 	<!-- ELSEIF S_POLL_DELETE -->
 		<tr>
-			<td class="row1"><span class="genmed"><b>{L_POLL_DELETE}:</b></span></td>
+			<td class="row1"><span class="genmed"><b>{L_POLL_DELETE}{L_COLON}</b></span></td>
 			<td class="row2"><input type="checkbox" class="radio" name="poll_delete" /></td>
 		</tr>
 	<!-- ENDIF -->
@@ -365,6 +384,7 @@
 	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}
 		<input class="btnlite" type="submit" tabindex="10" name="preview" value="{L_PREVIEW}" />
 		&nbsp; <input class="btnmain" type="submit" accesskey="s" tabindex="11" name="post" value="{L_SUBMIT}" />
+		<!-- EVENT posting_editor_submit_buttons -->
 		<!-- IF not S_SHOW_ATTACH_BOX and not S_SHOW_POLL_BOX -->
 			<!-- IF S_SAVE_ALLOWED -->&nbsp; <input class="btnlite" type="submit" accesskey="k" tabindex="12" name="save" value="{L_SAVE_DRAFT}" /><!-- ENDIF -->
 			<!-- IF S_HAS_DRAFTS -->&nbsp; <input class="btnlite" type="submit" accesskey="d" tabindex="13" name="load" value="{L_LOAD_DRAFT}" /><!-- ENDIF -->
@@ -411,4 +431,4 @@
 	</table>
 
 	<!-- INCLUDE overall_footer.html -->
-<!-- ENDIF -->
-\ No newline at end of file
+<!-- ENDIF -->
author	Maat <maat-pub@mageia.biz>	2020-05-08 18:29:30 +0200
committer	Maat <maat-pub@mageia.biz>	2020-05-08 21:36:04 +0200
commit	36bc1870f21fac04736a1049c1d5b8e127d729f4 (patch)
tree	9d102331eeaf1ef3cd23e656320d7c08e65757ed /phpBB/styles/subsilver2/template/posting_body.html
parent	8875d385d0579b451dac4d9bda465172b4f69ee0 (diff)
parent	149375253685b3a38996f63015a74b7a0f53aa14 (diff)
download	forums-36bc1870f21fac04736a1049c1d5b8e127d729f4.tar forums-36bc1870f21fac04736a1049c1d5b8e127d729f4.tar.gz forums-36bc1870f21fac04736a1049c1d5b8e127d729f4.tar.bz2 forums-36bc1870f21fac04736a1049c1d5b8e127d729f4.tar.xz forums-36bc1870f21fac04736a1049c1d5b8e127d729f4.zip