From 9ef79776a955e20995f2abfa1ce9fd0188ae4e83 Mon Sep 17 00:00:00 2001
From: Crizzo <mail@crizzo.de>
Date: Sun, 9 Mar 2014 13:20:49 +0100
Subject: [PATCH] [ticket/8785] Adds a new optical improvement, new file and
 fixes html bugs

PHPBB3-8785
---
 .../prosilver/template/posting_editor.html    | 93 ++-----------------
 .../prosilver/template/posting_pm_header.html | 90 ++++++++++++++++++
 .../prosilver/template/posting_pm_layout.html |  7 +-
 phpBB/styles/prosilver/theme/common.css       |  8 ++
 4 files changed, 105 insertions(+), 93 deletions(-)
 create mode 100644 phpBB/styles/prosilver/template/posting_pm_header.html

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index f880597b29..ab812a40e6 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -1,89 +1,6 @@
-<fieldset class="fields1">
-	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
-
-	<!-- IF S_PRIVMSGS and not S_SHOW_DRAFTS -->
-
-		<!-- IF S_GROUP_OPTIONS -->
-			<div class="column2">
-				<label for="group_list"><strong>{L_TO_ADD_GROUPS}{L_COLON}</strong></label><br />
-				<select name="group_list[]" id="group_list" multiple="multiple" size="3" class="inputbox">{S_GROUP_OPTIONS}</select><br />
-				<input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" />
-				<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" />
-			</div>
-		<!-- ENDIF -->
-		<!-- IF S_ALLOW_MASS_PM -->
-		<div class="column1">
-			<!-- IF not S_EDIT_POST -->
-			<dl class="pmlist">
-				<label><strong>{L_TO_ADD_MASS}{L_COLON}</strong><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2" tabindex="1"></textarea></label>
-				<div>
-				<input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" />
-				<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" />
-				<span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span>
-				</div>
-			</dl>
-			<!-- ENDIF -->
-		</div>
-		<hr />
-		<div class="column1">
-			<!-- IF .to_recipient -->
-				<dl>
-					<dt><label>{L_TO_MASS}{L_COLON}</label></dt>
-					<dd class="recipients">
-					<ul class="recipients">
-						<!-- BEGIN to_recipient -->
-						<li>
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
-							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->
-						</li>
-						<!-- END to_recipient -->
-					</ul>
-					</dd>
-				</dl>
-			<!-- ENDIF -->
-		</div>
-			<!-- IF .bcc_recipient -->
-			<div class="column2">
-				<dl>
-					<dt><label>{L_BCC}{L_COLON}</label></dt>
-					<dd class="recipients">
-					<ul class="recipients">
-						<!-- BEGIN bcc_recipient -->
-						<li>
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
-							<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF -->
-						</li>
-						<!-- END bcc_recipient -->
-					</ul>
-					</dd>
-				</dl>
-			</div>
-			<!-- ENDIF -->
-		<!-- ELSE -->
-		<div class="column1">
-			<dl>
-				<dt><label for="username_list">{L_TO_ADD}{L_COLON}</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt>
-				<!-- IF not S_EDIT_POST -->
-				<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
-				<!-- ENDIF -->
-				<!-- IF .to_recipient -->
-					<dd class="recipients">
-					<ul class="recipients">
-						<!-- BEGIN to_recipient -->
-						<li>
-							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->&nbsp;
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
-						</li>
-						<!-- END to_recipient -->
-					</dd>
-				<!-- ENDIF -->
-			</dl>
-		</div>
-		<!-- ENDIF -->
-		<hr />
-		<div class="clear"></div>
-	<!-- ENDIF -->
-
+<div class="panel" id="postingbox">
+	<div class="inner">
+	<fieldset class="fields1">
 	<!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS -->
 	<dl>
 		<dt><label for="icon">{L_ICON}{L_COLON}</label></dt>
@@ -155,7 +72,7 @@
 	</div>
 
 	<!-- EVENT posting_editor_message_after -->
-</fieldset>
+	</fieldset>
 
 <!-- IF $EXTRA_POSTING_OPTIONS eq 1 -->
 
@@ -267,3 +184,5 @@
 		<!-- ENDIF -->
 
 <!-- ENDIF -->
