Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12553] Fix responsive user profile.
  [ticket/12553] Fix responsive post profile.
  [ticket/12553] Remove dropdown-trigger class from member search input.
  [ticket/12553] Fix the merge topic list.
  [ticket/12553] Fix dropdown position of live search
  [ticket/12553] Fix the responsive topic/forum lists.
  [ticket/12553] Align the text in responsive tables to the right.
  [ticket/12553] Center the responsive CP menus instead of floating right.
  [ticket/12553] Open the notification dropdown to the left.
  [ticket/12553] Fix alignment of contact icon.
  [ticket/12553] Fix incorrect alignment in ACP responsive tables.
  [ticket/12553] Align alert text to the right.
  [ticket/12553] Remove incorrect size for site logo.
  [ticket/12553] Fix links in the last post column that are not clickable.
  [ticket/12553] Align contact icons to the right.
  [ticket/12553] Move Place inline and Delete buttons left of the file name.

phpBB/adm/style/admin.css

@@ -209,6 +209,9 @@ li {
 
 #page-footer {
 	clear: both;
+}
+
+.copyright {
 	font-size: 0.75em;
 	text-align: center;
 }
@@ -984,6 +987,10 @@ table.fixed-width-table {
 		margin-bottom: 1px;
 	}
 
+	.rtl table.responsive td {
+		text-align: right !important;
+	}
+
 	table.responsive td.empty {
 		display: none !important;
 	}
@@ -1004,6 +1011,10 @@ table.fixed-width-table {
 		box-sizing: border-box;
 	}
 
+	.rtl table.responsive.two-columns td {
+		float: right;
+	}
+
 	table.responsive.two-columns td:nth-child(2n+1) {
 		clear: left;
 	}
@@ -1594,7 +1605,6 @@ input.button1:focus, input.button2:focus {
 	z-index: 50;
 	padding: 25px;
 	padding: 0 25px 20px 25px;
-	text-align: left;
 }
 
 .phpbb_alert .alert_close {

phpBB/adm/style/overall_footer.html

@@ -5,6 +5,7 @@
 	</div>
 
 	<div id="page-footer">
+		<div class="copyright">
 			<!-- IF S_COPYRIGHT_HTML -->
 				{CREDIT_LINE}
 				<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
@@ -14,6 +15,7 @@
 				<!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF -->
 				{DEBUG_OUTPUT}
 			<!-- ENDIF -->
+		</div>
 
 		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
 			<div id="darken">&nbsp;</div>

phpBB/assets/javascript/core.js

@@ -874,19 +874,6 @@ phpbb.timezonePreselectSelect = function(forceSelector) {
 	}
 };
 
-// Toggle notification list
-$('#notification_list_button').click(function(e) {
-	$('#notification_list').toggle();
-	e.preventDefault();
-});
-$('#phpbb').click(function(e) {
-	var target = $(e.target);
-
-	if (!target.is('#notification_list, #notification_list_button') && !target.parents().is('#notification_list, #notification_list_button')) {
-		$('#notification_list').hide();
-	}
-});
-
 phpbb.ajaxCallbacks = {};
 
 /**
@@ -1516,11 +1503,37 @@ phpbb.getFunctionByName = function (functionName) {
 };
 
 /**
-* Apply code editor to all textarea elements with data-bbcode attribute
+* Register page dropdowns.
 */
