Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus

* github-prototech/ticket/12265:
  [ticket/12265] Actually use $u_pm.
  [ticket/12265] Ensure that dropdown is always at the very left of the container
  [ticket/12265] Define a loop for contact icons.
  [ticket/12265] Break the icons that aren't in loop in case extensions add more
  [ticket/12265] Fix modulo logic.
  [ticket/12265] Adjust alignment of AIM and Jabber icons.
  [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.
  [ticket/12265] Add contact icon and remove border from last row & cells.
  [ticket/12265] Fix issue with dropdown being restricted by the width of parent
  [ticket/12265] Remove ugly logic.
  [ticket/12265] Simplify contact icon design and move to dropdown.

Conflicts:
	phpBB/viewtopic.php

phpBB/styles/prosilver/theme/buttons.css

@@ -214,20 +214,53 @@ ul.profile-icons.responsive a.responsive-menu-link:before {
 	max-width: 40%;
 }
 
+.contact-icons.dropdown-contents {
+	min-width: 0;
+	padding: 0;
+}
+
+.contact-icon {
+	background-repeat: no-repeat;
+	display: block;
+	height: 16px;
+	width: 16px;
+}
+.contact-icons a {
+	border-bottom: 1px dotted;
+	border-right: 1px dotted;
+	display: block;
+	float: left;
+	padding: 8px;
+}
+
+.contact-icons .last-cell {
+	border-right: none;
+}
+
+.contact-icons div:last-child a {
+	border-bottom: none;
+}
+
+.contact-icons div {
+	clear: left;
+}
+
+
 /* Profile & navigation icons */
-.email-icon, .email-icon a		{ background: none top left no-repeat; }
-.aim-icon, .aim-icon a			{ background: none top left no-repeat; }
-.phpbb_aol-icon, .phpbb_aol-icon a			{ background: none top left no-repeat; }
-.yahoo-icon, .yahoo-icon a		{ background: none top left no-repeat; }
-.phpbb_yahoo-icon, .phpbb_yahoo-icon a		{ background: none top left no-repeat; }
-.web-icon, .web-icon a			{ background: none top left no-repeat; }
-.phpbb_website-icon, .phpbb_website-icon a	{ background: none top left no-repeat; }
-.msnm-icon, .msnm-icon a			{ background: none top left no-repeat; }
-.phpbb_wlm-icon, .phpbb_wlm-icon a			{ background: none top left no-repeat; }
-.icq-icon, .icq-icon a			{ background: none top left no-repeat; }
-.phpbb_icq-icon, .phpbb_icq-icon a			{ background: none top left no-repeat; }
-.jabber-icon, .jabber-icon a		{ background: none top left no-repeat; }
-.pm-icon, .pm-icon a				{ background: none top left no-repeat; }
+.pm-icon		{ background-position: 0 0; }
+.email-icon		{ background-position: -21px 0; }
+.jabber-icon	{ background-position: -80px 0; }
+.phpbb_icq-icon	{ background-position: -61px 0 ; }
+.phpbb_wlm-icon	{ background-position: -182px 0; }
+.phpbb_aol-icon	{ background-position: -244px 0; }
+.phpbb_website-icon		{ background-position: -40px 0; }
+.phpbb_youtube-icon		{ background-position: -98px 0; }
+.phpbb_facebook-icon	{ background-position: -119px 0; }
+.phpbb_google_plus-icon	{ background-position: -140px 0; }
+.phpbb_skype-icon		{ background-position: -161px 0; }
+.phpbb_twitter-icon		{ background-position: -203px 0; }
+.phpbb_yahoo-icon		{ background-position: -224px 0; }
+
 .quote-icon, .quote-icon a		{ background: none top left no-repeat; }
 
 /* Moderator icons */

phpBB/styles/prosilver/theme/colours.css

@@ -710,6 +710,14 @@ Colours and backgrounds for buttons.css
 	background-image: url("images/buttons.png");
 }
 
+.contact-icons a {
+	border-color: #DCDCDC;
+}
+
+.contact-icons a:hover {
+	background-color: #F2F6F9;
+}
+
 /* Icon images
 ---------------------------------------- */
 .icon-faq						{ background-image: url("./images/icon_faq.gif"); }
@@ -732,19 +740,8 @@ Colours and backgrounds for buttons.css
 .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"); }
