From d52f34f5ec5d006ec7e610e1c72266df21e70ac7 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 5 Jun 2011 09:40:43 +0200
Subject: [ticket/10073] Add a contact administrators page and refactor email
 forms.

The message to be displayed on top of the email form cannot be configured yet.

PHPBB3-10073
---
 .../prosilver/template/memberlist_email.html       | 28 ++++++++++++++++++++++
 phpBB/styles/prosilver/template/navbar_footer.html |  1 +
 2 files changed, 29 insertions(+)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html
index 78d0eba5a8..d66022887c 100644
--- a/phpBB/styles/prosilver/template/memberlist_email.html
+++ b/phpBB/styles/prosilver/template/memberlist_email.html
@@ -1,13 +1,22 @@
 <!-- INCLUDE overall_header.html -->
 
+<!-- IF S_CONTACT_ADMIN-->
+<h2 class="titlespace">{L_CONTACT_ADMIN}</h2>
+<!-- ELSE -->
 <h2 class="titlespace">{L_SEND_EMAIL_USER}</h2>
+<!-- ENDIF -->
 
 <form method="post" action="{S_POST_ACTION}" id="post">
 
 <div class="panel">
 	<div class="inner">
+	<!-- IF CONTACT_INFO -->
+		<div class="postbody"><div class="content">{CONTACT_INFO}</div></div>
+		<br class="clear" />
+	<!-- ENDIF -->
 
 	<div class="content">
+
 		<!-- IF ERROR_MESSAGE --><p class="error">{ERROR_MESSAGE}</p><!-- ENDIF -->
 		<fieldset class="fields2">
 		<!-- IF S_SEND_USER -->
@@ -19,6 +28,25 @@
 				<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
 				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="1" value="{SUBJECT}" /></dd>
 			</dl>
+		<!-- ELSEIF S_CONTACT_ADMIN-->
+			<dl>
+				<dt><label>{L_RECIPIENT}:</label></dt>
+				<dd><strong>{L_ADMINISTRATOR}</strong></dd>
+			</dl>
+			<!-- IF not S_IS_REGISTERED -->
+			<dl>
+				<dt><label for="email">{L_SENDER_EMAIL_ADDRESS}:</label></dt>
+				<dd><input class="inputbox autowidth" type="text" name="email" id="email" size="50" maxlength="100" tabindex="1" value="{EMAIL}" /></dd>
+			</dl>
+			<dl>
+				<dt><label for="name">{L_SENDER_NAME}:</label></dt>
+				<dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="2" value="{NAME}" /></dd>
+			</dl>
+			<!-- ENDIF -->
+			<dl>
+				<dt><label for="subject">{L_SUBJECT}:</label></dt>
+				<dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="3" value="{SUBJECT}" /></dd>
+			</dl>
 		<!-- ELSE -->
 			<dl>
 				<dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt>
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index 13e50dae19..6912ee242e 100644
--- a/phpBB/styles/prosilver/template/navbar_footer.html
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -16,6 +16,7 @@
 		<!-- IF not S_IS_BOT --><li class="rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true">{L_DELETE_COOKIES}</a></li><!-- ENDIF -->
 		<!-- EVENT overall_footer_teamlink_before -->
 		<!-- IF U_TEAM --><li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a></li><!-- ENDIF -->
+		<!-- IF U_CONTACT_US --><li class="rightside"><a href="{U_CONTACT_US}">{L_CONTACT_US}</a></li><!-- ENDIF -->
 		<!-- EVENT overall_footer_teamlink_after -->
 	</ul>
 
-- 
cgit v1.2.1


From ef8d7b995e854c64a5f529978ee4898030ae9fa4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 13 Apr 2014 23:46:28 +0200
Subject: [ticket/10073] Add @config_text to admin_form

PHPBB3-10073
---
 phpBB/styles/prosilver/template/memberlist_email.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html
index d66022887c..b8366a073a 100644
--- a/phpBB/styles/prosilver/template/memberlist_email.html
+++ b/phpBB/styles/prosilver/template/memberlist_email.html
@@ -11,7 +11,11 @@
 <div class="panel">
 	<div class="inner">
 	<!-- IF CONTACT_INFO -->
-		<div class="postbody"><div class="content">{CONTACT_INFO}</div></div>
+		<div class="postbody">
+			<div class="content">
+				{CONTACT_INFO}
+			</div>
+		</div>
 		<br class="clear" />
 	<!-- ENDIF -->
 
-- 
cgit v1.2.1


From 84a02f5cef6cd2cc4b8fb5e9e083e848df8d2a48 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 3 May 2014 13:28:38 +0200
Subject: [ticket/10073] Use get_username_string and correctly sprintf for
 languages

PHPBB3-10073
---
 phpBB/styles/prosilver/template/memberlist_email.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html
index b8366a073a..45e3fcc865 100644
--- a/phpBB/styles/prosilver/template/memberlist_email.html
+++ b/phpBB/styles/prosilver/template/memberlist_email.html
@@ -26,7 +26,7 @@
 		<!-- IF S_SEND_USER -->
 			<dl>
 				<dt><label>{L_RECIPIENT}{L_COLON}</label></dt>
-				<dd><strong>{USERNAME}</strong></dd>
+				<dd><strong>{USERNAME_FULL}</strong></dd>
 			</dl>
 			<dl>
 				<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
-- 
cgit v1.2.1


From 299fe086b474c1323902f91a067522b88f04308a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 3 May 2014 14:02:46 +0200
Subject: [ticket/10073] Fix title for "Email topic"

PHPBB3-10073
---
 phpBB/styles/prosilver/template/memberlist_email.html | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles/prosilver')

diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html
index 45e3fcc865..865f0b883c 100644
--- a/phpBB/styles/prosilver/template/memberlist_email.html
+++ b/phpBB/styles/prosilver/template/memberlist_email.html
@@ -2,23 +2,29 @@
 
 <!-- IF S_CONTACT_ADMIN-->
 <h2 class="titlespace">{L_CONTACT_ADMIN}</h2>
-<!-- ELSE -->
+<!-- ELSEIF S_SEND_USER -->
 <h2 class="titlespace">{L_SEND_EMAIL_USER}</h2>
+<!-- ELSE -->
+<h2 class="titlespace">{L_EMAIL_TOPIC}</h2>
 <!-- ENDIF -->
 
 <form method="post" action="{S_POST_ACTION}" id="post">
 
-<div class="panel">
-	<div class="inner">
 	<!-- IF CONTACT_INFO -->
-		<div class="postbody">
-			<div class="content">
-				{CONTACT_INFO}
+	<div class="panel">
+		<div class="inner">
+			<div class="postbody">
+				<div class="content">
+					{CONTACT_INFO}
+				</div>
 			</div>
 		</div>
+	</div>
 		<br class="clear" />
 	<!-- ENDIF -->
 
+	<div class="panel">
+		<div class="inner">
 	<div class="content">
 
 		<!-- IF ERROR_MESSAGE --><p class="error">{ERROR_MESSAGE}</p><!-- ENDIF -->
-- 
cgit v1.2.1