From 0e842d995815ba10d9e6fc406a9f288040b6eed1 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Fri, 11 Apr 2014 19:37:40 +0200
Subject: [PATCH 1/5] [ticket/12389] Move print topic & email topic icons to
 topic tools

PHPBB3-12389
---
 .../prosilver/template/navbar_header.html     |  4 ----
 .../template/ucp_pm_message_header.html       |  2 ++
 .../template/viewtopic_topic_tools.html       |  5 ++++-
 phpBB/styles/prosilver/theme/bidi.css         |  6 ------
 phpBB/styles/prosilver/theme/buttons.css      | 21 -------------------
 phpBB/styles/prosilver/theme/colours.css      | 10 ++-------
 6 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index 259aec75ed..5dcc88232f 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -10,10 +10,6 @@
 		</li>
 
 		<!-- IF S_REGISTERED_USER --><li id="username_logged_in" class="rightside"><!-- IF CURRENT_USER_AVATAR --><a href="{U_USER_PROFILE}" class="header-avatar">{CURRENT_USER_AVATAR}</a> <!-- ENDIF -->{USERNAME_FULL}</li><!-- ENDIF -->
-		<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
-		<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
-		<!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->
-		<!-- IF U_PRINT_PM --><li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li><!-- ENDIF -->
 		<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --><li class="responsive-search rightside" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH}</a></li><!-- ENDIF -->
 	</ul>
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index a6ef3fc7dd..cb7341e09d 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -15,6 +15,8 @@
 		</div>
 	<!-- ENDIF -->
 
+	<!-- INCLUDE viewtopic_topic_tools.html -->
+
 	<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
 	<ul class="linklist">
 		<li class="rightside pagination">
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
index fcce2267c4..f59cf85341 100644
--- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
@@ -1,4 +1,4 @@
-<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS or S_DISPLAY_TOPIC_TOOLS) -->
+<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS or U_EMAIL_TOPIC or U_PRINT_TOPIC or U_PRINT_PM or S_DISPLAY_TOPIC_TOOLS) -->
 	<div class="dropdown-container dropdown-button-control topic-tools">
 		<span title="{L_TOPIC_TOOLS}" class="dropdown-trigger dropdown-select dropdown-select-icon tools-icon"><span></span></span>
 		<div class="dropdown hidden">
@@ -20,6 +20,9 @@
 					</li>
 				<!-- ENDIF -->
 				<!-- IF U_BUMP_TOPIC --><li class="small-icon icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->
+				<!-- IF U_EMAIL_TOPIC --><li class="small-icon icon-sendemail"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
+				<!-- IF U_PRINT_TOPIC --><li class="small-icon icon-print"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->
+				<!-- IF U_PRINT_PM --><li class="small-icon icon-print"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p">{L_PRINT_PM}</a></li><!-- ENDIF -->
 				<!-- IF S_HAS_ATTACHMENTS -->
 					<li class="small-icon icon-download">
 						<a class="dropdown-toggle-submenu" href="{U_DOWNLOAD_ALL_ATTACHMENTS}" title="{L_DOWNLOAD_ALL_ATTACHMENTS}">{L_DOWNLOAD_ALL_ATTACHMENTS}</a>
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 850726db89..0d5e1cf829 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -552,12 +552,6 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	margin: 0 1px 0 5px;
 }
 