-$(document).ready(function() {
+phpbb.registerPageDropdowns = function() {
-	$('textarea[data-bbcode]').each(function() {
+	$('body').find('.dropdown-container').each(function() {
-		phpbb.applyCodeEditor(this);
+		var $this = $(this),
+			trigger = $this.find('.dropdown-trigger:first'),
+			contents = $this.find('.dropdown'),
+			options = {
+				direction: 'auto',
+				verticalDirection: 'auto'
+			},
+			data;
+
+		if (!trigger.length) {
+			data = $this.attr('data-dropdown-trigger');
+			trigger = data ? $this.children(data) : $this.children('a:first');
+		}
+
+		if (!contents.length) {
+			data = $this.attr('data-dropdown-contents');
+			contents = data ? $this.children(data) : $this.children('div:first');
+		}
+
+		if (!trigger.length || !contents.length) return;
+
+		if ($this.hasClass('dropdown-up')) options.verticalDirection = 'up';
+		if ($this.hasClass('dropdown-down')) options.verticalDirection = 'down';
+		if ($this.hasClass('dropdown-left')) options.direction = 'left';
+		if ($this.hasClass('dropdown-right')) options.direction = 'right';
+
+		phpbb.registerDropdown(trigger, contents, options);
 	});
 
 	// Hide active dropdowns when click event happens outside
@@ -1530,6 +1543,17 @@ $(document).ready(function() {
 			$(phpbb.dropdownHandles).each(phpbb.toggleDropdown);
 		}
 	});
+}
+
+/**
+* Apply code editor to all textarea elements with data-bbcode attribute
+*/
+$(document).ready(function() {
+	$('textarea[data-bbcode]').each(function() {
+		phpbb.applyCodeEditor(this);
+	});
+
+	phpbb.registerPageDropdowns();
 
 	$('#color_palette_placeholder').each(function() {
 		phpbb.registerPalette($(this));

phpBB/styles/prosilver/template/forum_fn.js

@@ -377,39 +377,6 @@ function parse_document(container)
 		},100);
 	});
 
-	/**
-	* Dropdowns
-	*/
-	container.find('.dropdown-container').each(function() {
-		var $this = $(this),
-			trigger = $this.find('.dropdown-trigger:first'),
-			contents = $this.find('.dropdown'),
-			options = {
-				direction: 'auto',
-				verticalDirection: 'auto'
-			},
-			data;
-
-		if (!trigger.length) {
-			data = $this.attr('data-dropdown-trigger');
-			trigger = data ? $this.children(data) : $this.children('a:first');
-		}
-
-		if (!contents.length) {
-			data = $this.attr('data-dropdown-contents');
-			contents = data ? $this.children(data) : $this.children('div:first');
-		}
-
-		if (!trigger.length || !contents.length) return;
-
-		if ($this.hasClass('dropdown-up')) options.verticalDirection = 'up';
-		if ($this.hasClass('dropdown-down')) options.verticalDirection = 'down';
-		if ($this.hasClass('dropdown-left')) options.direction = 'left';
-		if ($this.hasClass('dropdown-right')) options.direction = 'right';
-
-		phpbb.registerDropdown(trigger, contents, options);
-	});
-
 	/**
 	* Adjust HTML code for IE8 and older versions		
 	*/

phpBB/styles/prosilver/template/memberlist_search.html

@@ -10,9 +10,9 @@
 	<dl style="overflow: visible;">
 		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
 		<dd>
+			<!-- IF U_LIVE_SEARCH --><div class="dropdown-container dropdown-{S_CONTENT_FLOW_END}"><!-- ENDIF -->
 			<input type="text" name="username" id="username" value="{USERNAME}" class="inputbox"<!-- IF U_LIVE_SEARCH --> autocomplete="off" data-filter="phpbb.search.filter" data-ajax="member_search" data-min-length="3" data-url="{U_LIVE_SEARCH}" data-results="#user-search" data-overlay="false"<!-- ENDIF --> />
 			<!-- IF U_LIVE_SEARCH -->
-			<div class="dropdown-container">
 				<div class="dropdown live-search hidden" id="user-search">
 					<div class="pointer"><div class="pointer-inner"></div></div>
 					<ul class="dropdown-contents search-results">

phpBB/styles/prosilver/template/navbar_header.html

@@ -17,8 +17,8 @@
 	<ul class="linklist bulletin">
 	<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 		<!-- IF S_NOTIFICATIONS_DISPLAY -->
-		<li class="small-icon icon-notification" data-skip-responsive="true">
+		<li class="small-icon icon-notification dropdown-container dropdown-{S_CONTENT_FLOW_END}" data-skip-responsive="true">
-			<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
+			<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
 			<!-- INCLUDE notification_dropdown.html -->
 		</li>
 		<!-- ENDIF -->

phpBB/styles/prosilver/theme/bidi.css

@@ -317,7 +317,7 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 
 .rtl ul.topiclist.missing-column dt {
 	margin-right: 0;
-	margin-left: -330px;
+	margin-left: -345px;
 }
 
 .rtl ul.topiclist.two-long-columns dt {
@@ -350,10 +350,6 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	margin-left: 80px;
 }
 
-.rtl ul.topiclist dl {
-	position: static;	/* fix for IE6 */
-}
-
 .rtl ul.topiclist dd {
 	float: right;
 	border-right-width: 1px;
@@ -406,10 +402,6 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	padding-right: 45px;					/* Space for folder icon */
 }
 
-.rtl dl.icon dt {							/* fix for topic row icon links */
-	position: relative;
-}
-
 .rtl dl a.icon-link {						/* topic row icon links */
 	display: inline-block;
 	left: auto;
@@ -619,6 +611,19 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	margin-right: 0;
 }
 
+/* Poster contact icons
+ ----------------------------------------*/
+.rtl .contact-icons a {
+	border-left-width: 1px;
+	border-left-style: dotted;
+	border-right: none;
+	float: right;
+}
+
+.rtl .contact-icons .last-cell {
+	border-left: none;
+}
+
 /**
 * cp.css
 */
@@ -731,6 +736,15 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	float: right;
 }
 
+/* Responsive *CP navigation
+----------------------------------------*/
+@media only screen and (max-width: 900px), only screen and (max-device-width: 900px)
+{
+	.rtl #cp-menu, .rtl #navigation, .rtl #cp-main {
+		float: none;
+	}
+}
+
 /**
 * forms.css
 */
@@ -878,10 +892,6 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 }
 
 /* Former imageset */