-.phpbb_aol-icon, .phpbb_aol-icon a			{ background-image: url("./images/icon_contact_aim.gif"); }
-.aim-icon, .aim-icon a			{ background-image: url("./images/icon_contact_aim.gif"); }
-.yahoo-icon, .yahoo-icon a		{ background-image: url("./images/icon_contact_yahoo.gif"); }
-.phpbb_yahoo-icon, .phpbb_yahoo-icon a		{ background-image: url("./images/icon_contact_yahoo.gif"); }
-.web-icon, .web-icon a			{ background-image: url("./images/icon_contact_www.gif"); }
-.phpbb_website-icon, .phpbb_website-icon a			{ background-image: url("./images/icon_contact_www.gif"); }
-.msnm-icon, .msnm-icon a			{ background-image: url("./images/icon_contact_msnm.gif"); }
-.phpbb_wlm-icon, .phpbb_wlm-icon a			{ background-image: url("./images/icon_contact_msnm.gif"); }
-.icq-icon, .icq-icon a			{ background-image: url("./images/icon_contact_icq.gif"); }
-.phpbb_icq-icon, .phpbb_icq-icon a			{ background-image: url("./images/icon_contact_icq.gif"); }
-.jabber-icon, .jabber-icon a		{ background-image: url("./images/icon_contact_jabber.gif"); }
-.pm-icon, .pm-icon a				{ background-image: url("./en/icon_contact_pm.gif"); }
+.contact-icon { background-image: url("./images/icons_contact.png"); }
+
 .quote-icon, .quote-icon a		{ background-image: url("./en/icon_post_quote.gif"); }
 ul.profile-icons.responsive a.responsive-menu-link	{ background-image: url("./images/icon_post_menu.png"); }
 

phpBB/styles/prosilver/theme/common.css

@@ -470,6 +470,7 @@ ul.linklist.bulletin li.no-bulletin:before {
 	border: 1px solid transparent;
 	border-radius: 5px;
 	padding: 9px 0 0;
+	margin-right: -500px;
 }
 
 .dropdown-container.topic-tools {
@@ -485,6 +486,8 @@ ul.linklist.bulletin li.no-bulletin:before {
 .dropdown-left .dropdown, .nojs .rightside .dropdown {
 	left: auto;
 	right: 0;
+	margin-left: -500px;
+	margin-right: 0;
 }
 
 .dropdown-button-control .dropdown {

phpBB/styles/prosilver/theme/content.css

@@ -731,6 +731,20 @@ fieldset.polls dd div {
 	height: auto !important;
 }
 
+dd.profile-contact {
+	overflow: visible;
+}
+
+.profile-contact .dropdown-container {
+	display: inline-block;
+	text-align: left;
+	width: 30px;
+}
+
+.profile-contact .icon_contact {
+	vertical-align: middle;
+}
+
 .online {
 	background-image: none;
 	background-position: 100% 0;

phpBB/styles/prosilver/theme/en/stylesheet.css

@@ -7,16 +7,10 @@ ul.profile-icons li.edit-icon	{ width: 42px; height: 20px; }
 .online { background-image: url("./icon_user_online.gif"); }
 
 /* Icon images */
-.pm-icon, .pm-icon a				{ background-image: url("./icon_contact_pm.gif"); }
 .quote-icon, .quote-icon a		{ background-image: url("./icon_post_quote.gif"); }
 .edit-icon, .edit-icon a			{ background-image: url("./icon_post_edit.gif"); }
 
 /* EN Language Pack */
-.imageset.icon_contact_pm {
-	background-image: url("./icon_contact_pm.gif");
-	padding-left: 28px;
-	padding-top: 20px;
-}
 .imageset.icon_post_edit {
 	background-image: url("./icon_post_edit.gif");
 	padding-left: 42px;

phpBB/styles/prosilver/theme/imageset.css

@@ -356,13 +356,14 @@ span.imageset {
 	padding-top: 20px;
 }
 
+.imageset.icon_contact {
+	background-image: url("./images/icon_contact.png");
+	padding-left: 16px;
+	padding-top: 12px;
+}
+
 
 /* English images for fallback */
-.imageset.icon_contact_pm {
-	background-image: url("./en/icon_contact_pm.gif");
-	padding-left: 28px;
-	padding-top: 20px;
-}
 .imageset.icon_post_edit {
 	background-image: url("./en/icon_post_edit.gif");
 	padding-left: 42px;