-/* Sub-header (navigation bar)
---------------------------------------------- */
-.rtl a.print, .rtl a.sendemail {
-	text-align: right;
-}
-
 /* Icon images
 ---------------------------------------- */
 .rtl .small-icon {
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 93c325e416..3422af8b64 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -101,27 +101,6 @@
 .dropdown-visible .dropdown-select.tools-icon:before,
 .nojs .dropdown-container:hover .dropdown-select.tools-icon:before { background-position: -80px -20px; }
 
-/* Sub-header (navigation bar)
---------------------------------------------- */
-a.print, a.sendemail {
-	display: block;
-	overflow: hidden;
-	height: 18px;
-	text-indent: -5000px;
-	text-align: left;
-	background-repeat: no-repeat;
-}
-
-a.print {
-	background-image: none;
-	width: 22px;
-}
-
-a.sendemail {
-	background-image: none;
-	width: 22px;
-}
-
 /* Icon images
 ---------------------------------------- */
 .small-icon {
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 5f6ca4929c..30650e7411 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -665,14 +665,6 @@ fieldset.polls dd div {
 Colours and backgrounds for buttons.css
 -------------------------------------------------------------- */
 
-a.print {
-	background-image: url("./images/icon_print.gif");
-}
-
-a.sendemail {
-	background-image: url("./images/icon_sendemail.gif");
-}
-
 .buttons div a, .dropdown-select {
 	border-color: #C7C3BF;
 	background-color: #FFFFFF;
@@ -736,6 +728,8 @@ a.sendemail {
 .icon-pm						{ background-image: url("./images/icon_pm.gif"); }
 .icon-download					{ background-image: url("./images/icon_download.gif"); }
 .icon-mark						{ background-image: url("./images/icon_mark.gif"); }
+.icon-sendemail					{ background-image: url("./images/icon_sendemail.gif"); }
+.icon-print						{ background-image: url("./images/icon_print.gif"); }
 
 /* Profile & navigation icons */
 .email-icon, .email-icon a		{ background-image: url("./images/icon_contact_email.gif"); }

From 9c8ea7bdbae24ad6e0e7e3524b8d0503812ffa83 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Fri, 11 Apr 2014 19:48:18 +0200
Subject: [PATCH 2/5] [ticket/12389] Change language of email friend

PHPBB3-12389
---
 phpBB/language/en/viewtopic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index b566f4b5c0..afbad5a0d6 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -58,7 +58,7 @@ $lang = array_merge($lang, array(
 		1	=> 'Last edited by %2$s on %3$s, edited %1$d time in total.',
 		2	=> 'Last edited by %2$s on %3$s, edited %1$d times in total.',
 	),
-	'EMAIL_TOPIC'			=> 'Email friend',
+	'EMAIL_TOPIC'			=> 'Email topic',
 	'ERROR_NO_ATTACHMENT'	=> 'The selected attachment does not exist anymore.',
 
 	'FILE_NOT_FOUND_404'	=> 'The file <strong>%s</strong> does not exist.',

From f890b7098fd6661adb7e9b6fe46038deb12cbf5a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 20 Apr 2014 08:57:35 -0700
Subject: [PATCH 3/5] [ticket/12389] Replace email and print icons.

PHPBB3-12389
---
 .../prosilver/theme/images/icon_print.gif       | Bin 424 -> 204 bytes
 .../prosilver/theme/images/icon_sendemail.gif   | Bin 531 -> 303 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 phpBB/styles/prosilver/theme/images/icon_print.gif

diff --git a/phpBB/styles/prosilver/theme/images/icon_print.gif b/phpBB/styles/prosilver/theme/images/icon_print.gif
old mode 100644
new mode 100755
index a71dfdde70642f044b811f55ed79f903bffd5deb..e464e304ea03cc82f159ad64ea9eeeda9e5f49be
GIT binary patch
literal 204
zcmZ?wbhEHb<YN$EIKlt||NsAAzW?ThyRVJ1ml@|QGtXP$RJzK$c4K1iuE_f3=@a+n
zOx<5P`*7FlGfgu$?mqWu&-q6OE<HJQ^Tmqw+jj0h`s>f%moH!5y?giM$&(EY4M5Yt
zra}qDpDc_F4AKlbAU?=W23F4pYJDl0^D=e`=0wkNQ8>-gbGO{r$@{hbgo{Z=+J0in
xhf+_byb7Dy+#gzLq|wE}ce%pAO^EGa<HZ@Q9G;mIG&cE8(>%Cf)p92WYXB<UTaEw#

literal 424
zcmZ?wbhEHb6lV}(xN5+VGVjR8j~|yTS@P%4pLOfj{r>&?_3PKqo;}N5eEj6elk*SV
zI)424jT<+9{rdIl)vNpW?|=UM`Ocj?Tvhu@SDu=__xk(y@9Wl`d-?L^yLa#2ym|BD
z#fvXrzTCTaZ_b=KhYlTDv0}yT+qa)QdGi1N{|y^9+`4t^?%lf|K781C_Tl8olmGtx
zTUc0l?b@|N*I%qSe(&wuxBveAJ9XzZ11Ui9CkrD3g8_pMNE66U3~WaoW)yhnNc9_B
z%RU*iEW+c_OVzApLF<D{ZWP4@Gv{Q_E>S(uT(WRNf#XCS<HQYmChuCl?LHAz8KTk9
z)Yz!3UG1!{CoLers3s~Qs;4K(#-<nLs;kG(FQY0bsG!2LOh`yCdG-`NHoo=ZQtVsU
z6<4|GYRk7YH_K|T4ieU5(b7I~Qd^5jPk5G#4j0E!J#MD!+*dicI-D<E(PVu5SX1xL
ty^A9HnoQd7m?A`8&i4IwC{SID;m=<Nu?vefSX^AR;GmfLC00fTYXE^b!zlm&

diff --git a/phpBB/styles/prosilver/theme/images/icon_sendemail.gif b/phpBB/styles/prosilver/theme/images/icon_sendemail.gif
index f6b8aa10e13385a0f5fe6752a4a6342b915692b3..92a39c8af918c93126bbabcb02c42102ccae86c5 100644
GIT binary patch
literal 303
zcmZ?wbhEHb<YN$ExXJ(m|NsAwY~8Zy!1<FmUYxl8{L;PGw;#QF^7^w;_A;NkjX}*@
zlKOV1PS{g0<6zmGBjt0CRLnV4He*ly;uDp#_Eyc_J8RqJEhq2qIP+lhv0G<uJh}1s
z-J#Q0?mT((`1R*UuRfhPf9=`ZFHhclzI*pB&?2yf)Fc#tvM@3*s4(b&3<dd#fz8KZ
zQh|q#RR4)3MKdz2=5sDn6<HC+KV^l%!<h<e7IC<Hd$I8J_&>OOq36UirWD5r8>9SZ
g#~OEN7|1d)7l<k-x3?<@6$Au$_fMGU?#N&b09e#>9smFU

literal 531
zcmZ?wbhEHb6k||fxT?euGG*Vpckgs+)-7AMEM?x2t5>hyyLa#D)2D@ng*R{BeDUJN
z#ful$oVtJc^5u<ZA9i$fOrAV><;s<ZuD>{N?fHQN2MU*+tXp^P;lqb--n=<??%ab1
z4?chXeCN)clP6EEIDT)@kvqqZ9sB?P|EW8#8E69(f3h$#FeowTfQ$$EiGl6E!^8p)
z9jX2kONuO~G&o&YA;L9DLRQf$;qY5Fk+$}OiC<cnrZ_V!4#+U!<luOs*>2X@`0($u
z6UMTou4&P1%$&6Xtdf!?WijH+95S37%-y|BE@|xS)44e~Bo`>i_BAWA3wFq`vdYNt
z@-Lm`oF>T5wPE*01^&i<X*Nz??jG3_TT+Y9oIP=Zd8-qj7|XTmH?E1LxC-&fJ$U%&
z0biKU^A|5)y>|Bxey`vz92p%O6Q9T??8cLxnVoy@$jrkBPPAKBe*5r|ndt(1b9#%c
zR}1Hn!%FOmo{LgeK5|uJx31+f<#N>Q76{!~#OfWkvfr8S(WRrSuj|inGU8HB;|bVg
zz-QrFli~IyvYpY<o<ZQimX*QF7@CY$Ff3Sgb#<t=h>lU?!S?kDhwD-|^v}Ji;>f^Y
F4FFSL${_#%


From 4e1a86d848b90f9e36b012494c592feec153cc22 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Sun, 20 Apr 2014 20:32:45 +0200
Subject: [PATCH 4/5] [ticket/12389] Moved PM tools to UCP template

PHPBB3-12389
---
 phpBB/language/en/ucp.php                            |  1 +
 .../prosilver/template/ucp_pm_message_header.html    | 12 +++++++++++-
 .../prosilver/template/viewtopic_topic_tools.html    |  3 +--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 40c8bd9f8e..0af2ffe039 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -412,6 +412,7 @@ $lang = array_merge($lang, array(
 	'PM_SENTBOX'				=> 'Sent messages',
 	'PM_SUBJECT'				=> 'Message subject',
 	'PM_TO'						=> 'Send to',
+	'PM_TOOLS'					=> 'PM tools',
 	'PM_USERS_REMOVED_NO_PM'	=> 'Some users couldn’t be added as they have disabled private message receipt.',
 	'POST_EDIT_PM'				=> 'Edit message',
 	'POST_FORWARD_PM'			=> 'Forward message',
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index cb7341e09d..840eba4c83 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -15,7 +15,17 @@
 		</div>
 	<!-- ENDIF -->
 
-	<!-- INCLUDE viewtopic_topic_tools.html -->
+	<!-- IF not S_IS_BOT and U_PRINT_PM -->
+		<div class="dropdown-container dropdown-button-control topic-tools">
+			<span title="{L_PM_TOOLS}" class="dropdown-trigger dropdown-select dropdown-select-icon tools-icon"><span></span></span>
+			<div class="dropdown hidden">
+				<div class="pointer"><div class="pointer-inner"></div></div>
+				<ul class="dropdown-contents">
+					<!-- IF U_PRINT_PM --><li class="small-icon icon-print"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p">{L_PRINT_PM}</a></li><!-- ENDIF -->
+				</ul>
+			</div>
+		</div>
+	<!-- ENDIF -->
 
 	<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
 	<ul class="linklist">
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
index f59cf85341..89f34d1b3a 100644
--- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
@@ -1,4 +1,4 @@
-<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS or U_EMAIL_TOPIC or U_PRINT_TOPIC or U_PRINT_PM or S_DISPLAY_TOPIC_TOOLS) -->
+<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS or U_EMAIL_TOPIC or U_PRINT_TOPIC or S_DISPLAY_TOPIC_TOOLS) -->
 	<div class="dropdown-container dropdown-button-control topic-tools">
 		<span title="{L_TOPIC_TOOLS}" class="dropdown-trigger dropdown-select dropdown-select-icon tools-icon"><span></span></span>
 		<div class="dropdown hidden">
@@ -22,7 +22,6 @@
 				<!-- IF U_BUMP_TOPIC --><li class="small-icon icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->
 				<!-- IF U_EMAIL_TOPIC --><li class="small-icon icon-sendemail"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
 				<!-- IF U_PRINT_TOPIC --><li class="small-icon icon-print"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->
-				<!-- IF U_PRINT_PM --><li class="small-icon icon-print"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p">{L_PRINT_PM}</a></li><!-- ENDIF -->
 				<!-- IF S_HAS_ATTACHMENTS -->
 					<li class="small-icon icon-download">
 						<a class="dropdown-toggle-submenu" href="{U_DOWNLOAD_ALL_ATTACHMENTS}" title="{L_DOWNLOAD_ALL_ATTACHMENTS}">{L_DOWNLOAD_ALL_ATTACHMENTS}</a>

From 65c8280fb6a7ca9382d3d57c51bcd2aeecb128c8 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Thu, 24 Apr 2014 22:09:15 +0200
Subject: [PATCH 5/5] [ticket/12389] Change "PM" to "Message"

PHPBB3-12389
---
 phpBB/language/en/ucp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 0af2ffe039..5148589471 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -412,7 +412,7 @@ $lang = array_merge($lang, array(
 	'PM_SENTBOX'				=> 'Sent messages',
 	'PM_SUBJECT'				=> 'Message subject',
 	'PM_TO'						=> 'Send to',
-	'PM_TOOLS'					=> 'PM tools',
+	'PM_TOOLS'					=> 'Message tools',
 	'PM_USERS_REMOVED_NO_PM'	=> 'Some users couldn’t be added as they have disabled private message receipt.',
 	'POST_EDIT_PM'				=> 'Edit message',
 	'POST_FORWARD_PM'			=> 'Forward message',