-.rtl .imageset.site_logo {
-	padding-right: 139px;
-	padding-left: 0;
-}
 .rtl .imageset.forum_link, .rtl .imageset.forum_read, .rtl .imageset.forum_read_locked, .rtl .imageset.forum_read_subforum, .rtl .imageset.forum_unread, .rtl .imageset.forum_unread_locked, .rtl .imageset.forum_unread_subforum, .rtl .imageset.topic_moved, .rtl .imageset.topic_read, .rtl .imageset.topic_read_mine, .rtl .imageset.topic_read_hot, .rtl .imageset.topic_read_hot_mine, .rtl .imageset.topic_read_locked, .rtl .imageset.topic_read_locked_mine, .rtl .imageset.topic_unread, .rtl .imageset.topic_unread_mine, .rtl .imageset.topic_unread_hot, .rtl .imageset.topic_unread_hot_mine, .rtl .imageset.topic_unread_locked, .rtl .imageset.topic_unread_locked_mine, .rtl .imageset.sticky_read, .rtl .imageset.sticky_read_mine, .rtl .imageset.sticky_read_locked, .rtl .imageset.sticky_read_locked_mine, .rtl .imageset.sticky_unread, .rtl .imageset.sticky_unread_mine, .rtl .imageset.sticky_unread_locked, .rtl .imageset.sticky_unread_locked_mine, .rtl .imageset.announce_read, .rtl .imageset.announce_read_mine, .rtl .imageset.announce_read_locked, .rtl .imageset.announce_read_locked_mine, .rtl .imageset.announce_unread, .rtl .imageset.announce_unread_mine, .rtl .imageset.announce_unread_locked, .rtl .imageset.announce_unread_locked_mine, .rtl .imageset.global_read, .rtl .imageset.global_read_mine, .rtl .imageset.global_read_locked, .rtl .imageset.global_read_locked_mine, .rtl .imageset.global_unread, .rtl .imageset.global_unread_mine, .rtl .imageset.global_unread_locked, .rtl .imageset.global_unread_locked_mine, .rtl .imageset.pm_read, .rtl .imageset.pm_unread {
 	padding-right: 27px;
 	padding-left: 0;
@@ -906,3 +916,104 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	padding-right: 16px;
 	padding-left: 0;
 }