+	</div>
+</div>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html
new file mode 100644
index 0000000000..066112b720
--- /dev/null
+++ b/phpBB/styles/prosilver/template/posting_pm_header.html
@@ -0,0 +1,90 @@
+<div class="panel" id="pmheader-postingbox">
+	<div class="inner">
+	<fieldset class="fields1">
+	<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+
+	<!-- IF S_PRIVMSGS and not S_SHOW_DRAFTS -->
+
+		<!-- IF S_GROUP_OPTIONS -->
+			<div class="column2">
+				<label for="group_list"><strong>{L_TO_ADD_GROUPS}{L_COLON}</strong></label><br />
+				<select name="group_list[]" id="group_list" multiple="multiple" size="3" class="inputbox">{S_GROUP_OPTIONS}</select><br />
+				<input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" />
+				<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" />
+			</div>
+		<!-- ENDIF -->
+		<!-- IF S_ALLOW_MASS_PM -->
+		<div class="column1">
+			<!-- IF not S_EDIT_POST -->
+			<dl class="pmlist">
+				<dt><label><strong>{L_TO_ADD_MASS}{L_COLON}</strong><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2" tabindex="1"></textarea></label></dt>
+				<dd class="recipients">
+				<input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" />
+				<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" />
+				<span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span>
+				</dd>
+			</dl>
+			<!-- ENDIF -->
+		</div>
+		<hr />
+		<div class="column1">
+			<!-- IF .to_recipient -->
+				<dl>
+					<dt><label>{L_TO_MASS}{L_COLON}</label></dt>
+					<dd class="recipients">
+					<ul class="recipients">
+						<!-- BEGIN to_recipient -->
+						<li>
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->
+						</li>
+						<!-- END to_recipient -->
+					</ul>
+					</dd>
+				</dl>
+			<!-- ENDIF -->
+		</div>
+			<!-- IF .bcc_recipient -->
+			<div class="column2">
+				<dl>
+					<dt><label>{L_BCC}{L_COLON}</label></dt>
+					<dd class="recipients">
+					<ul class="recipients">
+						<!-- BEGIN bcc_recipient -->
+						<li>
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+							<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF -->
+						</li>
+						<!-- END bcc_recipient -->
+					</ul>
+					</dd>
+				</dl>
+			</div>
+			<!-- ENDIF -->
+		<!-- ELSE -->
+		<div class="column1">
+			<dl>
+				<dt><label for="username_list">{L_TO_ADD}{L_COLON}</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt>
+				<!-- IF not S_EDIT_POST -->
+				<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
+				<!-- ENDIF -->
+				<!-- IF .to_recipient -->
+					<dd class="recipients">
+					<ul class="recipients">
+						<!-- BEGIN to_recipient -->
+						<li>
+							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->&nbsp;
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+						</li>
+						<!-- END to_recipient -->
+					</dd>
+				<!-- ENDIF -->
+			</dl>
+		</div>
+		<!-- ENDIF -->
+		
+		<div class="clear"></div>
+	<!-- ENDIF -->
+	</fieldset>
+	</div>
+</div>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html
index 5421cc2cbd..c73fc3f40b 100644
--- a/phpBB/styles/prosilver/template/posting_pm_layout.html
+++ b/phpBB/styles/prosilver/template/posting_pm_layout.html
@@ -17,15 +17,10 @@
 
 <h2>{L_TITLE}</h2>
 
-<div class="panel" id="postingbox">
-	<div class="inner">
-
 	<!-- DEFINE $EXTRA_POSTING_OPTIONS = 1 -->
+	<!-- INCLUDE posting_pm_header.html -->
 	<!-- INCLUDE posting_editor.html -->
 
-	</div>
-</div>
-
 <!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF -->
 
 <!-- IF S_DISPLAY_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index c204755b9a..4690e9410e 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -768,6 +768,14 @@ fieldset.fields1 ul.recipients  input.button2{
 	padding: 0;
 }
 
+fieldset.fields1 dl.pmlist > dt {
+	width: auto !important;
+}
+
+fieldset.fields1 dl.pmlist dd.recipients {
+	margin-left: 0 !important;
+}
+
 /* Pagination
 ---------------------------------------- */
 .pagination {