+
+/**
+* plupload.css
+*/
+
+.rtl .attach-controls {
+	float: left;
+}
+
+/**
+* responsive.css
+*/
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	/* .topiclist lists
+	----------------------------------------*/
+	.rtl ul.topiclist li.header dt, .rtl ul.topiclist li.header dt .list-inner {
+		margin-left: 0 !important;
+		padding-left: 0;
+	}
+
+	.rtl ul.topiclist dt, .rtl ul.topiclist dt .list-inner,
+	.rtl ul.topiclist.missing-column dt, .rtl ul.topiclist.missing-column dt .list-inner,
+	.rtl ul.topiclist.two-long-columns dt, .rtl ul.topiclist.two-long-columns dt .list-inner,
+	.rtl ul.topiclist.two-columns dt, .rtl ul.topiclist.two-columns dt .list-inner {
+		margin-left: 0;
+	}
+
+	.rtl ul.topiclist dt .list-inner.with-mark {
+		padding-left: 34px;
+	}
+
+	/* Forums and topics lists
+	----------------------------------------*/
+	.rtl ul.topiclist.forums dt, .rtl ul.topiclist.topics dt {
+		margin-left: -250px;
+	}
+	.rtl ul.topiclist.forums dt .list-inner, .rtl ul.topiclist.topics dt .list-inner {
+		margin-left: 250px;
+	}
+
+	.rtl ul.topiclist dd.mark {
+		left: 5px;
+		right: auto;
+		text-align: right;
+	}
+
+	@media only screen and (max-width: 550px), only screen and (max-device-width: 550px)
+	{
+		.rtl ul.topiclist.forums dt, .rtl ul.topiclist.topics dt {
+			margin-left: 0;
+		}
+
+		.rtl ul.topiclist.forums dt .list-inner, .rtl ul.topiclist.topics dt .list-inner {
+			margin-left: 0;
+		}
+	}
+
+	.rtl table.responsive.show-header thead, .rtl table.responsive.show-header th:first-child {
+		text-align: right !important;
+	}
+
+	.rtl table.responsive td {
+		text-align: right !important;
+	}
+
+	/* User profile
+	----------------------------------------*/
+	.rtl .column1, .rtl .column2, .rtl .left-box.profile-details {
+		float: none;
+	}
+
+	@media only screen and (max-width: 500px), only screen and (max-device-width: 500px)
+	{
+		.rtl dl.details dt, .rtl dl.details dd {
+			float: none;
+			text-align: right;	
+		}
+
+		.rtl dl.details dd {
+			margin-left: 0;
+			margin-right: 20px;
+		}
+	}
+
+	/* Post
+	----------------------------------------*/
+	.rtl .postprofile, .rtl .postbody, .rtl .search .postbody {
+		float: none;
+	}
+
+	.rtl .post .postprofile {
+		border-width: 0 0 1px 0;
+	}
+
+	.rtl .postprofile .avatar {
+		float: right;
+		margin-left: 5px;
+		margin-right: 0;
+	}
+}

phpBB/styles/prosilver/theme/content.css

@@ -734,14 +734,16 @@ dd.profile-contact {
 
 .profile-contact .dropdown-container {
 	display: inline-block;
-	text-align: left;
-	width: 30px;
 }
 
 .profile-contact .icon_contact {
 	vertical-align: middle;
 }
 
+.profile-contact .dropdown {
+	margin-right: -14px;
+}
+
 .online {
 	background-image: none;
 	background-position: 100% 0;

phpBB/styles/prosilver/theme/responsive.css

@@ -457,11 +457,6 @@ p.rightside {
 	margin-bottom: 0;
 }
 
-.column1, .column2 {
-	width: auto;
-	float: none;
-}
-
 fieldset.quickmod {
 	width: auto;
 	float: none;

phpBB/styles/subsilver2/template/overall_header.html

@@ -156,10 +156,13 @@ function marklist(id, name, state)
 	<div id="menubar">
 		<table width="100%" cellspacing="0">
 		<tr>
-			<td class="genmed">
+			<td class="genmed dropdown-container">
 				<!-- IF S_NOTIFICATIONS_DISPLAY and not S_IS_BOT and S_USER_LOGGED_IN -->
-					<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><img src="{T_THEME_PATH}/images/icon_mini_notification.gif" width="12" height="13" alt="*" /> {L_NOTIFICATIONS} [<strong>{NOTIFICATIONS_COUNT}</strong>]</a>&nbsp;
+					<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger">
-					<div id="notification_list" class="notification_list">
+						<img src="{T_THEME_PATH}/images/icon_mini_notification.gif" width="12" height="13" alt="*" />
+						{L_NOTIFICATIONS} [<strong>{NOTIFICATIONS_COUNT}</strong>]
+					</a>&nbsp;
+					<div id="notification_list" class="notification_list dropdown">
 						<div class="row1 header">
 							{L_NOTIFICATIONS}
 							<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>