From 42a4305f19d45dae8fda57d47809ab301f944f21 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 15 Oct 2013 21:42:08 -0700
Subject: [ticket/11899] Give indication of activity after voting in poll.

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index e678ea8f8c..d2862c2ba3 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -60,7 +60,7 @@
 <div class="clear"></div>
 
 <!-- IF S_HAS_POLL -->
-	<form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" data-overlay="false" class="topic_poll">
+	<form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" class="topic_poll">
 
 	<div class="panel">
 		<div class="inner">
-- 
cgit v1.2.1


From 5d49a8f06e7cb79c4ef3c5ad8ef5cac67e135b68 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 19 Oct 2013 08:51:08 -0700
Subject: [ticket/11935] Fix invalid HTML usage of <label> tag in prosilver

PHPBB3-11935
---
 phpBB/styles/prosilver/template/mcp_forum.html         | 3 ++-
 phpBB/styles/prosilver/template/memberlist_body.html   | 3 ++-
 phpBB/styles/prosilver/template/search_results.html    | 3 ++-
 phpBB/styles/prosilver/template/ucp_pm_viewfolder.html | 3 ++-
 phpBB/styles/prosilver/template/viewforum_body.html    | 3 ++-
 phpBB/styles/prosilver/template/viewtopic_body.html    | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index e5dcb94855..ca8a945e74 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -90,7 +90,8 @@
 		<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
 		<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+		<label>{S_SELECT_SORT_DIR}</label>
+		<input type="submit" name="sort" value="{L_GO}" class="button2" />
 	</fieldset>
 
 	<hr />
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 46b35eae2c..ef7afab9f7 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -143,7 +143,8 @@
 	<!-- IF U_PREVIOUS_PAGE --><a href="{U_PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
 	<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
 	<label for="sk">{L_SELECT_SORT_METHOD}{L_COLON} <select name="sk" id="sk">{S_MODE_SELECT}</select></label>
-	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select> <input type="submit" name="sort" value="{L_SUBMIT}" class="button2" /></label>
+	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
+	<input type="submit" name="sort" value="{L_SUBMIT}" class="button2" />
 </fieldset>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 7603cf4db8..4dad8427de 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -161,7 +161,8 @@
 		<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
 		<!-- IF S_SELECT_SORT_DAYS or S_SELECT_SORT_KEY -->
 			<label><!-- IF S_SHOW_TOPICS -->{L_DISPLAY_POSTS}<!-- ELSE -->{L_SORT_BY}</label><label><!-- ENDIF --> {S_SELECT_SORT_DAYS}<!-- IF S_SELECT_SORT_KEY --></label> <label>{S_SELECT_SORT_KEY}</label>
-			<label>{S_SELECT_SORT_DIR}<!-- ENDIF --> <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+			<label>{S_SELECT_SORT_DIR}<!-- ENDIF --></label>
+			<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		<!-- ENDIF -->
 	</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index 9cbff64a6a..0fe0a0c7e0 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -126,7 +126,8 @@
 		<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
 		<label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-		<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+		<label>{S_SELECT_SORT_DIR}</label>
+		<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
 	</fieldset>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index ecd993d7fb..c09f36ce94 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -200,7 +200,8 @@
 	<!-- IF not S_IS_BOT -->
 			<label>{L_DISPLAY_TOPICS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 			<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
-			<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+			<label>{S_SELECT_SORT_DIR}</label>
+			<input type="submit" name="sort" value="{L_GO}" class="button2" />
 	<!-- ENDIF -->
 		</fieldset>
 	</form>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index e678ea8f8c..6c33ff6612 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -284,7 +284,8 @@
 		<!-- IF U_NEXT_PAGE --><a href="{U_NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
 		<!-- IF not S_IS_BOT -->
 		<label>{L_DISPLAY_POSTS}{L_COLON} {S_SELECT_SORT_DAYS}</label>
-		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
+		<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label> <label>{S_SELECT_SORT_DIR}</label>
+		<input type="submit" name="sort" value="{L_GO}" class="button2" />
 		<!-- ENDIF -->
 	</fieldset>
 
-- 
cgit v1.2.1


From 546332b141dd61f284fd79c4872eb04fc53a987d Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 19 Oct 2013 08:55:13 -0700
Subject: [ticket/11935] Remove obsolete table attributes from Prosilver

cellpadding, cellspacing, border are obsolete table attributes.
They are handled by CSS already using table and .table1

PHPBB3-11935
---
 phpBB/styles/prosilver/template/mcp_front.html                  | 2 +-
 phpBB/styles/prosilver/template/mcp_logs.html                   | 2 +-
 phpBB/styles/prosilver/template/mcp_notes_user.html             | 2 +-
 phpBB/styles/prosilver/template/mcp_post.html                   | 4 ++--
 phpBB/styles/prosilver/template/mcp_warn_front.html             | 4 ++--
 phpBB/styles/prosilver/template/mcp_warn_list.html              | 2 +-
 phpBB/styles/prosilver/template/memberlist_body.html            | 4 ++--
 phpBB/styles/prosilver/template/memberlist_leaders.html         | 2 +-
 phpBB/styles/prosilver/template/search_body.html                | 2 +-
 phpBB/styles/prosilver/template/ucp_groups_manage.html          | 8 ++++----
 phpBB/styles/prosilver/template/ucp_notifications.html          | 2 +-
 phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html | 2 +-
 phpBB/styles/prosilver/template/viewonline_body.html            | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
index 402cfe029a..3f3d6aaf7f 100644
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ b/phpBB/styles/prosilver/template/mcp_front.html
@@ -147,7 +147,7 @@
 
 		<h3>{L_LATEST_LOGS}</h3>
 
-		<table class="table1" cellspacing="0">
+		<table class="table1">
 		<thead>
 		<tr>
 			<th class="name">{L_ACTION}</th>
diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html
index 492c8cf201..b930bbbcc6 100644
--- a/phpBB/styles/prosilver/template/mcp_logs.html
+++ b/phpBB/styles/prosilver/template/mcp_logs.html
@@ -21,7 +21,7 @@
 		</li>
 	</ul>
 
-	<table cellspacing="1" class="table1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_USERNAME}</th>
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index eb954fd11d..9b6c9b2667 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -64,7 +64,7 @@
 		</li>
 	</ul>
 
-	<table cellspacing="1" class="table1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_REPORT_BY}</th>
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index a205164e60..96d9cd0115 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -263,7 +263,7 @@
 				<!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF -->
 			<!-- ENDIF --></p>
 
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 			<thead>
 			<tr>
 				<th class="name">{L_OTHER_USERS}</th>
@@ -284,7 +284,7 @@
 			</tbody>
 			</table>
 
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 			<thead>
 			<tr>
 				<th class="name">{L_IPS_POSTED_FROM}</th>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html
index 5a332cf202..34fd374d5d 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_front.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_front.html
@@ -33,7 +33,7 @@
 	<h3>{L_MOST_WARNINGS}</h3>
 
 	<!-- IF .highest -->
-		<table class="table1" cellspacing="0">
+		<table class="table1">
 		<thead>
 			<tr>
 				<th class="name">{L_USERNAME}</th>
@@ -67,7 +67,7 @@
 	<h3>{L_LATEST_WARNINGS}</h3>
 
 	<!-- IF .latest -->
-		<table class="table1" cellspacing="0">
+		<table class="table1">
 		<thead>
 			<tr>
 				<th class="name">{L_USERNAME}</th>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html
index cdf2aecc0e..731c945fe6 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_list.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_list.html
@@ -21,7 +21,7 @@
 			</li>
 		</ul>
 		
-		<table class="table1" cellspacing="0">
+		<table class="table1">
 		<thead>
 			<tr>
 				<th class="name">{L_USERNAME}</th>
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index ef7afab9f7..a1a9f86b2e 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -55,7 +55,7 @@
 	<div class="forumbg forumbg-table">
 		<div class="inner">
 
-		<table class="table1" cellspacing="1" id="memberlist">
+		<table class="table1" id="memberlist">
 		<thead>
 		<tr>
 			<th class="name"><span class="rank-img"><a href="{U_SORT_RANK}">{L_RANK}</a></span><a href="{U_SORT_USERNAME}"><!-- IF S_SHOW_GROUP and .memberrow -->{L_GROUP_LEADER}<!-- ELSE -->{L_USERNAME}<!-- ENDIF --></a></th>
@@ -85,7 +85,7 @@
 <div class="forumbg forumbg-table">
 	<div class="inner">
 
-	<table class="table1" cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 	<!-- IF not S_LEADERS_SET -->
diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_leaders.html
index d0daa564c1..5c5e9ad174 100644
--- a/phpBB/styles/prosilver/template/memberlist_leaders.html
+++ b/phpBB/styles/prosilver/template/memberlist_leaders.html
@@ -8,7 +8,7 @@
 <div class="forumbg forumbg-table">
 	<div class="inner">
 
-	<table class="table1" cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th class="name"><span class="rank-img">{L_RANK}&nbsp;</span><!-- IF group.U_GROUP --><a href="{group.U_GROUP}">{group.GROUP_NAME}</a><!-- ELSE -->{group.GROUP_NAME}<!-- ENDIF --></th>
diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html
index d4c1f98a2a..3ccad3d91c 100644
--- a/phpBB/styles/prosilver/template/search_body.html
+++ b/phpBB/styles/prosilver/template/search_body.html
@@ -95,7 +95,7 @@
 <div class="forumbg forumbg-table">
 	<div class="inner">
 
-	<table class="table1" cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th colspan="2" class="name">{L_RECENT_SEARCHES}</th>
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index a785d18082..0148959ae1 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -77,7 +77,7 @@
 <!-- ELSEIF S_LIST -->
 
 	<!-- IF .leader -->
-	<table class="table1" cellspacing="1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th class="name">{L_GROUP_LEAD}</th>
@@ -103,7 +103,7 @@
 
 	<!-- BEGIN member -->
 		<!-- IF member.S_PENDING -->
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 			<thead>
 			<tr>
 				<th class="name">{L_GROUP_PENDING}</th>
@@ -119,7 +119,7 @@
 				</tbody>
 				</table>
 			<!-- ENDIF -->
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 			<thead>
 			<tr>
 				<th class="name">{L_GROUP_APPROVED}</th>
@@ -140,7 +140,7 @@
 			</tr>
 		<!-- ENDIF -->
 	<!-- BEGINELSE -->
-		<table class="table1" cellspacing="1">
+		<table class="table1">
 		<thead>
 		<tr>
 			<th class="name">{L_MEMBERS}</th>
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index f71b7aaf56..94e5e7d1e8 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -9,7 +9,7 @@
 		<p>{TITLE_EXPLAIN}</p>
 
 		<!-- IF MODE == 'notification_options' -->
-			<table class="table1" cellspacing="1">
+			<table class="table1">
 				<thead>
 					<th>{L_NOTIFICATION_TYPE}</th>
 					<!-- BEGIN notification_methods -->
diff --git a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
index d8a78b8c6d..bf97434bac 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
@@ -15,7 +15,7 @@
 	<!-- ENDIF -->
 
 	<p>{L_PROFILE_AUTOLOGIN_KEYS}</p><br />
-	<table cellspacing="1" class="table1">
+	<table class="table1">
 	<thead>
 	<tr>
 		<th>{L_MARK}</th>
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html
index 74e891f7d0..59b5f78ac5 100644
--- a/phpBB/styles/prosilver/template/viewonline_body.html
+++ b/phpBB/styles/prosilver/template/viewonline_body.html
@@ -16,7 +16,7 @@
 <div class="forumbg forumbg-table">
 	<div class="inner">
 	
-	<table class="table1" cellspacing="1">
+	<table class="table1">
 
 	<!-- IF .user_row -->
 		<thead>
-- 
cgit v1.2.1


From b9f950054a02658f41ad0285d25ebb41bd92d414 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 23 Oct 2013 14:28:08 +0200
Subject: [ticket/11914] Update plupload to 2.0.0

There are no longer seperate javascript files for each type of uploader.
New filenames have been kept as used inside the plupload package.

PHPBB3-11914
---
 phpBB/styles/prosilver/template/plupload.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html
index 564c1b5c36..3297e5d0b0 100644
--- a/phpBB/styles/prosilver/template/plupload.html
+++ b/phpBB/styles/prosilver/template/plupload.html
@@ -1,6 +1,5 @@
-<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.js"></script>
-<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.html5.js"></script>
-<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.js"></script>
+<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.full.min.js"></script>
+<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 phpbb.plupload = {
-- 
cgit v1.2.1


From cb21c33a14937a87551a0b39c2f814dca187a134 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 27 Sep 2013 16:56:06 +0300
Subject: [ticket/11872] Template syntax typos in oauth templates

PHPBB3-11872
---
 phpBB/styles/prosilver/template/ucp_auth_link_oauth.html  | 2 +-
 phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
index a3e27328cd..18316613b0 100644
--- a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
+++ b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
@@ -20,7 +20,7 @@
 					<dt>&nbsp;</dt>
 					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></dd>
 				</dl>
-			<!-- ENDIF-->
+			<!-- ENDIF -->
 		</fieldset>
 		{oauth.HIDDEN_FIELDS}
 		{S_HIDDEN_FIELDS}
diff --git a/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html b/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html
index 56a4c89125..80564d207b 100644
--- a/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html
+++ b/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html
@@ -23,7 +23,7 @@
 						<tr>
 							<td class="row1"><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></td>
 						</tr>
-					<!-- ENDIF-->
+					<!-- ENDIF -->
 				</table>
 				{oauth.HIDDEN_FIELDS}
 				{S_HIDDEN_FIELDS}
-- 
cgit v1.2.1


From 8c5101a7297ebec1c9cc3ca849f604e5b39ccd9b Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 21 Oct 2013 13:25:27 +0300
Subject: [ticket/11956] Responsive AJAX alerts

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/common.css     | 13 +++++++++++--
 phpBB/styles/prosilver/theme/responsive.css |  5 +++++
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 2c61ecfdea..19077bbc86 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -670,13 +670,22 @@ li.pagination ul {
 	position: fixed;
 	display: none;
 	top: 150px;
-	left: 25%;
-	width: 50%;
+	left: 0;
+	right: 0;
+	max-width: 640px;
+	margin: 0 auto;
 	z-index: 50;
 	padding: 25px;
 	padding: 0 25px 20px 25px;
 }
 
+@media only screen and (max-height: 500px), only screen and (max-device-width: 500px)
+{
+	.phpbb_alert {
+		top: 25px;
+	}
+}
+
 .phpbb_alert .alert_close {
 	display: block;
 	float: right;
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index a9d7b1abc7..c15d9bee4e 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -482,6 +482,11 @@ fieldset.display-actions {
 	white-space: normal;
 }
 
+.phpbb_alert {
+	max-width: none;
+	margin: 0 25px;
+}
+
 @media only screen and (max-width: 500px), only screen and (max-device-width: 500px)
 {
 	p.responsive-center {
-- 
cgit v1.2.1


From b196c9e8fff17703a37ed4b8ceea8b0f7a3eb625 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 21 Oct 2013 13:26:48 +0300
Subject: [ticket/11956] Add assets_version to responsive.css link

PHPBB3-11556
---
 phpBB/styles/prosilver/template/overall_header.html | 2 +-
 phpBB/styles/prosilver/template/simple_header.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 6ab0b3d553..e885503d90 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -29,7 +29,7 @@
 <!-- IF S_ALLOW_CDN --><link href="//fonts.googleapis.com/css?family=Open+Sans:600&amp;subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" type="text/css" media="screen, projection" /><!-- ENDIF -->
 <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
 <link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
-<link href="{T_THEME_PATH}/responsive.css" rel="stylesheet" type="text/css" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)" />
+<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)" />
 
 <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
 	<link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index e922893588..53c86689e0 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -12,7 +12,7 @@
 <!-- IF S_ALLOW_CDN --><link href="//fonts.googleapis.com/css?family=Open+Sans:600&amp;subset=latin,cyrillic-ext,latin-ext,cyrillic,greek-ext,greek,vietnamese" rel="stylesheet" type="text/css" media="screen, projection" /><!-- ENDIF -->
 <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
 <link href="{T_STYLESHEET_LANG_LINK}" rel="stylesheet" type="text/css" media="screen, projection" />
-<link href="{T_THEME_PATH}/responsive.css" rel="stylesheet" type="text/css" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)" />
+<link href="{T_THEME_PATH}/responsive.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="only screen and (max-width: 700px), only screen and (max-device-width: 700px)" />
 
 <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
 	<link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
-- 
cgit v1.2.1


From e660c1a5543c96d299b477731dedf3d144b685a0 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 21 Oct 2013 15:17:48 +0300
Subject: [ticket/11956] Fix member list page

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 6 +++++-
 phpBB/styles/prosilver/theme/responsive.css | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index a2758de9dc..b71ff45a27 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -546,7 +546,7 @@ function insert_single_user(formId, user)
 				i, headersLength;
 
 			// Find each header
-			th.each(function() {
+			th.each(function(column) {
 				var cell = $(this),
 					colspan = parseInt(cell.attr('colspan')),
 					dfn = cell.attr('data-dfn'),
@@ -558,6 +558,10 @@ function insert_single_user(formId, user)
 					headers.push(text);
 				}
 				totalHeaders ++;
+
+				if (dfn && !column) {
+					$this.addClass('show-header');
+				}
 			});
 			
 			headersLength = headers.length;
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index c15d9bee4e..8578e50d1c 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -262,6 +262,10 @@ table.responsive.show-header thead, table.responsive.show-header th:first-child
 	text-align: left !important;
 }
 
+table.responsive.show-header th:first-child span.rank-img {
+	display: none;
+}
+
 table.responsive tr {
 	margin: 2px 0;
 }
-- 
cgit v1.2.1


From af5e25cdf59f5c3e64d18810f1972dfb89be5506 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 21 Oct 2013 15:38:58 +0300
Subject: [ticket/11956] Scale down large avatars

Prevent large avatars from breaking layout on any resolution.

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/content.css | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 7d91d331d6..ad6f27665d 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -711,6 +711,11 @@ fieldset.polls dd div {
 	margin-bottom: 3px;
 }
 
+.postprofile .avatar img {
+	max-width: 90%;
+	height: auto !important;
+}
+
 .online {
 	background-image: none;
 	background-position: 100% 0;
-- 
cgit v1.2.1


From 4188d178f340f5784dfc762d64db29f38eb814f7 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 21 Oct 2013 15:42:35 +0300
Subject: [ticket/11956] Scale down online image for HD display

Scale down online image for HD displays

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/responsive.css | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index 8578e50d1c..aadb98e188 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -442,6 +442,14 @@ fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent {
 	max-height: 32px;
 }
 
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi), (min-resolution: 1.5dppx)
+{
+	/* Scale online image for HD displays */
+	.online {
+		background-size: 40px;
+	}
+}
+
 /* Misc stuff
 ----------------------------------------*/
 h2 {
-- 
cgit v1.2.1


From 08811daa74dec097c5194f14dca2b30a6e11a631 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 21 Oct 2013 16:53:57 +0300
Subject: [ticket/11956] Hide author on mobile devices

Hide duplicate author name in posts on mobile devices

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 82c380354b..763d7edb16 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -193,7 +193,7 @@
 			<!-- ENDIF -->
 		<!-- ENDIF -->
 
-			<p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF -->{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; {postrow.POST_DATE} </p>
+			<p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; </span>{postrow.POST_DATE} </p>
 
 			<!-- IF postrow.S_POST_UNAPPROVED -->
 			<form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}">
-- 
cgit v1.2.1


From 3016e5227b4256b9930e5515dbe849fbdc03e377 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 21 Oct 2013 17:15:32 +0300
Subject: [ticket/11956] Fix responsive jumpbox

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/forms.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index adb8c5e521..f128450955 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -206,7 +206,11 @@ fieldset.forum-selection2 {
 fieldset.jumpbox {
 	text-align: right;
 	margin-top: 15px;
-	height: 2.5em;
+	min-height: 2.5em;
+}
+
+fieldset.jumpbox select {
+	max-width: 50%;
 }
 
 fieldset.quickmod {
-- 
cgit v1.2.1


From 9833354578d9f2dfb9f1438718d84505880438e2 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 21 Oct 2013 17:19:37 +0300
Subject: [ticket/11956] Fix topic actions layout

Fix topic actions layout on mobile devices

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/responsive.css | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index aadb98e188..fc24cd7ed2 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -480,6 +480,12 @@ fieldset.quickmod {
 	text-align: center;
 }
 
+fieldset.display-options label {
+	display: block;
+	clear: both;
+	margin-bottom: 5px;
+}
+
 dl.mini dd.pm-legend {
 	float: left;
 	min-width: 200px;
-- 
cgit v1.2.1


From 9b789662119c2893385801f5c746bedbed52c882 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 21 Oct 2013 21:22:42 +0300
Subject: [ticket/11956] Fix errors in drafts.html

PHPBB3-11956
---
 phpBB/styles/prosilver/template/drafts.html | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/drafts.html b/phpBB/styles/prosilver/template/drafts.html
index b6e6a7f5b7..7620f2374c 100644
--- a/phpBB/styles/prosilver/template/drafts.html
+++ b/phpBB/styles/prosilver/template/drafts.html
@@ -13,26 +13,28 @@
 <div class="<!-- IF not S_PRIVMSGS -->forumbg<!-- ELSE -->panel<!-- ENDIF -->">
 	<div class="inner">
 
-	<ul class="topiclist">
+	<ul class="topiclist two-long-columns">
 		<li class="header">
 			<dl>
 				<dt>{L_LOAD_DRAFT}</dt>
-				<dd class="posted">{L_SAVE_DATE}</dd>
+				<dd class="info">{L_SAVE_DATE}</dd>
 			</dl>
 		</li>
 	</ul>
-	<ul class="topiclist<!-- IF not S_PRIVMSGS --> topics<!-- ELSE --> cplist<!-- ENDIF -->">
+	<ul class="topiclist two-long-columns<!-- IF not S_PRIVMSGS --> topics<!-- ELSE --> cplist<!-- ENDIF -->">
 
 	<!-- BEGIN draftrow -->
 	<li class="row<!-- IF draftrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 		<dl>
 			<dt>
-				<a href="{draftrow.U_INSERT}" title="{L_LOAD_DRAFT}" class="topictitle">{draftrow.DRAFT_SUBJECT}</a><br />
-				<!-- IF not S_PRIVMSGS --><!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
-				<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
-				<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --><!-- ENDIF -->
+				<div class="list-inner">
+					<a href="{draftrow.U_INSERT}" title="{L_LOAD_DRAFT}" class="topictitle">{draftrow.DRAFT_SUBJECT}</a><br />
+					<!-- IF not S_PRIVMSGS --><!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
+					<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
+					<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --><!-- ENDIF -->
+				</div>
 			</dt>
-			<dd class="posted">{draftrow.DATE}</dd>
+			<dd class="info"><span>{draftrow.DATE}</span></dd>
 		</dl>
 	</li>
 	<!-- END draftrow -->
-- 
cgit v1.2.1


From 5c5137818607777367f6d9a970f668c0c6d061e7 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Mon, 21 Oct 2013 21:28:32 +0300
Subject: [ticket/11956] Move responsive *CP navigation

Move responsive *CP navigation to cp.css because
layout has to change at width higher than 700px

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/cp.css         | 38 +++++++++++++++++++++++++++++
 phpBB/styles/prosilver/theme/responsive.css | 35 --------------------------
 2 files changed, 38 insertions(+), 35 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index e0863f7458..f6bb1d0623 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -417,3 +417,41 @@ ol.def-rules li {
 	border: 1px solid transparent;
 	text-align: center;
 }
+
+/* Responsive *CP navigation
+----------------------------------------*/
+@media only screen and (max-width: 900px), only screen and (max-device-width: 900px)
+{
+	.nojs #tabs a span, .nojs #minitabs a span {
+		max-width: 40px; 
+		overflow: hidden;
+		text-overflow: ellipsis;
+		letter-spacing: -.5px;
+	}
+
+	#cp-menu, #navigation, #cp-main {
+		float: none;
+		width: auto;
+		margin: 0;
+	}
+
+	#navigation { 
+		padding: 0; 
+		margin: 0 auto;
+		max-width: 320px;
+	}
+
+	#navigation a {
+		background-image: none;
+	}
+
+	#navigation li:first-child a {
+		border-top-left-radius: 5px;
+		border-top-right-radius: 5px;
+	}
+
+	#navigation li:last-child a {
+		border-bottom-left-radius: 5px;
+		border-bottom-right-radius: 5px;
+	}
+}
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index fc24cd7ed2..83233bf6aa 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -211,41 +211,6 @@ ul.topiclist.forums dd.topics dfn, ul.topiclist.topics dd.posts dfn {
 	margin: 5px 0;
 }
 
-/* *CP navigation
-----------------------------------------*/
-.nojs #tabs a span, .nojs #minitabs a span {
-	max-width: 40px; 
-	overflow: hidden;
-	text-overflow: ellipsis;
-	letter-spacing: -.5px;
-}
-
-#cp-menu, #navigation, #cp-main {
-	float: none;
-	width: auto;
-	margin: 0;
-}
-
-#navigation { 
-	padding: 0; 
-	margin: 0 auto;
-	max-width: 320px;
-}
-
-#navigation a {
-	background-image: none;
-}
-
-#navigation li:first-child a {
-	border-top-left-radius: 5px;
-	border-top-right-radius: 5px;
-}
-
-#navigation li:last-child a {
-	border-bottom-left-radius: 5px;
-	border-bottom-right-radius: 5px;
-}
-
 /* Responsive tables
 ----------------------------------------*/
 table.responsive, table.responsive tbody, table.responsive tr, table.responsive td {
-- 
cgit v1.2.1


From d2d4438db50e54b9ad61731b5d92d01bd057309c Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 22 Oct 2013 00:11:48 +0300
Subject: [ticket/11956] Adjustments to responsive topiclist lists

Changes behavior of topiclist lists on mobile devices.
Shows/hides certain elements in each row to present all
important information to visitor on mobile devices, such
as last post when viewing forum instead of first post.

Also fixes topiclist layout bug in drafts.html

PHPBB3-11956
---
 phpBB/styles/prosilver/template/drafts.html        |  3 +
 phpBB/styles/prosilver/template/forum_fn.js        | 76 ++++++++++++++++++++++
 .../styles/prosilver/template/forumlist_body.html  | 10 +++
 phpBB/styles/prosilver/template/mcp_forum.html     | 10 ++-
 phpBB/styles/prosilver/template/mcp_front.html     |  6 +-
 phpBB/styles/prosilver/template/mcp_queue.html     |  2 +-
 phpBB/styles/prosilver/template/mcp_reports.html   |  7 ++
 .../styles/prosilver/template/ucp_attachments.html |  2 +-
 .../prosilver/template/ucp_groups_manage.html      |  2 +-
 .../prosilver/template/ucp_main_bookmarks.html     | 10 ++-
 .../styles/prosilver/template/ucp_main_drafts.html |  4 ++
 .../styles/prosilver/template/ucp_main_front.html  |  9 ++-
 .../prosilver/template/ucp_main_subscribed.html    | 21 +++++-
 .../prosilver/template/ucp_pm_viewfolder.html      |  2 +-
 .../styles/prosilver/template/viewforum_body.html  | 15 ++++-
 phpBB/styles/prosilver/theme/responsive.css        | 28 ++------
 16 files changed, 170 insertions(+), 37 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/drafts.html b/phpBB/styles/prosilver/template/drafts.html
index 7620f2374c..4b2e1bf0c6 100644
--- a/phpBB/styles/prosilver/template/drafts.html
+++ b/phpBB/styles/prosilver/template/drafts.html
@@ -32,6 +32,9 @@
 					<!-- IF not S_PRIVMSGS --><!-- IF draftrow.S_LINK_TOPIC -->{L_TOPIC}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
 					<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
 					<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF --><!-- ENDIF -->
+					<div class="responsive-show" style="display: none;">
+						{L_SAVE_DATE}{L_COLON} <strong>{draftrow.DATE}</strong>
+					</div>
 				</div>
 			</dt>
 			<dd class="info"><span>{draftrow.DATE}</span></dd>
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index b71ff45a27..a425e9e1ad 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -536,6 +536,82 @@ function insert_single_user(formId, user)
 			$(window).resize(check);
 		});
 
+		// Responsive topic lists
+		$('.topiclist.responsive-show-all > li > dl').each(function() {
+			var $this = $(this),
+				block = $this.find('dt .responsive-show:last-child'),
+				first = true;
+
+			if (!block.length) {
+				$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
+				block = $this.find('dt .responsive-show:last-child');
+			}
+			else {
+				first = (block.text().trim().length == 0);
+			}
+
+			$this.find('dd').not('.mark').each(function() {
+				var column = $(this),
+					children = column.children(),
+					html = column.html();
+
+				if (children.length == 1 && children.text() == column.text()) {
+					html = children.html();
+				}
+
+				block.append((first ? '' : '<br />') + html);
+
+				first = false;
+			});
+		});
+
+		$('.topiclist.responsive-show-columns').each(function() {
+			var list = $(this),
+				headers = [],
+				headersLength = 0;
+
+			list.prev('.topiclist').find('li.header dd').not('.mark').each(function() {
+				headers.push($(this).text());
+				headersLength ++;
+			});
+
+			if (!headersLength) {
+				return;
+			}
+
+			list.find('dl').each(function() {
+				var $this = $(this),
+					block = $this.find('dt .responsive-show:last-child'),
+					first = true;
+
+				if (!block.length) {
+					$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
+					block = $this.find('dt .responsive-show:last-child');
+				}
+				else {
+					first = (block.text().trim().length == 0);
+				}
+
+				$this.find('dd').not('.mark').each(function(i) {
+					var column = $(this),
+						children = column.children(),
+						html = column.html();
+
+					if (children.length == 1 && children.text() == column.text()) {
+						html = children.html();
+					}
+
+					if (i < headersLength) {
+						html = headers[i] + ': <strong>' + html + '</strong>';
+					}
+
+					block.append((first ? '' : '<br />') + html);
+
+					first = false;
+				});
+			});
+		});
+
 		// Responsive tables
 		$('table.table1').not('.not-responsive').each(function() {
 			var $this = $(this),
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 9fb6b3d951..f9019b4fe3 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -42,6 +42,16 @@
 								<a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW -->,<!-- ENDIF -->
 							<!-- END subforum -->
 						<!-- ENDIF -->
+
+						<!-- IF not S_IS_BOT -->
+						<div class="responsive-show" style="display: none;">
+							<!-- IF forumrow.CLICKS -->
+								{L_REDIRECTS}{L_COLON} <strong>{forumrow.CLICKS}</strong>
+							<!-- ELSEIF not forumrow.S_IS_LINK and forumrow.TOPICS -->
+								{L_TOPICS}{L_COLON} <strong>{forumrow.TOPICS}</strong>
+							<!-- ENDIF -->
+						</div>
+						<!-- ENDIF -->
 					</div>
 				</dt>
 				<!-- IF forumrow.CLICKS -->
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index e5dcb94855..4090d979b2 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -63,7 +63,15 @@
 						</ul>
 					</div>
 					<!-- ENDIF -->
-					<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+					<div class="responsive-hide">
+						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+						{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+					</div>
+					<div class="responsive-show" style="display: none;">
+						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+						{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; {topicrow.LAST_POST_TIME}<br />
+						{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong>
+					</div>
 
 					</div>
 				</dt>
diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
index 402cfe029a..6826b0af52 100644
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ b/phpBB/styles/prosilver/template/mcp_front.html
@@ -21,7 +21,7 @@
 					</dl>
 				</li>
 			</ul>
-			<ul class="topiclist cplist missing-column">
+			<ul class="topiclist cplist missing-column responsive-show-all">
 
 			<!-- BEGIN unapproved -->
 			<li class="row<!-- IF unapproved.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
@@ -75,7 +75,7 @@
 					</dl>
 				</li>
 			</ul>
-			<ul class="topiclist cplist two-long-columns">
+			<ul class="topiclist cplist two-long-columns responsive-show-all">
 
 			<!-- BEGIN report -->
 			<li class="row<!-- IF report.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
@@ -116,7 +116,7 @@
 					</dl>
 				</li>
 			</ul>
-			<ul class="topiclist cplist two-long-columns">
+			<ul class="topiclist cplist two-long-columns responsive-show-all">
 
 			<!-- BEGIN pm_report -->
 			<li class="row<!-- IF pm_report.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html
index c2d39eff98..461d5982db 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -35,7 +35,7 @@
 				</dl>
 			</li>
 			</ul>
-			<ul class="topiclist cplist missing-column">
+			<ul class="topiclist cplist missing-column responsive-show-all">
 
 		<!-- BEGIN postrow -->
 
diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html
index 902744fe25..ffa82d5e0e 100644
--- a/phpBB/styles/prosilver/template/mcp_reports.html
+++ b/phpBB/styles/prosilver/template/mcp_reports.html
@@ -48,6 +48,9 @@
 							<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.PM_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br />
 							<span>{L_MESSAGE_BY_AUTHOR} {postrow.PM_AUTHOR_FULL} &raquo; {postrow.PM_TIME}</span><br />
 							<span>{L_MESSAGE_TO} {postrow.RECIPIENTS}</span>
+							<div class="responsive-show" style="display: none;">
+								{L_REPORTER}{L_COLON} {postrow.REPORTER_FULL} &laquo; {postrow.REPORT_TIME}
+							</div>
 						</div>
 					</dt>
 					<dd class="moderation">
@@ -58,6 +61,10 @@
 						<div class="list-inner">
 							<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a> {postrow.ATTACH_ICON_IMG}<br />
 							<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} &raquo; {postrow.POST_TIME}</span>
+							<div class="responsive-show" style="display: none;">
+								{L_REPORTER}{L_COLON} {postrow.REPORTER_FULL} &laquo; {postrow.REPORT_TIME}<br />
+								<!-- IF postrow.U_VIEWFORUM -->{L_FORUM}{L_COLON} <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF -->
+							</div>
 						</div>
 					</dt>
 					<dd class="moderation">
diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html
index feb04278dc..ed39e80c12 100644
--- a/phpBB/styles/prosilver/template/ucp_attachments.html
+++ b/phpBB/styles/prosilver/template/ucp_attachments.html
@@ -31,7 +31,7 @@
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist">
+		<ul class="topiclist cplist responsive-show-columns">
 
 		<!-- BEGIN attachrow -->
 		<li class="row<!-- IF attachrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index a785d18082..3053330f61 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -214,7 +214,7 @@
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist two-long-columns">
+		<ul class="topiclist cplist two-long-columns responsive-show-all">
 
 		<!-- BEGIN leader -->
 		<li class="row<!-- IF attachrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index 017fadad77..477b06249e 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -54,7 +54,15 @@
 							</ul>
 						</div>
 						<!-- ENDIF -->
-						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+						<div class="responsive-hide">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+						</div>
+						<div class="responsive-show" style="display: none;">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo;
+							<a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+						</div>
 					</div>
 				</dt>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
diff --git a/phpBB/styles/prosilver/template/ucp_main_drafts.html b/phpBB/styles/prosilver/template/ucp_main_drafts.html
index 723186e20c..52ad5b503b 100644
--- a/phpBB/styles/prosilver/template/ucp_main_drafts.html
+++ b/phpBB/styles/prosilver/template/ucp_main_drafts.html
@@ -45,6 +45,10 @@
 							<!-- ELSEIF draftrow.S_LINK_FORUM -->{L_FORUM}{L_COLON} <a href="{draftrow.U_VIEW}">{draftrow.TITLE}</a>
 							<!-- ELSEIF S_PRIVMSGS -->
 							<!-- ELSE -->{L_NO_TOPIC_FORUM}<!-- ENDIF -->
+							<div class="responsive-show" style="display: none;">
+								{L_SAVE_DATE}{L_COLON} <strong>{draftrow.DATE}</strong><br />
+								<!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a> &bull; <!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a>
+							</div>
 						</div>
 					</dt>
 					<dd class="info"><span>{draftrow.DATE}<br /><!-- IF draftrow.U_INSERT --><a href="{draftrow.U_INSERT}">{L_LOAD_DRAFT}</a> &bull; <!-- ENDIF --><a href="{draftrow.U_VIEW_EDIT}">{L_VIEW_EDIT}</a></span></dd>
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
index 1e26e43772..fa3291cd6c 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -31,7 +31,14 @@
 							</ul>
 						</div>
 						<!-- ENDIF -->
-						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+						<div class="responsive-hide">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+						</div>
+						<div class="responsive-show" style="display: none;">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+						</div>
 					</div>
 				</dt>
 				<dd class="lastpost"><span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index 90fa76cefc..7344a4af1a 100755
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -23,7 +23,17 @@
 	<!-- BEGIN forumrow -->
 		<li class="row<!-- IF forumrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<dl class="icon {forumrow.FORUM_IMG_STYLE}">
-				<dt><div class="list-inner"><a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br />{forumrow.FORUM_DESC}</div></dt>
+				<dt>
+					<div class="list-inner">
+						<a href="{forumrow.U_VIEWFORUM}" class="forumtitle">{forumrow.FORUM_NAME}</a><br />
+						{forumrow.FORUM_DESC}
+						<!-- IF forumrow.LAST_POST_TIME -->
+						<div class="responsive-show" style="display: none;">
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}">{forumrow.LAST_POST_TIME}</a>
+						</div>
+						<!-- ENDIF -->
+					</div>
+				</dt>
 				<dd class="lastpost"><!-- IF forumrow.LAST_POST_TIME --><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL}
 					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{forumrow.LAST_POST_TIME}</span>
 					<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF -->
@@ -79,7 +89,14 @@
 							</ul>
 						</div>
 						<!-- ENDIF -->
-						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+						<div class="responsive-hide">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+						</div>
+						<div class="responsive-show" style="display: none;">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+						</div>
 					</div>
 				</dt>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index 9cbff64a6a..a1012689f0 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -53,7 +53,7 @@
 				</dl>
 			</li>
 		</ul>
-		<ul class="topiclist cplist pmlist <!-- IF S_SHOW_RECIPIENTS -->missing-column<!-- ELSE -->two-columns<!-- ENDIF -->">
+		<ul class="topiclist cplist pmlist responsive-show-all <!-- IF S_SHOW_RECIPIENTS -->missing-column<!-- ELSE -->two-columns<!-- ENDIF -->">
 
 		<!-- BEGIN messagerow -->
 			<li class="row<!-- IF messagerow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF messagerow.PM_CLASS --> {messagerow.PM_CLASS}<!-- ENDIF -->">
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 04dc00aae2..360d9ae789 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -163,8 +163,19 @@
 							</ul>
 						</div>
 						<!-- ENDIF -->
-						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
-						<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> &raquo; {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
+						<div class="responsive-hide">
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> &raquo; {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
+						</div>
+						<!-- IF not S_IS_BOT -->
+						<div class="responsive-show" style="display: none;">
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><br />{L_POSTED} {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
+							<!-- IF topicrow.REPLIES --><br />{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong><!-- ENDIF -->
+						</div>
+						<!-- ENDIF -->
+
 						<!-- EVENT topiclist_row_append -->
 					</div>
 				</dt>
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index 83233bf6aa..322f11e291 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -133,35 +133,12 @@ ul.topiclist.forums dt, ul.topiclist.topics dt {
 }
 ul.topiclist.forums dt .list-inner, ul.topiclist.topics dt .list-inner {
 	margin-right: 250px;
-	padding-bottom: 18px;
 }
 
 ul.topiclist.forums dd.lastpost, ul.topiclist.topics dd.lastpost {
 	display: block;
 }
 
-ul.topiclist.forums dd.topics, ul.topiclist.topics dd.posts {
-	display: block;
-	position: absolute;
-	left: 45px;
-	right: 0;
-	bottom: 0;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	min-height: 0;
-	height: auto;
-	border-width: 0;
-	margin: 0;
-	padding: 5px 0;
-	width: auto;
-	min-width: 0;
-	text-align: left;
-	font-weight: bold;
-	font-size: 1.2em;
-	line-height: 1em;
-}
-
 ul.topiclist dd.mark {
 	display: block;
 	position: absolute;
@@ -196,6 +173,11 @@ ul.topiclist.forums dd.topics dfn, ul.topiclist.topics dd.posts dfn {
 	}
 }
 
+li.row .responsive-show strong {
+	font-weight: bold;
+	color: inherit;
+}
+
 /* Notifications list
 ----------------------------------------*/
 @media only screen and (max-width: 350px), only screen and (max-device-width: 350px)
-- 
cgit v1.2.1


From 431b4acb36a2087b58795f0951a786008dc3b943 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 22 Oct 2013 00:41:05 +0300
Subject: [ticket/11956] Move JS to reusable function

Move JS to reusable function that can be ran
for all content added with JavaScript such as
results of AJAX forms

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 797 +++++++++++++++-------------
 1 file changed, 424 insertions(+), 373 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index a425e9e1ad..cb8ee2f9df 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -410,138 +410,203 @@ function insert_single_user(formId, user)
 }
 
 /**
-* Run onload functions
+* Parse document block
 */
-(function($) {
-	$(document).ready(function() {
-		// Swap .nojs and .hasjs
-		$('#phpbb.nojs').toggleClass('nojs hasjs');
-
-		// Focus forms
-		$('form[data-focus]:first').each(function() {
-			$('#' + this.getAttribute('data-focus')).focus();
-		});
+function parse_document(container) 
+{
+	var test = document.createElement('div'),
+		oldBrowser = (typeof test.style.borderRadius == 'undefined');
 
-		// Reset avatar dimensions when changing URL or EMAIL
-		$('input[data-reset-on-edit]').bind('keyup', function() {
-			$(this.getAttribute('data-reset-on-edit')).val('');
-		});
+	delete test;
 
-		// Pagination
-		$('a.pagination-trigger').click(function() {
-			jumpto($(this));
-		});
+	/**
+	* Reset avatar dimensions when changing URL or EMAIL
+	*/
+	container.find('input[data-reset-on-edit]').bind('keyup', function() {
+		$(this.getAttribute('data-reset-on-edit')).val('');
+	});
 
-		// Adjust HTML code for IE8 and older versions		
-		var test = document.createElement('div'),
-			oldBrowser = (typeof test.style.borderRadius == 'undefined');
-		delete test;
+	/**
+	* Pagination
+	*/
+	container.find('a.pagination-trigger').click(function() {
+		jumpto($(this));
+	});
 
-		if (oldBrowser) {
-			// Fix .linklist.bulletin lists
-			$('ul.linklist.bulletin li:first-child, ul.linklist.bulletin li.rightside:last-child').addClass('no-bulletin');
+	/**
+	* Adjust HTML code for IE8 and older versions		
+	*/
+	if (oldBrowser) {
+		// Fix .linklist.bulletin lists
+		container.find('ul.linklist.bulletin li:first-child, ul.linklist.bulletin li.rightside:last-child').addClass('no-bulletin');
 
-			// Do not run functions below for old browsers
-			return;
-		}
+		// Do not run functions below for old browsers
+		return;
+	}
 
-		// Adjust topiclist lists with check boxes
-		$('ul.topiclist dd.mark').siblings('dt').children('.list-inner').addClass('with-mark');
+	/**
+	* Resize navigation block to keep all links on same line
+	*/
+	container.find('.navlinks').each(function() {
+		var $this = $(this),
+			left = $this.children().not('.rightside'),
+			right = $this.children('.rightside');
 
-		// Resize navigation block to keep all links on same line
-		$('.navlinks').each(function() {
-			var $this = $(this),
-				left = $this.children().not('.rightside'),
-				right = $this.children('.rightside');
+		if (left.length !== 1 || !right.length) return;
 
-			if (left.length !== 1 || !right.length) return;
+		function resize() {
+			var width = 0,
+				diff = left.outerWidth(true) - left.width();
 
-			function resize() {
-				var width = 0,
-					diff = left.outerWidth(true) - left.width();
+			right.each(function() {
+				width += $(this).outerWidth(true);
+			});
+			left.css('max-width', Math.floor($this.width() - width - diff) + 'px');
+		}
 
-				right.each(function() {
-					width += $(this).outerWidth(true);
-				});
-				left.css('max-width', Math.floor($this.width() - width - diff) + 'px');
-			}
+		resize();
+		$(window).resize(resize);
+	});
 
-			resize();
-			$(window).resize(resize);
+	/**
+	* Makes breadcrumbs responsive
+	*/
+	container.find('.breadcrumbs:not(.skip-responsive, .linklist.leftside .breadcrumbs)').each(function() {
+		var $this = $(this),
+			$body = $('body'),
+			links = $this.find('.crumb'),
+			length = links.length,
+			classes = ['wrapped-wide', 'wrapped-medium', 'wrapped-small'],
+			classesLength = classes.length,
+			maxHeight = 0,
+			lastWidth = false,
+			wrapped = false;
+
+		// Test height by setting nowrap
+		$this.css('white-space', 'nowrap');
+		maxHeight = $this.height() + 1;
+		$this.css('white-space', '');
+
+		// Set tooltips
+		$this.find('a').each(function() {
+			var $link = $(this);
+			$link.attr('title', $link.text());
 		});
 
-		// Responsive breadcrumbs
-		$('.breadcrumbs:not(.skip-responsive, .linklist.leftside .breadcrumbs)').each(function() {
-			var $this = $(this),
-				$body = $('body'),
-				links = $this.find('.crumb'),
-				length = links.length,
-				classes = ['wrapped-wide', 'wrapped-medium', 'wrapped-small'],
-				classesLength = classes.length,
-				maxHeight = 0,
-				lastWidth = false,
-				wrapped = false;
-
-			// Test height by setting nowrap
-			$this.css('white-space', 'nowrap');
-			maxHeight = $this.height() + 1;
-			$this.css('white-space', '');
-
-			// Set tooltips
-			$this.find('a').each(function() {
-				var $link = $(this);
-				$link.attr('title', $link.text());
-			});
+		// Funciton that checks breadcrumbs
+		function check() {
+			var height = $this.height(),
+				width = $body.width(),
+				link, i, j;
 
-			// Funciton that checks breadcrumbs
-			function check() {
-				var height = $this.height(),
-					width = $body.width(),
-					link, i, j;
+			if (height <= maxHeight) {
+				if (!wrapped || lastWidth === false || lastWidth >= width) {
+					lastWidth = width;
+					return;
+				}
+			}
+			lastWidth = width;
 
-				if (height <= maxHeight) {
-					if (!wrapped || lastWidth === false || lastWidth >= width) {
-						lastWidth = width;
-						return;
-					}
+			if (wrapped) {
+				$this.removeClass('wrapped').find('.crumb.wrapped').removeClass('wrapped ' + classes.join(' '));
+				wrapped = false;
+				if ($this.height() <= maxHeight) {
+					return;
 				}
-				lastWidth = width;
+			}
 
-				if (wrapped) {
-					$this.removeClass('wrapped').find('.crumb.wrapped').removeClass('wrapped ' + classes.join(' '));
-					wrapped = false;
+			wrapped = true;
+			$this.addClass('wrapped');
+			if ($this.height() <= maxHeight) {
+				return;
+			}
+
+			for (i = 0; i < classesLength; i ++) {
+				for (j = length - 1; j >= 0; j --) {
+					links.eq(j).addClass('wrapped ' + classes[i]);
 					if ($this.height() <= maxHeight) {
 						return;
 					}
 				}
+			}
+		}
 
-				wrapped = true;
-				$this.addClass('wrapped');
-				if ($this.height() <= maxHeight) {
-					return;
-				}
+		// Run function and set event
+		check();
+		$(window).resize(check);
+	});
 
-				for (i = 0; i < classesLength; i ++) {
-					for (j = length - 1; j >= 0; j --) {
-						links.eq(j).addClass('wrapped ' + classes[i]);
-						if ($this.height() <= maxHeight) {
-							return;
-						}
-					}
-				}
+	/**
+	* Adjust topiclist lists with check boxes
+	*/
+	container.find('ul.topiclist dd.mark').siblings('dt').children('.list-inner').addClass('with-mark');
+
+	/**
+	* Appends contents of all extra columns to first column in
+	* .topiclist lists for mobile devices. Copies contents as is.
+	*
+	* To add that functionality to .topiclist list simply add
+	* responsive-show-all to list of classes
+	*/
+	container.find('.topiclist.responsive-show-all > li > dl').each(function() {
+		var $this = $(this),
+			block = $this.find('dt .responsive-show:last-child'),
+			first = true;
+
+		// Create block that is visible only on mobile devices
+		if (!block.length) {
+			$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
+			block = $this.find('dt .responsive-show:last-child');
+		}
+		else {
+			first = (block.text().trim().length == 0);
+		}
+
+		// Copy contents of each column
+		$this.find('dd').not('.mark').each(function() {
+			var column = $(this),
+				children = column.children(),
+				html = column.html();
+
+			if (children.length == 1 && children.text() == column.text()) {
+				html = children.html();
 			}
 
-			// Run function and set event
-			check();
-			$(window).resize(check);
+			block.append((first ? '' : '<br />') + html);
+
+			first = false;
 		});
+	});
+
+	/**
+	* Same as above, but prepends text from header to each
+	* column before contents of that column.
+	*
+	* To add that functionality to .topiclist list simply add
+	* responsive-show-columns to list of classes
+	*/
+	container.find('.topiclist.responsive-show-columns').each(function() {
+		var list = $(this),
+			headers = [],
+			headersLength = 0;
+
+		// Find all headers, get contents
+		list.prev('.topiclist').find('li.header dd').not('.mark').each(function() {
+			headers.push($(this).text());
+			headersLength ++;
+		});
+
+		if (!headersLength) {
+			return;
+		}
 
-		// Responsive topic lists
-		$('.topiclist.responsive-show-all > li > dl').each(function() {
+		// Parse each row
+		list.find('dl').each(function() {
 			var $this = $(this),
 				block = $this.find('dt .responsive-show:last-child'),
 				first = true;
 
+			// Create block that is visible only on mobile devices
 			if (!block.length) {
 				$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
 				block = $this.find('dt .responsive-show:last-child');
@@ -550,7 +615,8 @@ function insert_single_user(formId, user)
 				first = (block.text().trim().length == 0);
 			}
 
-			$this.find('dd').not('.mark').each(function() {
+			// Copy contents of each column
+			$this.find('dd').not('.mark').each(function(i) {
 				var column = $(this),
 					children = column.children(),
 					html = column.html();
@@ -559,326 +625,327 @@ function insert_single_user(formId, user)
 					html = children.html();
 				}
 
+				// Prepend contents of matching header before contents of column
+				if (i < headersLength) {
+					html = headers[i] + ': <strong>' + html + '</strong>';
+				}
+
 				block.append((first ? '' : '<br />') + html);
 
 				first = false;
 			});
 		});
+	});
 
-		$('.topiclist.responsive-show-columns').each(function() {
-			var list = $(this),
-				headers = [],
-				headersLength = 0;
-
-			list.prev('.topiclist').find('li.header dd').not('.mark').each(function() {
-				headers.push($(this).text());
-				headersLength ++;
-			});
-
-			if (!headersLength) {
-				return;
+	/**
+	* Responsive tables
+	*/
+	container.find('table.table1').not('.not-responsive').each(function() {
+		var $this = $(this),
+			th = $this.find('thead > tr > th'),
+			columns = th.length,
+			headers = [],
+			totalHeaders = 0,
+			i, headersLength;
+
+		// Find each header
+		th.each(function(column) {
+			var cell = $(this),
+				colspan = parseInt(cell.attr('colspan')),
+				dfn = cell.attr('data-dfn'),
+				text = dfn ? dfn : cell.text();
+
+			colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
+
+			for (i=0; i<colspan; i++) {
+				headers.push(text);
 			}
+			totalHeaders ++;
 
-			list.find('dl').each(function() {
-				var $this = $(this),
-					block = $this.find('dt .responsive-show:last-child'),
-					first = true;
-
-				if (!block.length) {
-					$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
-					block = $this.find('dt .responsive-show:last-child');
-				}
-				else {
-					first = (block.text().trim().length == 0);
-				}
-
-				$this.find('dd').not('.mark').each(function(i) {
-					var column = $(this),
-						children = column.children(),
-						html = column.html();
+			if (dfn && !column) {
+				$this.addClass('show-header');
+			}
+		});
+		
+		headersLength = headers.length;
 
-					if (children.length == 1 && children.text() == column.text()) {
-						html = children.html();
-					}
+		// Add header text to each cell as <dfn>
+		$this.addClass('responsive');
 
-					if (i < headersLength) {
-						html = headers[i] + ': <strong>' + html + '</strong>';
-					}
+		if (totalHeaders < 2) {
+			$this.addClass('show-header');
+			return;
+		}
 
-					block.append((first ? '' : '<br />') + html);
+		$this.find('tbody > tr').each(function() {
+			var row = $(this),
+				cells = row.children('td'),
+				column = 0;
 
-					first = false;
-				});
-			});
-		});
+			if (cells.length == 1) {
+				row.addClass('big-column');
+				return;
+			}
 
-		// Responsive tables
-		$('table.table1').not('.not-responsive').each(function() {
-			var $this = $(this),
-				th = $this.find('thead > tr > th'),
-				columns = th.length,
-				headers = [],
-				totalHeaders = 0,
-				i, headersLength;
-
-			// Find each header
-			th.each(function(column) {
+			cells.each(function() {
 				var cell = $(this),
 					colspan = parseInt(cell.attr('colspan')),
-					dfn = cell.attr('data-dfn'),
-					text = dfn ? dfn : cell.text();
-
-				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
+					text = cell.text().trim();
 
-				for (i=0; i<colspan; i++) {
-					headers.push(text);
+				if (headersLength <= column) {
+					return;
 				}
-				totalHeaders ++;
 
-				if (dfn && !column) {
-					$this.addClass('show-header');
+				if (text.length && text !== '-') {
+					cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
+				}
+				else {
+					cell.addClass('empty');
 				}
+
+				colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
+				column += colspan;
 			});
-			
-			headersLength = headers.length;
+		});
+	});
 
-			// Add header text to each cell as <dfn>
-			$this.addClass('responsive');
+	/**
+	* Hide empty responsive tables
+	*/
+	container.find('table.responsive > tbody').each(function() {
+		var items = $(this).children('tr');
+		if (items.length == 0)
+		{
+			$(this).parent('table:first').addClass('responsive-hide');
+		}
+	});
 
-			if (totalHeaders < 2) {
-				$this.addClass('show-header');
+	/**
+	* Responsive link lists
+	*/
+	container.find('.linklist:not(.navlinks, .skip-responsive), .postbody ul.profile-icons:not(.skip-responsive)').each(function() {
+		var $this = $(this),
+			$body = $('body'),
+			links = $this.children().not('.skip-responsive'),
+			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><ul class="responsive-popup" style="display:none;" /></li>',
+			// List of items that should be hidden last
+			filterString = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .breadcrumbs, .edit-icon, .quote-icon',
+			filtered = links.filter(filterString);
+
+		if (links.is('.rightside'))
+		{
+			links.filter('.rightside:first').before(html);
+		}
+		else
+		{
+			$this.append(html);
+		}
+
+		var toggle = $this.children('.responsive-menu'),
+			toggleLink = toggle.find('a.responsive-menu-link'),
+			menu = toggle.find('ul.responsive-popup'),
+			lastWidth = false,
+			compact = false,
+			responsive = false,
+			copied = false;
+
+		function check() {
+			var width = $body.width();
+			if (responsive && width <= lastWidth) {
 				return;
 			}
 
-			$this.find('tbody > tr').each(function() {
-				var row = $(this),
-					cells = row.children('td'),
-					column = 0;
-
-				if (cells.length == 1) {
-					row.addClass('big-column');
-					return;
-				}
-
-				cells.each(function() {
-					var cell = $(this),
-						colspan = parseInt(cell.attr('colspan')),
-						text = cell.text().trim();
-
-					if (headersLength <= column) {
-						return;
-					}
+			// Reset responsive and compact layout
+			if (responsive) {
+				responsive = false;
+				$this.removeClass('responsive');
+				links.css('display', '');
+				toggle.css('display', 'none');
+			}
 
-					if (text.length && text !== '-') {
-						cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
-					}
-					else {
-						cell.addClass('empty');
-					}
+			if (compact) {
+				compact = false;
+				$this.removeClass('compact');
+			}
 
-					colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
-					column += colspan;
-				});
+			// Find tallest element
+			var maxHeight = 0;
+			links.each(function() {
+				if (!$(this).height()) return;
+				maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
 			});
-		});
 
-		// Responsive link lists
-		$('.linklist:not(.navlinks, .skip-responsive), .postbody ul.profile-icons:not(.skip-responsive)').each(function() {
-			var $this = $(this),
-				$body = $('body'),
-				links = $this.children().not('.skip-responsive'),
-				html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><ul class="responsive-popup" style="display:none;" /></li>',
-				// List of items that should be hidden last
-				filterString = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .breadcrumbs, .edit-icon, .quote-icon',
-				filtered = links.filter(filterString);
-
-			if (links.is('.rightside'))
-			{
-				links.filter('.rightside:first').before(html);
+			if (maxHeight < 1) {
+				return;
 			}
-			else
-			{
-				$this.append(html);
+
+			// Nothing to resize if block's height is not bigger than tallest element's height
+			if ($this.height() <= maxHeight) {
+				toggle.removeClass('visible');
+				menu.hide();
+				return;
 			}
 
-			var toggle = $this.children('.responsive-menu'),
-				toggleLink = toggle.find('a.responsive-menu-link'),
-				menu = toggle.find('ul.responsive-popup'),
-				lastWidth = false,
-				compact = false,
-				responsive = false,
-				copied = false;
-
-			function check() {
-				var width = $body.width();
-				if (responsive && width <= lastWidth) {
-					return;
-				}
+			// Enable compact layout, find tallest element, compare to height of whole block
+			compact = true;
+			$this.addClass('compact');
 
-				// Reset responsive and compact layout
-				if (responsive) {
-					responsive = false;
-					$this.removeClass('responsive');
-					links.css('display', '');
-					toggle.css('display', 'none');
-				}
+			var compactMaxHeight = 0;
+			links.each(function() {
+				if (!$(this).height()) return;
+				compactMaxHeight = Math.max(compactMaxHeight, $(this).outerHeight(true));
+			});
 
-				if (compact) {
-					compact = false;
-					$this.removeClass('compact');
-				}
+			if ($this.height() <= maxHeight) {
+				toggle.removeClass('visible');
+				menu.hide();
+				return;
+			}
 
-				// Find tallest element
-				var maxHeight = 0;
-				links.each(function() {
-					if (!$(this).height()) return;
-					maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
-				});
+			// Compact layout did not resize block enough, switch to responsive layout
+			compact = false;
+			$this.removeClass('compact');
+			responsive = true;
 
-				if (maxHeight < 1) {
-					return;
+			if (!copied) {
+				if (menu.parents().is('.rightside')) {
+					menu.addClass('responsive-rightside');
 				}
+				menu.append(links.clone(true));
+				menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
+				menu.find('.inputbox').parents('li:first').css('white-space', 'normal');
+				copied = true;
+			}
+			else {
+				menu.children().css('display', '');
+			}
 
-				// Nothing to resize if block's height is not bigger than tallest element's height
-				if ($this.height() <= maxHeight) {
-					toggle.removeClass('visible');
-					menu.hide();
-					return;
-				}
+			toggle.css('display', '');
+			$this.addClass('responsive');
 
-				// Enable compact layout, find tallest element, compare to height of whole block
-				compact = true;
-				$this.addClass('compact');
+			// Try to not hide filtered items
+			if (filtered.length) {
+				links.not(filterString).css('display', 'none');
 
-				var compactMaxHeight = 0;
-				links.each(function() {
+				maxHeight = 0;
+				filtered.each(function() {
 					if (!$(this).height()) return;
-					compactMaxHeight = Math.max(compactMaxHeight, $(this).outerHeight(true));
+					maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
 				});
 
 				if ($this.height() <= maxHeight) {
-					toggle.removeClass('visible');
-					menu.hide();
+					menu.children().filter(filterString).css('display', 'none');
 					return;
 				}
+			}
 
-				// Compact layout did not resize block enough, switch to responsive layout
-				compact = false;
-				$this.removeClass('compact');
-				responsive = true;
-
-				if (!copied) {
-					if (menu.parents().is('.rightside')) {
-						menu.addClass('responsive-rightside');
-					}
-					menu.append(links.clone(true));
-					menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
-					menu.find('.inputbox').parents('li:first').css('white-space', 'normal');
-					copied = true;
-				}
-				else {
-					menu.children().css('display', '');
-				}
-
-				toggle.css('display', '');
-				$this.addClass('responsive');
+			links.css('display', 'none');
+		}
 
-				// Try to not hide filtered items
-				if (filtered.length) {
-					links.not(filterString).css('display', 'none');
+		toggleLink.click(function() {
+			if (!responsive) return;
+			if (!toggle.hasClass('visible')) {
+				// Hide other popups
+				$('.responsive-menu.visible').removeClass('visible').find('.responsive-popup').hide();
+			}
+			toggle.toggleClass('visible');
+			menu.toggle();
+		});
 
-					maxHeight = 0;
-					filtered.each(function() {
-						if (!$(this).height()) return;
-						maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
-					});
+		check();
+		$(window).resize(check);
+	});
 
-					if ($this.height() <= maxHeight) {
-						menu.children().filter(filterString).css('display', 'none');
-						return;
-					}
-				}
+	/**
+	* Responsive tabs
+	*/
+	container.find('#tabs, #minitabs').not('.skip-responsive').each(function() {
+		var $this = $(this),
+			$body = $('body'),
+			ul = $this.children(),
+			tabs = ul.children().not('.skip-responsive'),
+			links = tabs.children('a'),
+			toggle = ul.append('<li class="responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"><span>&nbsp;</span></a><ul class="responsive-tabs" style="display:none;" /></li>').find('li.responsive-tab'),
+			toggleLink = toggle.find('a.responsive-tab-link'),
+			menu = toggle.find('ul.responsive-tabs'),
+			maxHeight = 0,
+			lastWidth = false,
+			responsive = false;
+
+		links.each(function() {
+			maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
+		})
+
+		function check() {
+			var width = $body.width(),
+				height = $this.height();
 
-				links.css('display', 'none');
+			if (arguments.length == 0 && (!responsive || width <= lastWidth) && height <= maxHeight) {
+				return;
 			}
 
-			toggleLink.click(function() {
-				if (!responsive) return;
-				if (!toggle.hasClass('visible')) {
-					// Hide other popups
-					$('.responsive-menu.visible').removeClass('visible').find('.responsive-popup').hide();
-				}
-				toggle.toggleClass('visible');
-				menu.toggle();
-			});
+			tabs.show();
+			toggle.hide();
 
-			check();
-			$(window).resize(check);
-		});
-
-		// Responsive tabs
-		$('#tabs, #minitabs').not('.skip-responsive').each(function() {
-			var $this = $(this),
-				$body = $('body'),
-				ul = $this.children(),
-				tabs = ul.children().not('.skip-responsive'),
-				links = tabs.children('a'),
-				toggle = ul.append('<li class="responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"><span>&nbsp;</span></a><ul class="responsive-tabs" style="display:none;" /></li>').find('li.responsive-tab'),
-				toggleLink = toggle.find('a.responsive-tab-link'),
-				menu = toggle.find('ul.responsive-tabs'),
-				maxHeight = 0,
-				lastWidth = false,
+			lastWidth = width;
+			height = $this.height();
+			if (height <= maxHeight) {
 				responsive = false;
+				return;
+			}
 
-			links.each(function() {
-				maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
-			})
-
-			function check() {
-				var width = $body.width(),
-					height = $this.height();
-
-				if (arguments.length == 0 && (!responsive || width <= lastWidth) && height <= maxHeight) {
-					return;
-				}
+			responsive = true;
+			toggle.show();
+			menu.hide().html('');
 
-				tabs.show();
-				toggle.hide();
+			var availableTabs = tabs.filter(':not(.activetab, .responsive-tab)'),
+				total = availableTabs.length,
+				i, tab;
 
-				lastWidth = width;
-				height = $this.height();
-				if (height <= maxHeight) {
-					responsive = false;
+			for (i = total - 1; i >= 0; i --) {
+				tab = availableTabs.eq(i);
+				menu.prepend(tab.clone(true));
+				tab.hide();
+				if ($this.height() <= maxHeight) {
+					menu.find('a').click(function() { check(true); });
 					return;
 				}
+			}
+			menu.find('a').click(function() { check(true); });
+		}
 
-				responsive = true;
-				toggle.show();
-				menu.hide().html('');
+		toggleLink.click(function() {
+			if (!responsive) return;
+			menu.toggle();
+		});
 
-				var availableTabs = tabs.filter(':not(.activetab, .responsive-tab)'),
-					total = availableTabs.length,
-					i, tab;
+		check(true);
+		$(window).resize(check);
+	});
 
-				for (i = total - 1; i >= 0; i --) {
-					tab = availableTabs.eq(i);
-					menu.prepend(tab.clone(true));
-					tab.hide();
-					if ($this.height() <= maxHeight) {
-						menu.find('a').click(function() { check(true); });
-						return;
-					}
-				}
-				menu.find('a').click(function() { check(true); });
-			}
+	/**
+	 * Hide UCP/MCP navigation if there is only 1 item
+	 */
+	container.find('#navigation').each(function() {
+		var items = $(this).children('ol, ul').children('li');
+		if (items.length == 1)
+		{
+			$(this).addClass('responsive-hide');
+		}
+	});
+}
 
-			toggleLink.click(function() {
-				if (!responsive) return;
-				menu.toggle();
-			});
+/**
+* Run onload functions
+*/
+(function($) {
+	$(document).ready(function() {
+		// Swap .nojs and .hasjs
+		$('#phpbb.nojs').toggleClass('nojs hasjs');
 
-			check(true);
-			$(window).resize(check);
+		// Focus forms
+		$('form[data-focus]:first').each(function() {
+			$('#' + this.getAttribute('data-focus')).focus();
 		});
 
 		// Hide responsive menu and tabs
@@ -892,22 +959,6 @@ function insert_single_user(formId, user)
 			}
 		});
 
-		// Hide *CP navigation if there is only 1 item
-		$('#navigation').each(function() {
-			var items = $(this).children('ol, ul').children('li');
-			if (items.length == 1)
-			{
-				$(this).addClass('responsive-hide');
-			}
-		});
-
-		// Hide empty responsive tables
-		$('table.responsive > tbody').each(function() {
-			var items = $(this).children('tr');
-			if (items.length == 0)
-			{
-				$(this).parent('table:first').addClass('responsive-hide');
-			}
-		});
+		parse_document($('body'));
 	});
 })(jQuery);
-- 
cgit v1.2.1


From e6dd672e49c8909c5533dcb308d8e78b5bb1790a Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 22 Oct 2013 11:01:53 +0300
Subject: [ticket/11956] Put top navigation in one block

PHPBB3-11956
---
 phpBB/styles/prosilver/template/overall_header.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index e885503d90..9a08c0f5ac 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -97,8 +97,8 @@
 				<!-- 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>
 
+			<ul class="linklist bulletin">
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
-			<ul class="linklist leftside bulletin">
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li class="icon-notification skip-responsive">
 					<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
@@ -152,17 +152,15 @@
 				<!-- IF U_RESTORE_PERMISSIONS -->
 					<li class="icon-restore-permissions"><a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a></li>
 				<!-- ENDIF -->
-			</ul>
 			<!-- ENDIF -->
 
-			<ul class="linklist rightside<!-- IF S_IS_BOT or not S_USER_LOGGED_IN --> fullwidth<!-- ENDIF -->">
 				<!-- EVENT overall_header_navigation_prepend -->
-				<li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
 				<!-- IF not S_IS_BOT -->
-					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
-					<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="icon-register"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
-					<li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
+					<li class="icon-logout rightside no-bulletin"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
+					<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="icon-register rightside no-bulletin"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
+					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members rightside no-bulletin"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
 				<!-- ENDIF -->
+				<li class="icon-faq rightside no-bulletin"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
 				<!-- EVENT overall_header_navigation_append -->
 			</ul>
 
-- 
cgit v1.2.1


From 85b9867edb3bc387fb5a58ee42fcf0f43f1d5ef0 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 22 Oct 2013 11:06:28 +0300
Subject: [ticket/11956] Put bottom nav in one block

PHPBB3-11956
---
 phpBB/styles/prosilver/template/overall_footer.html | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 6940024627..86e55c54f6 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -5,7 +5,7 @@
 	<div class="navbar">
 		<div class="inner">
 
-		<ul class="linklist leftside bulletin">
+		<ul class="linklist bulletin">
 			<li class="icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong></span> <!-- ENDIF --><span class="crumb"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></span>
 				<!-- EVENT overall_footer_breadcrumb_append -->
 			</li>
@@ -15,11 +15,9 @@
 				<!-- IF U_BOOKMARK_TOPIC --><li class="icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}">{S_BOOKMARK_TOPIC}</a></li><!-- ENDIF -->
 				<!-- IF U_BUMP_TOPIC --><li class="icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->
 			<!-- ENDIF -->
-		</ul>
-		<ul class="linklist rightside bulletin">
-			<!-- IF U_TEAM --><li><a href="{U_TEAM}">{L_THE_TEAM}</a><!-- ENDIF -->
-			<!-- IF not S_IS_BOT --><li><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true">{L_DELETE_COOKIES}</a></li><!-- ENDIF -->
-			<li>{S_TIMEZONE}</li>
+			<li class="rightside">{S_TIMEZONE}</li>
+			<!-- 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 -->
+			<!-- IF U_TEAM --><li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a><!-- ENDIF -->
 		</ul>
 
 		</div>
-- 
cgit v1.2.1


From 5e67c41629c2234820b9355b06a9846d7698e313 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 22 Oct 2013 11:16:25 +0300
Subject: [ticket/11956] Better responsive breadcrumbs

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 20 ++++++++++----------
 phpBB/styles/prosilver/theme/common.css     | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index cb8ee2f9df..8cd4880914 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -471,12 +471,12 @@ function parse_document(container)
 	/**
 	* Makes breadcrumbs responsive
 	*/
-	container.find('.breadcrumbs:not(.skip-responsive, .linklist.leftside .breadcrumbs)').each(function() {
+	container.find('.breadcrumbs:not(.skip-responsive)').each(function() {
 		var $this = $(this),
 			$body = $('body'),
 			links = $this.find('.crumb'),
 			length = links.length,
-			classes = ['wrapped-wide', 'wrapped-medium', 'wrapped-small'],
+			classes = ['wrapped-max', 'wrapped-wide', 'wrapped-medium', 'wrapped-small', 'wrapped-tiny'],
 			classesLength = classes.length,
 			maxHeight = 0,
 			lastWidth = false,
@@ -726,11 +726,11 @@ function parse_document(container)
 	container.find('.linklist:not(.navlinks, .skip-responsive), .postbody ul.profile-icons:not(.skip-responsive)').each(function() {
 		var $this = $(this),
 			$body = $('body'),
-			links = $this.children().not('.skip-responsive'),
+			filterSkip = '.breadcrumbs, .skip-responsive',
+			filterLast = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .edit-icon, .quote-icon',
+			links = $this.children().not(filterSkip),
 			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><ul class="responsive-popup" style="display:none;" /></li>',
-			// List of items that should be hidden last
-			filterString = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .breadcrumbs, .edit-icon, .quote-icon',
-			filtered = links.filter(filterString);
+			filterLastList = links.filter(filterLast);
 
 		if (links.is('.rightside'))
 		{
@@ -824,17 +824,17 @@ function parse_document(container)
 			$this.addClass('responsive');
 
 			// Try to not hide filtered items
-			if (filtered.length) {
-				links.not(filterString).css('display', 'none');
+			if (filterLastList.length) {
+				links.not(filterLast).css('display', 'none');
 
 				maxHeight = 0;
-				filtered.each(function() {
+				filterLastList.each(function() {
 					if (!$(this).height()) return;
 					maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
 				});
 
 				if ($this.height() <= maxHeight) {
-					menu.children().filter(filterString).css('display', 'none');
+					menu.children().filter(filterLast).css('display', 'none');
 					return;
 				}
 			}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 19077bbc86..fc0fff8fea 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -449,23 +449,25 @@ ul.responsive-popup li:before, ul.responsive-popup li:after {
 
 /* Responsive breadcrumbs
 ----------------------------------------*/
-.breadcrumbs .crumb {
+.breadcrumbs .crumb a {
 	display: inline-block;
 	vertical-align: bottom;
 }
 
-.breadcrumbs.wrapped .crumb {
-	letter-spacing: -.5px;
-}
+.breadcrumbs.wrapped .crumb a { letter-spacing: -.3px; }
+.breadcrumbs.wrapped .crumb.wrapped-medium a { letter-spacing: -.4px; }
+.breadcrumbs.wrapped .crumb.wrapped-tiny a { letter-spacing: -.5px; }
 
-.breadcrumbs .crumb.wrapped {
+.breadcrumbs .crumb.wrapped a {
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
-.breadcrumbs .crumb.wrapped-wide { max-width: 120px; }
-.breadcrumbs .crumb.wrapped-medium { max-width: 80px; }
-.breadcrumbs .crumb.wrapped-small { max-width: 30px; }
+.breadcrumbs .crumb.wrapped-max a { max-width: 120px; }
+.breadcrumbs .crumb.wrapped-wide a { max-width: 100px; }
+.breadcrumbs .crumb.wrapped-medium a { max-width: 80px; }
+.breadcrumbs .crumb.wrapped-small a { max-width: 60px; }
+.breadcrumbs .crumb.wrapped-tiny a { max-width: 40px; }
 
 /* Table styles
 ----------------------------------------*/
-- 
cgit v1.2.1


From d11e62930a604fe480fcfa5f2e06ddd421087375 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 22 Oct 2013 18:54:31 +0300
Subject: [ticket/11956] Fix missing class name in index_body.html

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index 2e21c5a341..dd8af710aa 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -1,7 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
 <p class="{S_CONTENT_FLOW_END} responsive-center<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p>
-<!-- IF U_MCP --><p class="responsive-center">{CURRENT_TIME} <br />[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ELSEIF S_USER_LOGGED_IN --><p>{CURRENT_TIME}</p><!-- ENDIF -->
+<!-- IF U_MCP --><p class="responsive-center">{CURRENT_TIME} <br />[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ELSEIF S_USER_LOGGED_IN --><p class="responsive-center">{CURRENT_TIME}</p><!-- ENDIF -->
 
 <!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) -->
 <ul class="linklist bulletin">
-- 
cgit v1.2.1


From 1638ff3cba881eb7bce2ffc29946db0644feaff2 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 22 Oct 2013 22:03:43 +0300
Subject: [ticket/11956] Arrow for responsive popup

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js        | 15 +++++-----
 .../styles/prosilver/template/overall_header.html  |  2 +-
 phpBB/styles/prosilver/theme/colours.css           | 15 ++++++----
 phpBB/styles/prosilver/theme/common.css            | 32 ++++++++++++++++++----
 4 files changed, 45 insertions(+), 19 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 8cd4880914..2e0cf7bfea 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -729,7 +729,7 @@ function parse_document(container)
 			filterSkip = '.breadcrumbs, .skip-responsive',
 			filterLast = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .edit-icon, .quote-icon',
 			links = $this.children().not(filterSkip),
-			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><ul class="responsive-popup" style="display:none;" /></li>',
+			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><div class="popup-pointer" style="display: none;"><div class="popup-pointer-inner" /></div><ul class="responsive-popup" style="display:none;" /></li>',
 			filterLastList = links.filter(filterLast);
 
 		if (links.is('.rightside'))
@@ -744,6 +744,7 @@ function parse_document(container)
 		var toggle = $this.children('.responsive-menu'),
 			toggleLink = toggle.find('a.responsive-menu-link'),
 			menu = toggle.find('ul.responsive-popup'),
+			toggleItems = toggle.find('ul.responsive-popup, div.popup-pointer'),
 			lastWidth = false,
 			compact = false,
 			responsive = false,
@@ -782,7 +783,7 @@ function parse_document(container)
 			// Nothing to resize if block's height is not bigger than tallest element's height
 			if ($this.height() <= maxHeight) {
 				toggle.removeClass('visible');
-				menu.hide();
+				toggleItems.hide();
 				return;
 			}
 
@@ -798,7 +799,7 @@ function parse_document(container)
 
 			if ($this.height() <= maxHeight) {
 				toggle.removeClass('visible');
-				menu.hide();
+				toggleItems.hide();
 				return;
 			}
 
@@ -809,7 +810,7 @@ function parse_document(container)
 
 			if (!copied) {
 				if (menu.parents().is('.rightside')) {
-					menu.addClass('responsive-rightside');
+					toggle.addClass('responsive-rightside');
 				}
 				menu.append(links.clone(true));
 				menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
@@ -846,10 +847,10 @@ function parse_document(container)
 			if (!responsive) return;
 			if (!toggle.hasClass('visible')) {
 				// Hide other popups
-				$('.responsive-menu.visible').removeClass('visible').find('.responsive-popup').hide();
+				$('.responsive-menu.visible').removeClass('visible').find('.responsive-popup, .popup-pointer').hide();
 			}
 			toggle.toggleClass('visible');
-			menu.toggle();
+			toggleItems.toggle();
 		});
 
 		check();
@@ -952,7 +953,7 @@ function parse_document(container)
 		$('#phpbb').click(function(e) {
 			var parents = $(e.target).parents();
 			if (!parents.is('.responsive-menu.visible')) {
-				$('.responsive-menu.visible').removeClass('visible').find('.responsive-popup').hide();
+				$('.responsive-menu.visible').removeClass('visible').find('.responsive-popup, .popup-pointer').hide();
 			}
 			if (!parents.is('.responsive-tab')) {
 				$('.responsive-tabs').hide();
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 9a08c0f5ac..3ef264259f 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -103,7 +103,7 @@
 				<li class="icon-notification skip-responsive">
 					<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a>
 					<div id="notification_list" class="notification_list">
-						<div class="pointer"><div class="pointer_inner"></div></div>
+						<div class="popup-pointer"><div class="popup-pointer-inner"></div></div>
 						<div class="header">
 							{L_NOTIFICATIONS}
 							<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index a0db75d07f..327fc0681a 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1126,11 +1126,11 @@ input.disabled {
 	background: linear-gradient(to bottom, #F1F8FF 0%, #CADCEB 100%);
 }
 
-.notification_list .pointer {
+.popup-pointer {
 	border-bottom-color: #B9B9B9;
 }
 
-.notification_list .pointer_inner {
+.popup-pointer-inner {
 	border-bottom-color: #F1F8FF;
 }
 
@@ -1138,7 +1138,7 @@ ul.linklist li.responsive-menu a.responsive-menu-link:before {
 	border-color: #105289;
 }
 
-ul.linklist li.responsive-menu a.responsive-menu-link:hover:before {
+ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist li.responsive-menu.visible a.responsive-menu-link:before {
 	border-color: #D31141;
 }
 
@@ -1147,8 +1147,13 @@ ul.responsive-popup {
 	border-color: #b9b9b9;
 	box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.2);
 }
-.navbar ul.responsive-popup {
-	background-color: #CADCEB;
+
+.responsive-menu .popup-pointer {
+	border-bottom-color: #b9b9b9;
+}
+
+.responsive-menu .popup-pointer-inner {
+	border-bottom-color: #fff;
 }
 
 #tabs ul.responsive-tabs, #minitabs ul.responsive-tabs {
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index fc0fff8fea..3de4b023a8 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -361,12 +361,13 @@ ul.rightside {
 	text-align: right;
 }
 
-ul.linklist.responsive {
+ul.linklist li.responsive-menu {
 	position: relative;
 }
 
 ul.linklist li.responsive-menu a.responsive-menu-link {
 	display: inline-block;
+	margin: 0 5px;
 	font-size: 16px;
 	position: relative;
 	width: 16px;
@@ -420,18 +421,37 @@ ul.linklist.bulletin li.no-bulletin:before {
 ul.responsive-popup {
 	position: absolute;
 	left: 0;
-	top: 24px;
+	top: 22px;
 	z-index: 2;
 	border: 1px solid transparent;
 	border-radius: 5px;
 	padding: 5px;
 }
 
-ul.responsive-popup.responsive-rightside {
+.responsive-rightside ul.responsive-popup {
 	left: auto;
 	right: 0;
 }
 
+.responsive-menu .popup-pointer {
+	top: 22px;
+	z-index: 3;
+	left: 2px;
+}
+.responsive-menu ul.responsive-popup {
+	top: 32px;
+	left: -5px;
+}
+
+.responsive-menu.responsive-rightside .popup-pointer {
+	left: auto;
+	right: 2px;
+}
+.responsive-menu.responsive-rightside ul.responsive-popup {
+	left: auto;
+	right: -5px;
+}
+
 ul.responsive-popup li {
 	float: none;
 	margin: 0;
@@ -901,7 +921,7 @@ form > p.post-notice strong {
 	margin: 0;
 }
 
-.notification_list .pointer, .notification_list .pointer_inner {
+.popup-pointer, .popup-pointer-inner {
 	position: absolute;
 	width: 0;
 	height: 0;
@@ -913,13 +933,13 @@ form > p.post-notice strong {
 	display: block;
 }
 
-.notification_list .pointer {
+.popup-pointer {
 	right: auto;
 	left: 10px;
 	top: -11px;
 }
 
-.notification_list .pointer_inner {
+.popup-pointer-inner {
 	top: auto;
 	bottom: -11px;
 	left: -10px;
-- 
cgit v1.2.1


From 5eeaab562cc152c378aa43e152a36b9826fdfe7c Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 22 Oct 2013 22:23:49 +0300
Subject: [ticket/11956] Responsive quick login form

PHPBB3-11956
---
 phpBB/styles/prosilver/template/index_body.html |  6 +++---
 phpBB/styles/prosilver/theme/responsive.css     | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index dd8af710aa..4565a2d7c7 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -25,10 +25,10 @@
 	<form method="post" action="{S_LOGIN_ACTION}" class="headerspace">
 	<h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED -->&nbsp; &bull; &nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a><!-- ENDIF --></h3>
 		<fieldset class="quick-login">
-			<label for="username">{L_USERNAME}{L_COLON}</label>&nbsp;<input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" />
-			<label for="password">{L_PASSWORD}{L_COLON}</label>&nbsp;<input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" />
+			<label for="username"><span>{L_USERNAME}{L_COLON}</span> <input type="text" name="username" id="username" size="10" class="inputbox" title="{L_USERNAME}" /></label>
+			<label for="password"><span>{L_PASSWORD}{L_COLON}</span> <input type="password" name="password" id="password" size="10" class="inputbox" title="{L_PASSWORD}" /></label>
 			<!-- IF S_AUTOLOGIN_ENABLED -->
-				| <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>
+				<span class="responsive-hide">|</span> <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" name="autologin" id="autologin" /></label>
 			<!-- ENDIF -->
 			<input type="submit" name="login" value="{L_LOGIN}" class="button2" />
 			{S_LOGIN_REDIRECT}
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index 322f11e291..693e6a4474 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -306,6 +306,30 @@ dl.pmlist dd:first-of-type {
 	display: inline-block !important;
 }
 
+fieldset.quick-login label {
+	display: block;
+	margin-bottom: 5px;
+	white-space: normal;
+}
+
+fieldset.quick-login label > span {
+	display: inline-block;
+	min-width: 100px;
+}
+
+fieldset.quick-login input.inputbox {
+	width: 85%;
+	max-width: 300px;
+	margin-left: 20px;
+}
+
+fieldset.quick-login label[for="autologin"] {
+	display: inline-block;
+	text-align: right;
+	min-width: 50%;
+}
+
+
 /* User profile
 ----------------------------------------*/
 .column1, .column2, .left-box.profile-details {
-- 
cgit v1.2.1


From 76bfd138c982c46cc0e9200b2a016f9154e85443 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 22 Oct 2013 22:34:19 +0300
Subject: [ticket/11956] Fix postprofile popup

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/buttons.css              |  10 ++++++++--
 .../styles/prosilver/theme/images/icon_post_menu.png  | Bin 1844 -> 1946 bytes
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index e2c0dc9145..9992f389e7 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -170,10 +170,16 @@ ul.profile-icons.responsive a.responsive-menu-link:before {
 	border-top: 0.375em double transparent;
 }
 
-.postbody ul.profile-icons.responsive .responsive-popup {
+.postbody ul.profile-icons.responsive .popup-pointer {
 	left: auto;
 	right: 7px;
-	top: 19px;
+	top: 20px;
+}
+
+.postbody ul.profile-icons.responsive .responsive-popup {
+	left: auto;
+	right: -4px;
+	top: 30px;
 }
 
 .postbody ul.profile-icons.responsive .responsive-popup li, .postbody ul.profile-icons.responsive .responsive-popup li a {
diff --git a/phpBB/styles/prosilver/theme/images/icon_post_menu.png b/phpBB/styles/prosilver/theme/images/icon_post_menu.png
index 55723ddda1..23e24d7c03 100644
Binary files a/phpBB/styles/prosilver/theme/images/icon_post_menu.png and b/phpBB/styles/prosilver/theme/images/icon_post_menu.png differ
-- 
cgit v1.2.1


From 02cf80da9db56954a37441f5039102178671e159 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 22 Oct 2013 22:59:26 +0300
Subject: [ticket/11956] Wider pagination links on mobile devices

Wider pagination links on mobile devices. Also fixes
typo in pagination selector.

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/common.css     | 2 +-
 phpBB/styles/prosilver/theme/responsive.css | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 3de4b023a8..4f55d3e92c 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -665,7 +665,7 @@ li.pagination ul {
 	line-height: normal;
 }
 
-.pagination li a, .pagnation li span, li .pagination li a, li .pagnation li span, .pagination li.active span, .pagination li.ellipsis span {
+.pagination li a, .pagnation li span, li .pagination li a, li .pagination li span, .pagination li.active span, .pagination li.ellipsis span {
 	font-weight: normal;
 	text-decoration: none;
 	padding: 0 2px;
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index 693e6a4474..faa46a3700 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -193,6 +193,12 @@ li.row .responsive-show strong {
 	margin: 5px 0;
 }
 
+.pagination li a, .pagination li span {
+	min-width: 10px;
+	display: inline-block;
+	text-align: center;
+}
+
 /* Responsive tables
 ----------------------------------------*/
 table.responsive, table.responsive tbody, table.responsive tr, table.responsive td {
-- 
cgit v1.2.1


From 11157e4f033d9fe1e241a4ff13e2ad8516024d5e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 22 Oct 2013 23:34:20 +0300
Subject: [ticket/11956] Fix responsive linkslist bug

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 2e0cf7bfea..9c1d860e98 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -728,7 +728,8 @@ function parse_document(container)
 			$body = $('body'),
 			filterSkip = '.breadcrumbs, .skip-responsive',
 			filterLast = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .edit-icon, .quote-icon',
-			links = $this.children().not(filterSkip),
+			allLinks = $this.children(),
+			links = allLinks.not(filterSkip),
 			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><div class="popup-pointer" style="display: none;"><div class="popup-pointer-inner" /></div><ul class="responsive-popup" style="display:none;" /></li>',
 			filterLastList = links.filter(filterLast);
 
@@ -771,8 +772,9 @@ function parse_document(container)
 
 			// Find tallest element
 			var maxHeight = 0;
-			links.each(function() {
+			allLinks.each(function() {
 				if (!$(this).height()) return;
+				$(this).attr('data-height', $(this).outerHeight(true));
 				maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
 			});
 
@@ -792,7 +794,7 @@ function parse_document(container)
 			$this.addClass('compact');
 
 			var compactMaxHeight = 0;
-			links.each(function() {
+			allLinks.each(function() {
 				if (!$(this).height()) return;
 				compactMaxHeight = Math.max(compactMaxHeight, $(this).outerHeight(true));
 			});
-- 
cgit v1.2.1


From c2f5ab3c6bdafff7fef982ee3dc414c452073c61 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 23 Oct 2013 15:21:07 +0300
Subject: [ticket/11956] Change .skip-responsive to data attribute

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js         | 10 +++++-----
 phpBB/styles/prosilver/template/overall_header.html |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 9c1d860e98..b46a2baaf5 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -471,7 +471,7 @@ function parse_document(container)
 	/**
 	* Makes breadcrumbs responsive
 	*/
-	container.find('.breadcrumbs:not(.skip-responsive)').each(function() {
+	container.find('.breadcrumbs:not([data-skip-responsive])').each(function() {
 		var $this = $(this),
 			$body = $('body'),
 			links = $this.find('.crumb'),
@@ -723,10 +723,10 @@ function parse_document(container)
 	/**
 	* Responsive link lists
 	*/
-	container.find('.linklist:not(.navlinks, .skip-responsive), .postbody ul.profile-icons:not(.skip-responsive)').each(function() {
+	container.find('.linklist:not(.navlinks, [data-skip-responsive]), .postbody ul.profile-icons:not([data-skip-responsive])').each(function() {
 		var $this = $(this),
 			$body = $('body'),
-			filterSkip = '.breadcrumbs, .skip-responsive',
+			filterSkip = '.breadcrumbs, [data-skip-responsive]',
 			filterLast = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .edit-icon, .quote-icon',
 			allLinks = $this.children(),
 			links = allLinks.not(filterSkip),
@@ -862,11 +862,11 @@ function parse_document(container)
 	/**
 	* Responsive tabs
 	*/
-	container.find('#tabs, #minitabs').not('.skip-responsive').each(function() {
+	container.find('#tabs, #minitabs').not('[data-skip-responsive]').each(function() {
 		var $this = $(this),
 			$body = $('body'),
 			ul = $this.children(),
-			tabs = ul.children().not('.skip-responsive'),
+			tabs = ul.children().not('[data-skip-responsive]'),
 			links = tabs.children('a'),
 			toggle = ul.append('<li class="responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"><span>&nbsp;</span></a><ul class="responsive-tabs" style="display:none;" /></li>').find('li.responsive-tab'),
 			toggleLink = toggle.find('a.responsive-tab-link'),
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 3ef264259f..abe79e3808 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -100,7 +100,7 @@
 			<ul class="linklist bulletin">
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
-				<li class="icon-notification skip-responsive">
+				<li class="icon-notification" 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>
 					<div id="notification_list" class="notification_list">
 						<div class="popup-pointer"><div class="popup-pointer-inner"></div></div>
-- 
cgit v1.2.1


From 6f97367ef065b871fdfbdddbd7919af886897a9f Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 23 Oct 2013 19:33:31 +0300
Subject: [ticket/11956] Remove background image from *CP navigation

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/colours.css | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 327fc0681a..c16452a148 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -889,6 +889,13 @@ ul.cplist {
 	color: #D31141;
 }
 
+@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
+{
+	#navigation a, .rtl #navigation a {
+		background-image: none;
+	}
+}
+
 /* Preferences pane layout
 ----------------------------------------*/
 #cp-main h2 {
-- 
cgit v1.2.1


From 016958ea5e64d291b73beb16db10fdd7e2e7a089 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 23 Oct 2013 22:53:10 +0300
Subject: [ticket/11956] Reusable dropdown handler

Replace dropdown menu code with reusable handler that
is shared between all types of dropdown menus and can
be used by custom menus by extensions.

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js        | 136 ++++++++++++++------
 .../styles/prosilver/template/overall_header.html  |  66 +++++-----
 phpBB/styles/prosilver/theme/colours.css           |  38 ++----
 phpBB/styles/prosilver/theme/common.css            | 137 +++++++++++++--------
 phpBB/styles/prosilver/theme/cp.css                |  36 +++---
 5 files changed, 249 insertions(+), 164 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index b46a2baaf5..1169c9f2dc 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -409,6 +409,83 @@ function insert_single_user(formId, user)
 	self.close();
 }
 
+/**
+* Dropdown handler
+* Shows/hides dropdown, decides which side to open to
+*
+* @param [jQuery] toggle Link that toggles dropdown
+* @param [jQuery] dropdown Dropdown menu
+* @param [Object] [options] List of options
+*/
+function toggle_dropdown()
+{
+	var $this = $(this),
+		options = $this.data('dropdown-options'),
+		parent = options.parent,
+		visible = parent.hasClass('dropdown-visible');
+
+	if (!visible) {
+		// Hide other dropdown menus
+		$('.dropdown-container.dropdown-visible .dropdown-toggle').each(toggle_dropdown);
+
+		// Figure out direction of dropdown
+		var direction = options.direction,
+			verticalDirection = options.verticalDirection,
+			offset = $this.offset();
+
+		if (direction == 'auto') {
+			if (($(window).width() - $this.outerWidth(true)) / 2 > offset.left) {
+				direction = 'right';
+			}
+			else {
+				direction = 'left';
+			}
+		}
+		parent.toggleClass(options.leftClass, direction == 'left').toggleClass(options.rightClass, direction == 'right');
+
+		if (verticalDirection == 'auto') {
+			var height = $(window).height(),
+				top = offset.top - $(window).scrollTop();
+
+			if (top < height * 0.7) {
+				verticalDirection = 'down';
+			}
+			else {
+				verticalDirection = 'up';
+			}
+		}
+		parent.toggleClass(options.upClass, verticalDirection == 'up').toggleClass(options.downClass, verticalDirection == 'down');
+	}
+
+	options.dropdown.toggle();
+	parent.toggleClass(options.visibleClass, !visible).toggleClass('dropdown-visible', !visible);
+}
+
+function register_dropdown(toggle, dropdown, options)
+{
+	var ops = {
+			parent: toggle.parent(), // Parent item to add classes to
+			direction: 'auto', // Direction of dropdown menu. Possible values: auto, left, right
+			verticalDirection: 'auto', // Vertical direction. Possible values: auto, up, down
+			visibleClass: 'visible', // Class to add to parent item when dropdown is visible
+			leftClass: 'dropdown-left', // Class to add to parent item when dropdown opens to left side
+			rightClass: 'dropdown-right', // Class to add to parent item when dropdown opens to right side
+			upClass: 'dropdown-up', // Class to add to parent item when dropdown opens above menu item
+			downClass: 'dropdown-down' // Class to add to parent item when dropdown opens below menu item
+		};
+	if (options) {
+		ops = $.extend(ops, options);
+	}
+	ops.dropdown = dropdown;
+
+	ops.parent.addClass('dropdown-container');
+	toggle.addClass('dropdown-toggle');
+
+	toggle.data('dropdown-options', ops);
+
+	toggle.click(toggle_dropdown);
+}
+
 /**
 * Parse document block
 */
@@ -730,7 +807,7 @@ function parse_document(container)
 			filterLast = '.pagination, .icon-notifications, .icon-pm, .icon-logout, .icon-login, .mark-read, .edit-icon, .quote-icon',
 			allLinks = $this.children(),
 			links = allLinks.not(filterSkip),
-			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><div class="popup-pointer" style="display: none;"><div class="popup-pointer-inner" /></div><ul class="responsive-popup" style="display:none;" /></li>',
+			html = '<li class="responsive-menu" style="display:none;"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><div class="dropdown" style="display:none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>',
 			filterLastList = links.filter(filterLast);
 
 		if (links.is('.rightside'))
@@ -742,10 +819,8 @@ function parse_document(container)
 			$this.append(html);
 		}
 
-		var toggle = $this.children('.responsive-menu'),
-			toggleLink = toggle.find('a.responsive-menu-link'),
-			menu = toggle.find('ul.responsive-popup'),
-			toggleItems = toggle.find('ul.responsive-popup, div.popup-pointer'),
+		var item = $this.children('.responsive-menu'),
+			menu = item.find('.dropdown-contents'),
 			lastWidth = false,
 			compact = false,
 			responsive = false,
@@ -762,7 +837,7 @@ function parse_document(container)
 				responsive = false;
 				$this.removeClass('responsive');
 				links.css('display', '');
-				toggle.css('display', 'none');
+				item.css('display', 'none');
 			}
 
 			if (compact) {
@@ -774,7 +849,6 @@ function parse_document(container)
 			var maxHeight = 0;
 			allLinks.each(function() {
 				if (!$(this).height()) return;
-				$(this).attr('data-height', $(this).outerHeight(true));
 				maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
 			});
 
@@ -784,8 +858,6 @@ function parse_document(container)
 
 			// Nothing to resize if block's height is not bigger than tallest element's height
 			if ($this.height() <= maxHeight) {
-				toggle.removeClass('visible');
-				toggleItems.hide();
 				return;
 			}
 
@@ -800,8 +872,6 @@ function parse_document(container)
 			});
 
 			if ($this.height() <= maxHeight) {
-				toggle.removeClass('visible');
-				toggleItems.hide();
 				return;
 			}
 
@@ -811,9 +881,6 @@ function parse_document(container)
 			responsive = true;
 
 			if (!copied) {
-				if (menu.parents().is('.rightside')) {
-					toggle.addClass('responsive-rightside');
-				}
 				menu.append(links.clone(true));
 				menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
 				menu.find('.inputbox').parents('li:first').css('white-space', 'normal');
@@ -823,7 +890,7 @@ function parse_document(container)
 				menu.children().css('display', '');
 			}
 
-			toggle.css('display', '');
+			item.css('display', '');
 			$this.addClass('responsive');
 
 			// Try to not hide filtered items
@@ -845,15 +912,7 @@ function parse_document(container)
 			links.css('display', 'none');
 		}
 
-		toggleLink.click(function() {
-			if (!responsive) return;
-			if (!toggle.hasClass('visible')) {
-				// Hide other popups
-				$('.responsive-menu.visible').removeClass('visible').find('.responsive-popup, .popup-pointer').hide();
-			}
-			toggle.toggleClass('visible');
-			toggleItems.toggle();
-		});
+		register_dropdown(item.find('a.responsive-menu-link'), item.find('.dropdown'));
 
 		check();
 		$(window).resize(check);
@@ -868,9 +927,8 @@ function parse_document(container)
 			ul = $this.children(),
 			tabs = ul.children().not('[data-skip-responsive]'),
 			links = tabs.children('a'),
-			toggle = ul.append('<li class="responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"><span>&nbsp;</span></a><ul class="responsive-tabs" style="display:none;" /></li>').find('li.responsive-tab'),
-			toggleLink = toggle.find('a.responsive-tab-link'),
-			menu = toggle.find('ul.responsive-tabs'),
+			item = ul.append('<li class="responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"><span>&nbsp;</span></a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
+			menu = item.find('.dropdown-contents'),
 			maxHeight = 0,
 			lastWidth = false,
 			responsive = false;
@@ -888,18 +946,21 @@ function parse_document(container)
 			}
 
 			tabs.show();
-			toggle.hide();
+			item.hide();
 
 			lastWidth = width;
 			height = $this.height();
 			if (height <= maxHeight) {
 				responsive = false;
+				if (item.hasClass('dropdown-visible')) {
+					toggle_dropdown.call(item.find('a.responsive-tab-link').get(0));
+				}
 				return;
 			}
 
 			responsive = true;
-			toggle.show();
-			menu.hide().html('');
+			item.show();
+			menu.html('');
 
 			var availableTabs = tabs.filter(':not(.activetab, .responsive-tab)'),
 				total = availableTabs.length,
@@ -917,10 +978,7 @@ function parse_document(container)
 			menu.find('a').click(function() { check(true); });
 		}
 
-		toggleLink.click(function() {
-			if (!responsive) return;
-			menu.toggle();
-		});
+		register_dropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), {visibleClass: 'activetab'});
 
 		check(true);
 		$(window).resize(check);
@@ -951,14 +1009,12 @@ function parse_document(container)
 			$('#' + this.getAttribute('data-focus')).focus();
 		});
 
-		// Hide responsive menu and tabs
+		// Hide active dropdowns when click event happens outside
 		$('#phpbb').click(function(e) {
+
 			var parents = $(e.target).parents();
-			if (!parents.is('.responsive-menu.visible')) {
-				$('.responsive-menu.visible').removeClass('visible').find('.responsive-popup, .popup-pointer').hide();
-			}
-			if (!parents.is('.responsive-tab')) {
-				$('.responsive-tabs').hide();
+			if (!parents.is('.dropdown-container.dropdown-visible')) {
+				$('.dropdown-container.dropdown-visible .dropdown-toggle').each(toggle_dropdown);
 			}
 		});
 
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index abe79e3808..854f92e9ce 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -102,38 +102,40 @@
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
 				<li class="icon-notification" 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>
-					<div id="notification_list" class="notification_list">
-						<div class="popup-pointer"><div class="popup-pointer-inner"></div></div>
-						<div class="header">
-							{L_NOTIFICATIONS}
-							<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>
-						</div>
-
-						<ul>
-							<!-- IF not .notifications -->
-								<li>
-									{L_NO_NOTIFICATIONS}
-								</li>
-							<!-- ENDIF -->
-							<!-- BEGIN notifications -->
-								<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
-									<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
-										<!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
-										<div class="notification_text">
-											<p>{notifications.FORMATTED_TITLE}</p>
-											<p>&raquo; {notifications.TIME}</p>
-
-											<!-- IF not notifications.URL and notifications.U_MARK_READ -->
-												<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
-											<!-- ENDIF -->
-										</div>
-									<!-- IF notifications.URL --></a><!-- ENDIF -->
-								</li>
-				   			<!-- END notifications -->
-						</ul>
-
-						<div class="footer">
-							<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
+					<div id="notification_list" class="dropdown notification_list">
+						<div class="pointer"><div class="pointer-inner"></div></div>
+						<div class="dropdown-contents">
+							<div class="header">
+								{L_NOTIFICATIONS}
+								<span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span>
+							</div>
+
+							<ul>
+								<!-- IF not .notifications -->
+									<li>
+										{L_NO_NOTIFICATIONS}
+									</li>
+								<!-- ENDIF -->
+								<!-- BEGIN notifications -->
+									<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
+										<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
+											<!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
+											<div class="notification_text">
+												<p>{notifications.FORMATTED_TITLE}</p>
+												<p>&raquo; {notifications.TIME}</p>
+
+												<!-- IF not notifications.URL and notifications.U_MARK_READ -->
+													<p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p>
+												<!-- ENDIF -->
+											</div>
+										<!-- IF notifications.URL --></a><!-- ENDIF -->
+									</li>
+					   			<!-- END notifications -->
+							</ul>
+
+							<div class="footer">
+								<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
+							</div>
 						</div>
 					</div>
 				</li>
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index c16452a148..19021ca387 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1104,11 +1104,6 @@ input.disabled {
 	background-color: #000000;
 }
 
-#notification_list {
-	background-color: #FFFFFF;
-	border-color: #B9B9B9;
-}
-
 #notification_list ul li {
 	border-bottom-color: #B9B9B9;
 }
@@ -1118,12 +1113,12 @@ input.disabled {
 	color: #000000;
 }
 
-#notification_list > .header, .notification_list > .footer {
+#notification_list .header, .notification_list .footer {
 	border-color: #B9B9B9;
 	color: #000000;
 }
 
-#notification_list > .header {
+#notification_list .header {
 	background: #F1F8FF;
 	background: -moz-linear-gradient(top, #F1F8FF 0%, #CADCEB 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F1F8FF), color-stop(100%, #CADCEB));
@@ -1133,12 +1128,16 @@ input.disabled {
 	background: linear-gradient(to bottom, #F1F8FF 0%, #CADCEB 100%);
 }
 
-.popup-pointer {
-	border-bottom-color: #B9B9B9;
+.dropdown .pointer {
+	border-color: #B9B9B9 transparent;
+}
+
+.dropdown .pointer-inner {
+	border-color: #FFF transparent;
 }
 
-.popup-pointer-inner {
-	border-bottom-color: #F1F8FF;
+#notification_list .pointer-inner {
+	border-color: #F1F8FF transparent;
 }
 
 ul.linklist li.responsive-menu a.responsive-menu-link:before {
@@ -1149,22 +1148,11 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist
 	border-color: #D31141;
 }
 
-ul.responsive-popup {
+.dropdown .dropdown-contents {
 	background: #fff;
 	border-color: #b9b9b9;
 	box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.2);
 }
-
-.responsive-menu .popup-pointer {
-	border-bottom-color: #b9b9b9;
-}
-
-.responsive-menu .popup-pointer-inner {
-	border-bottom-color: #fff;
-}
-
-#tabs ul.responsive-tabs, #minitabs ul.responsive-tabs {
-	background: #ddedfb;
-	border-color: #c0c9d5;
-	box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.4);
+.dropdown-up .dropdown-contents {
+	box-shadow: 1px 0 5px rgba(0, 0, 0, 0.2);
 }
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 4f55d3e92c..9e15eada22 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -363,6 +363,7 @@ ul.rightside {
 
 ul.linklist li.responsive-menu {
 	position: relative;
+	margin: 0 5px;
 }
 
 ul.linklist li.responsive-menu a.responsive-menu-link {
@@ -394,6 +395,24 @@ ul.linklist li.responsive-menu a.responsive-menu-link:before {
 	max-width: none;
 }
 
+li.responsive-menu.dropdown-right .dropdown {
+	left: -9px;
+}
+
+li.responsive-menu.dropdown-left .dropdown {
+	right: -6px;
+}
+
+li.responsive-menu .dropdown .dropdown-contents {
+	padding: 0 5px;
+}
+
+ul.linklist .dropdown li {
+	clear: both;
+}
+
+
+
 /* Bulletin icons for list items
 ----------------------------------------*/
 ul.linklist.bulletin li:before {
@@ -416,54 +435,95 @@ ul.linklist.bulletin li.no-bulletin:before {
 	display: none !important;
 }
 
-/* Responsive popup
+/* Dropdown menu
 ----------------------------------------*/
-ul.responsive-popup {
+.dropdown {
 	position: absolute;
 	left: 0;
 	top: 22px;
 	z-index: 2;
 	border: 1px solid transparent;
 	border-radius: 5px;
-	padding: 5px;
+	padding: 9px 0 0;
 }
 
-.responsive-rightside ul.responsive-popup {
+.dropdown-up .dropdown {
+	top: auto;
+	bottom: 18px;
+	padding: 0 0 9px;
+}
+
+.dropdown-left .dropdown {
 	left: auto;
 	right: 0;
 }
 
-.responsive-menu .popup-pointer {
-	top: 22px;
+
+.dropdown .pointer, .dropdown .pointer-inner {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-top-width: 0;
+	border-bottom: 10px solid transparent;
+	border-left: 10px dashed transparent;
+	border-right: 10px dashed transparent;
+	-webkit-transform: rotate(360deg); /* better anti-aliasing in webkit */
+	display: block;
+}
+
+.dropdown-up .pointer, .dropdown-up .pointer-inner {
+	border-bottom-width: 0;
+	border-top: 10px solid transparent;
+}
+
+.dropdown .pointer {
+	right: auto;
+	left: 10px;
+	top: 0;
 	z-index: 3;
-	left: 2px;
 }
-.responsive-menu ul.responsive-popup {
-	top: 32px;
-	left: -5px;
+
+.dropdown-up .pointer {
+	bottom: 0;
+	top: auto;
 }
 
-.responsive-menu.responsive-rightside .popup-pointer {
+.dropdown-left .dropdown .pointer {
 	left: auto;
-	right: 2px;
+	right: 10px;
 }
-.responsive-menu.responsive-rightside ul.responsive-popup {
-	left: auto;
-	right: -5px;
+
+.dropdown .pointer-inner {
+	top: auto;
+	bottom: -11px;
+	left: -10px;
+}
+
+.dropdown-up .pointer-inner {
+	bottom: auto;
+	top: -11px;
 }
 
-ul.responsive-popup li {
+.dropdown .dropdown-contents {
+	z-index: 2;
+	overflow: hidden;
+	border: 1px solid transparent;
+	border-radius: 5px;
+	padding: 5px;
+}
+
+.dropdown li {
 	float: none;
 	margin: 0;
 	white-space: nowrap;
 	text-align: left;
 }
 
-.wrap ul.responsive-popup li {
+.wrap .dropdown li, .dropdown.wrap li {
 	white-space: normal;
 }
 
-ul.responsive-popup li:before, ul.responsive-popup li:after {
+.dropdown li:before, .dropdown li:after {
 	display: none !important;
 }
 
@@ -854,10 +914,7 @@ form > p.post-notice strong {
 	left: 0;
 	width: 330px;
 	z-index: 1;
-	border: 1px solid;
-	box-shadow: 3px 3px 5px darkgray;
-	border-radius: 5px;
-	top: 32px;
+	top: 22px;
 }
 
 #notification_list ul {
@@ -881,7 +938,11 @@ form > p.post-notice strong {
 	display: none;
 }
 
-#notification_list > .header {
+#notification_list .dropdown-contents {
+	padding: 0;
+}
+
+#notification_list .header {
 	padding: 0 10px;
 	font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif;
 	font-size: 11px;
@@ -893,18 +954,18 @@ form > p.post-notice strong {
 	border-radius: 5px 5px 0 0;
 }
 
-#notification_list > .header > .header_settings {
+#notification_list .header .header_settings {
 	float: right;
 	font-weight: normal;
 	text-transform: none;
 }
 
-#notification_list > .footer {
+#notification_list .footer {
 	text-align: center;
 	font-size: 1.2em;
 }
 
-#notification_list ul li a, .notification_list dt > a, #notification_list > .footer > a {
+#notification_list ul li a, .notification_list dt > a, #notification_list .footer > a {
 	display: block;
 	text-decoration: none;
 }
@@ -921,30 +982,6 @@ form > p.post-notice strong {
 	margin: 0;
 }
 
-.popup-pointer, .popup-pointer-inner {
-	position: absolute;
-	width: 0;
-	height: 0;
-	border-top-width: 0;
-	border-bottom: 10px solid;
-	border-left: 10px dashed transparent;
-	border-right: 10px dashed transparent;
-	-webkit-transform: rotate(360deg); /* better anti-aliasing in webkit */
-	display: block;
-}
-
-.popup-pointer {
-	right: auto;
-	left: 10px;
-	top: -11px;
-}
-
-.popup-pointer-inner {
-	top: auto;
-	bottom: -11px;
-	left: -10px;
-}
-
 .notification_list div.notifications {
 	padding: 5px;
 }
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index f6bb1d0623..3e017719d6 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -218,6 +218,10 @@ ul.cplist {
 
 /* Responsive tabs
 ----------------------------------------*/
+.responsive-tab {
+	position: relative;
+}
+
 .responsive-tab .responsive-tab-link span {
 	display: inline-block;
 	font-size: 16px;
@@ -251,29 +255,25 @@ ul.cplist {
 	position: relative;
 }
 
-#tabs ul.responsive-tabs, #minitabs ul.responsive-tabs {
-	position: absolute;
-	right: 0;
-	top: 26px;
-	z-index: 2;
-	border: 1px solid transparent;
-	border-radius: 5px;
+#tabs .dropdown, #minitabs .dropdown {
+	top: 29px;
+	margin-right: -1px;
 }
 
-#minitabs ul.responsive-tabs {
-	top: 23px;
+#tabs .dropdown-up .dropdown, #minitabs .dropdown-up .dropdown {
+	bottom: -5px;
+	top: auto;
 }
 
-.tabs-container #minitabs ul.responsive-tabs {
-	right: auto;
-	left: 0;
+#tabs .dropdown-right .dropdown, #minitabs .dropdown-right .dropdown {
+	margin-left: -41px;
 }
 
-#tabs .responsive-tabs li, #minitabs .responsive-tabs li {
+#tabs .dropdown li, #minitabs .dropdown li {
 	display: block !important;
 }
 
-#tabs .responsive-tabs a, #tabs .responsive-tabs a span, #minitabs .responsive-tabs a, #minitabs .responsive-tabs a span {
+#tabs .dropdown a, #tabs .dropdown a span, #minitabs .dropdown a, #minitabs .dropdown a span {
 	background: transparent;
 	float: none;
 	margin: 0;
@@ -281,14 +281,16 @@ ul.cplist {
 	text-align: right;
 }
 
-.tabs-container #minitabs .responsive-tabs a span {
+.tabs-container #minitabs .dropdown a span {
 	text-align: left;
 }
 
-#tabs .responsive-tabs a span, #minitabs .responsive-tabs a span {
-	padding: 5px;
+#tabs .dropdown a span, #minitabs .dropdown a span {
+	padding: 5px 8px;
+	color: inherit !important;
 }
 
+
 /* UCP navigation menu
 ----------------------------------------*/
 /* Container for sub-navigation list */
-- 
cgit v1.2.1


From a8f14b9ce365c16292f775c1aa5d08d1afe53978 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 23 Oct 2013 22:57:16 +0300
Subject: [ticket/11956] Fix docblock for dropdown handler

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 1169c9f2dc..9895510a1b 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -409,14 +409,6 @@ function insert_single_user(formId, user)
 	self.close();
 }
 
-/**
-* Dropdown handler
-* Shows/hides dropdown, decides which side to open to
-*
-* @param [jQuery] toggle Link that toggles dropdown
-* @param [jQuery] dropdown Dropdown menu
-* @param [Object] [options] List of options
-*/
 function toggle_dropdown()
 {
 	var $this = $(this),
@@ -461,6 +453,14 @@ function toggle_dropdown()
 	parent.toggleClass(options.visibleClass, !visible).toggleClass('dropdown-visible', !visible);
 }
 
+/**
+* Dropdown handler
+* Shows/hides dropdown, decides which side to open to
+*
+* @param [jQuery] toggle Link that toggles dropdown
+* @param [jQuery] dropdown Dropdown menu
+* @param [Object] [options] List of options
+*/
 function register_dropdown(toggle, dropdown, options)
 {
 	var ops = {
-- 
cgit v1.2.1


From 17a954f454f7eddaf2facd7a00114ddbf2ae7490 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 23 Oct 2013 23:08:18 +0300
Subject: [ticket/11956] Responsive subforums list

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/responsive.css | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index faa46a3700..cfe76149d8 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -178,6 +178,14 @@ li.row .responsive-show strong {
 	color: inherit;
 }
 
+ul.topiclist li.row dt a.subforum {
+	display: inline-block;
+	vertical-align: bottom;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	max-width: 100px;
+}
+
 /* Notifications list
 ----------------------------------------*/
 @media only screen and (max-width: 350px), only screen and (max-device-width: 350px)
-- 
cgit v1.2.1


From bf964d9570273e9137f7711ec39365c84fc5e001 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 23 Oct 2013 23:17:29 +0300
Subject: [ticket/11956] Make notification, pm and forum index icons clickable

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/buttons.css | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 9992f389e7..85a87b5c50 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -103,6 +103,12 @@ ul.linklist.bulletin li.icon-bookmark:before, ul.linklist.bulletin li.icon-bump:
 	display: none;
 }
 
+.icon-home > span:first-child > a, .icon-notification > a, .icon-pm > a {
+	display: inline-block;
+	margin-left: -17px;
+	padding-left: 17px;
+}
+
 /* Poster profile icons
 ----------------------------------------*/
 ul.profile-icons {
-- 
cgit v1.2.1


From fb3a4668059b2002df1198f3ccc1f00e01e4d084 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 23 Oct 2013 23:32:09 +0300
Subject: [ticket/11956] Adjustments for responsive minitabs

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/colours.css |  9 +++++++--
 phpBB/styles/prosilver/theme/cp.css      | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 19021ca387..960415afbf 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -844,7 +844,7 @@ ul.cplist {
 	background-color: #F9F9F9;
 }
 
-#minitabs li.activetab a, #minitabs li.activetab a:hover {
+#minitabs li.activetab a span, #minitabs li.activetab a:hover span {
 	color: #333333;
 }
 
@@ -1136,7 +1136,7 @@ input.disabled {
 	border-color: #FFF transparent;
 }
 
-#notification_list .pointer-inner {
+#notification_list .pointer-inner, #minitabs .pointer-inner {
 	border-color: #F1F8FF transparent;
 }
 
@@ -1153,6 +1153,11 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist
 	border-color: #b9b9b9;
 	box-shadow: 1px 3px 5px rgba(0, 0, 0, 0.2);
 }
+
 .dropdown-up .dropdown-contents {
 	box-shadow: 1px 0 5px rgba(0, 0, 0, 0.2);
 }
+
+#minitabs .dropdown-contents {
+	background-color: #F1F8FF;
+}
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index 3e017719d6..71b63a9707 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -260,17 +260,31 @@ ul.cplist {
 	margin-right: -1px;
 }
 
+#minitabs .dropdown {
+	top: 18px;
+}
+
 #tabs .dropdown-up .dropdown, #minitabs .dropdown-up .dropdown {
 	bottom: -5px;
 	top: auto;
 }
 
+#minitabs .dropdown-up .dropdown {
+	bottom: 18px;
+}
+
 #tabs .dropdown-right .dropdown, #minitabs .dropdown-right .dropdown {
 	margin-left: -41px;
 }
 
 #tabs .dropdown li, #minitabs .dropdown li {
 	display: block !important;
+	background: transparent none;
+	padding: 0;
+}
+
+.tabs-container #minitabs .dropdown a span {
+	display: block;
 }
 
 #tabs .dropdown a, #tabs .dropdown a span, #minitabs .dropdown a, #minitabs .dropdown a span {
-- 
cgit v1.2.1


From 31345800078791e74c8935936c8e7edafb2a2797 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 23 Oct 2013 23:46:29 +0300
Subject: [ticket/11956] More fixes for responsive minitabs

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 3 ++-
 phpBB/styles/prosilver/theme/cp.css         | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 9895510a1b..0da3c77d53 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -934,7 +934,8 @@ function parse_document(container)
 			responsive = false;
 
 		links.each(function() {
-			maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
+			var link = $(this);
+			maxHeight = Math.max(maxHeight, Math.max(link.outerHeight(true), link.parent().outerHeight(true)));
 		})
 
 		function check() {
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css
index 71b63a9707..2003fef954 100644
--- a/phpBB/styles/prosilver/theme/cp.css
+++ b/phpBB/styles/prosilver/theme/cp.css
@@ -105,6 +105,7 @@ ul.cplist {
 .tabs-container #minitabs {
 	float: right;
 	margin-top: 19px;
+	max-width: 50%;
 }
 
 .tabs-container:after {
-- 
cgit v1.2.1


From bbb73d6e5cb6375f71793b00d8ef242268da897f Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 24 Oct 2013 11:43:53 +0300
Subject: [ticket/11956] Move dropdown menu from edges of screen

Also add -webkit prefix to box-sizing

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 25 +++++++++++++++++++++++++
 phpBB/styles/prosilver/theme/common.css     |  4 ++++
 phpBB/styles/prosilver/theme/content.css    |  1 +
 3 files changed, 30 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 0da3c77d53..23dfae9fab 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -451,6 +451,31 @@ function toggle_dropdown()
 
 	options.dropdown.toggle();
 	parent.toggleClass(options.visibleClass, !visible).toggleClass('dropdown-visible', !visible);
+
+	// Check dimensions when showing dropdown
+	// !visible because variable shows state of dropdown before it was toggled
+	if (!visible) {
+		options.dropdown.find('.dropdown-contents').each(function() {
+			var $this = $(this),
+				windowWidth = $(window).width();
+
+			$this.css({
+				marginLeft: 0,
+				left: 0,
+				maxWidth: (windowWidth - 4) + 'px'
+			});
+
+			var offset = $this.offset().left,
+				width = $this.outerWidth(true);
+
+			if (offset < 2) {
+				$this.css('left', (2 - offset) + 'px');
+			}
+			else if ((offset + width + 2) > windowWidth) {
+				$this.css('margin-left', (windowWidth - offset - width - 2) + 'px');
+			}
+		});
+	}
 }
 
 /**
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 9e15eada22..bc2432e2a4 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -510,6 +510,10 @@ ul.linklist.bulletin li.no-bulletin:before {
 	border: 1px solid transparent;
 	border-radius: 5px;
 	padding: 5px;
+	position: relative;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }
 
 .dropdown li {
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index ad6f27665d..389f93fa4e 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -516,6 +516,7 @@ blockquote .codebox {
 	padding: 6px;
 	border: 1px dashed transparent;
 	clear: left;
+	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }
-- 
cgit v1.2.1


From 1795f1d54bc37cd9e8858156801acad1b18ce1fa Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 24 Oct 2013 19:57:19 +0300
Subject: [ticket/11956] More resposive dropdown fixes

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/buttons.css | 6 +++---
 phpBB/styles/prosilver/theme/common.css  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 85a87b5c50..3eff3cf4f4 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -182,13 +182,13 @@ ul.profile-icons.responsive a.responsive-menu-link:before {
 	top: 20px;
 }
 
-.postbody ul.profile-icons.responsive .responsive-popup {
+.postbody ul.profile-icons .dropdown {
 	left: auto;
 	right: -4px;
 	top: 30px;
 }
 
-.postbody ul.profile-icons.responsive .responsive-popup li, .postbody ul.profile-icons.responsive .responsive-popup li a {
+.postbody ul.profile-icons .dropdown li, .postbody ul.profile-icons .dropdown li a {
 	display: block;
 	background: transparent none;
 	width: auto;
@@ -199,7 +199,7 @@ ul.profile-icons.responsive a.responsive-menu-link:before {
 	list-style-type: none;
 }
 
-.postbody ul.profile-icons.responsive .responsive-popup li span {
+.postbody ul.profile-icons .dropdown li span {
 	display: block;
 	text-align: right;
 	font-size: 1.2em;
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index bc2432e2a4..3605b9e1a4 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -523,7 +523,7 @@ ul.linklist.bulletin li.no-bulletin:before {
 	text-align: left;
 }
 
-.wrap .dropdown li, .dropdown.wrap li {
+.wrap .dropdown li, .dropdown.wrap li, #notification_list li {
 	white-space: normal;
 }
 
-- 
cgit v1.2.1


From 3b1260fd286539929905bc35e625cdd213a3ef2c Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 24 Oct 2013 19:59:31 +0300
Subject: [ticket/11956] One more dropdown fix

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/buttons.css | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 3eff3cf4f4..33f924717a 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -182,12 +182,6 @@ ul.profile-icons.responsive a.responsive-menu-link:before {
 	top: 20px;
 }
 
-.postbody ul.profile-icons .dropdown {
-	left: auto;
-	right: -4px;
-	top: 30px;
-}
-
 .postbody ul.profile-icons .dropdown li, .postbody ul.profile-icons .dropdown li a {
 	display: block;
 	background: transparent none;
-- 
cgit v1.2.1


From 4639d4fc86a56eccc6ae9e7fa295111535c3fdb7 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 24 Oct 2013 20:51:58 +0300
Subject: [ticket/11956] Reverse order of .rightside items in dropdown

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 23dfae9fab..b9604c3248 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -906,7 +906,11 @@ function parse_document(container)
 			responsive = true;
 
 			if (!copied) {
-				menu.append(links.clone(true));
+				var clone = links.clone(true);
+				clone.filter('.rightside').each(function() {
+					menu.prepend(this);
+				});
+				menu.prepend(clone.not('.rightside'));
 				menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
 				menu.find('.inputbox').parents('li:first').css('white-space', 'normal');
 				copied = true;
-- 
cgit v1.2.1


From c879e8c0dd9af672c94ae6d9b0468e9d3265408f Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 24 Oct 2013 21:28:49 +0300
Subject: [ticket/11956] Fix asterix position in post menu icon

PHPBB3-11956
---
 .../styles/prosilver/theme/images/icon_post_menu.png  | Bin 1946 -> 1931 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/images/icon_post_menu.png b/phpBB/styles/prosilver/theme/images/icon_post_menu.png
index 23e24d7c03..2b48289fdb 100644
Binary files a/phpBB/styles/prosilver/theme/images/icon_post_menu.png and b/phpBB/styles/prosilver/theme/images/icon_post_menu.png differ
-- 
cgit v1.2.1


From fa8d1eb2dccde3a561f95ba1e8b1515e2355ae3a Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 02:20:13 +0300
Subject: [ticket/11956] Swap navigation events in header

PHPBB3-11956
---
 phpBB/styles/prosilver/template/overall_header.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 854f92e9ce..6186fe051e 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -156,14 +156,14 @@
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 
-				<!-- EVENT overall_header_navigation_prepend -->
+				<!-- EVENT overall_header_navigation_append -->
 				<!-- IF not S_IS_BOT -->
 					<li class="icon-logout rightside no-bulletin"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
 					<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="icon-register rightside no-bulletin"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
 					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members rightside no-bulletin"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
 				<!-- ENDIF -->
 				<li class="icon-faq rightside no-bulletin"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
-				<!-- EVENT overall_header_navigation_append -->
+				<!-- EVENT overall_header_navigation_prepend -->
 			</ul>
 
 			</div>
-- 
cgit v1.2.1


From db9ca2fc63ce02031c1cfec2e617a891def62e34 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 02:20:49 +0300
Subject: [ticket/11956] Fix IE responsive breadcrumbs and navigation icon

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 12 +++++++-----
 phpBB/styles/prosilver/theme/common.css     | 14 ++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index b9604c3248..3b13211362 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -584,11 +584,6 @@ function parse_document(container)
 			lastWidth = false,
 			wrapped = false;
 
-		// Test height by setting nowrap
-		$this.css('white-space', 'nowrap');
-		maxHeight = $this.height() + 1;
-		$this.css('white-space', '');
-
 		// Set tooltips
 		$this.find('a').each(function() {
 			var $link = $(this);
@@ -601,6 +596,13 @@ function parse_document(container)
 				width = $body.width(),
 				link, i, j;
 
+			maxHeight = parseInt($this.css('line-height')) | 0;
+			links.each(function() {
+				if ($(this).height() > 0) {
+					maxHeight = Math.max(maxHeight, $(this).outerHeight(true));
+				}
+			});
+
 			if (height <= maxHeight) {
 				if (!wrapped || lastWidth === false || lastWidth >= width) {
 					lastWidth = width;
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 3605b9e1a4..84aea8212c 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -372,7 +372,7 @@ ul.linklist li.responsive-menu a.responsive-menu-link {
 	font-size: 16px;
 	position: relative;
 	width: 16px;
-	line-height: 16px;
+	line-height: 16.5px;
 	text-decoration: none;
 }
 
@@ -533,20 +533,22 @@ ul.linklist.bulletin li.no-bulletin:before {
 
 /* Responsive breadcrumbs
 ----------------------------------------*/
+.breadcrumbs .crumb {
+	word-wrap: normal;
+}
+
 .breadcrumbs .crumb a {
 	display: inline-block;
+	white-space: nowrap;
+	text-overflow: ellipsis;
 	vertical-align: bottom;
+	overflow: hidden;
 }
 
 .breadcrumbs.wrapped .crumb a { letter-spacing: -.3px; }
 .breadcrumbs.wrapped .crumb.wrapped-medium a { letter-spacing: -.4px; }
 .breadcrumbs.wrapped .crumb.wrapped-tiny a { letter-spacing: -.5px; }
 
-.breadcrumbs .crumb.wrapped a {
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
 .breadcrumbs .crumb.wrapped-max a { max-width: 120px; }
 .breadcrumbs .crumb.wrapped-wide a { max-width: 100px; }
 .breadcrumbs .crumb.wrapped-medium a { max-width: 80px; }
-- 
cgit v1.2.1


From 6dedac19292b4979a7b15aea02d7f1366b4902bc Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 12:50:36 +0300
Subject: [ticket/11956] Adjust few elements for tiny devices

Change min-width for tiny phones
Adjust form elements max-width for tiny phones

PHPBB3-11956
---
 phpBB/styles/prosilver/theme/responsive.css | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index cfe76149d8..d7af7519b7 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -17,7 +17,7 @@ body {
 }
 
 #wrap {
-	min-width: 320px;
+	min-width: 300px;
 	padding: 0;
 }
 
@@ -343,6 +343,19 @@ fieldset.quick-login label[for="autologin"] {
 	min-width: 50%;
 }
 
+@media only screen and (max-width: 500px), only screen and (max-device-width: 500px)
+{
+	select, .inputbox {
+		max-width: 260px;
+	}
+}
+
+@media only screen and (max-width: 320px), only screen and (max-device-width: 320px)
+{
+	select, .inputbox {
+		max-width: 240px;
+	}
+}
 
 /* User profile
 ----------------------------------------*/
-- 
cgit v1.2.1


From 7cb9493489bdbd11b3bafdc7ee21ef102564cc3b Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 14:18:24 +0300
Subject: [ticket/11969] Change topic link to unread post in prosilver

PHPBB3-11969
---
 phpBB/styles/prosilver/template/search_results.html      | 13 +++++++++----
 phpBB/styles/prosilver/template/ucp_main_bookmarks.html  | 16 +++++++++++-----
 phpBB/styles/prosilver/template/ucp_main_front.html      | 14 ++++++++++----
 phpBB/styles/prosilver/template/ucp_main_subscribed.html | 16 +++++++++++-----
 phpBB/styles/prosilver/template/viewforum_body.html      | 13 +++++++++----
 5 files changed, 50 insertions(+), 22 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 52163aeb0a..0d47e85c2e 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -64,8 +64,13 @@
 						<div class="list-inner">
 
 							<!-- EVENT topiclist_row_prepend -->
-							<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->
-							<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG}
+							<!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT -->
+								<a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> 
+								<a href="{searchresults.U_NEWEST_POST}" class="topictitle">{searchresults.TOPIC_TITLE}</a>
+							<!-- ELSE -->
+								<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a>
+							<!-- ENDIF -->
+							{searchresults.ATTACH_ICON_IMG}
 							<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF -->
 							<!-- IF searchresults.S_TOPIC_DELETED --><a href="{searchresults.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF -->
 							<!-- IF searchresults.S_TOPIC_REPORTED --><a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
@@ -83,7 +88,7 @@
 								</ul>
 							</div>
 							<!-- ENDIF -->
-							{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} &raquo; {searchresults.FIRST_POST_TIME} &raquo; {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a>
+							{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} &raquo; <!-- IF not S_IS_BOT --><a href="{searchresults.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{searchresults.FIRST_POST_TIME}</a><!-- ELSE -->{searchresults.FIRST_POST_TIME}<!-- ENDIF --> &raquo; {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a>
 							<!-- EVENT topiclist_row_append -->
 
 						</div>
@@ -92,7 +97,7 @@
 					<dd class="views">{searchresults.TOPIC_VIEWS}</dd>
 					<dd class="lastpost"><span>
 						{L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL}
-						<!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{searchresults.LAST_POST_TIME}<br /> </span>
+						<!-- IF not S_IS_BOT --><a href="{searchresults.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{searchresults.LAST_POST_TIME}<br /> </span>
 					</dd>
 				</dl>
 			</li>
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index 477b06249e..96becc42e7 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -37,9 +37,15 @@
 			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">
 				<dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 					<div class="list-inner">
-						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- IF topicrow.S_UNREAD_TOPIC -->
+							<a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> 
+							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- ELSE -->
+							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
+						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF -->
+						<br />
 						<!-- IF .topicrow.pagination -->
 						<div class="pagination">
 							<ul>
@@ -56,17 +62,17 @@
 						<!-- ENDIF -->
 						<div class="responsive-hide">
 							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
-							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; <a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a>
 						</div>
 						<div class="responsive-show" style="display: none;">
 							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
 							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo;
-							<a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+							<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
 						</div>
 					</div>
 				</dt>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
+					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
 				</dd>
 				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
 			</dl>
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
index fa3291cd6c..eca224f2d9 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -16,7 +16,13 @@
 			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">
 				<dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
 					<div class="list-inner">
-						<!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br />
+						<!-- IF topicrow.S_UNREAD -->
+							<a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> 
+							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- ELSE -->
+							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- ENDIF -->
+						<br />
 						<!-- IF .topicrow.pagination -->
 						<div class="pagination">
 							<ul>
@@ -33,16 +39,16 @@
 						<!-- ENDIF -->
 						<div class="responsive-hide">
 							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
-							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; <a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a>
 						</div>
 						<div class="responsive-show" style="display: none;">
 							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
-							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
 						</div>
 					</div>
 				</dt>
 				<dd class="lastpost"><span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
+					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
 				</dd>
 			</dl>
 		</li>
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index 7344a4af1a..0187f3cc3f 100755
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -72,9 +72,15 @@
 			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">
 				<dt<!-- IF topicrow.TOPIC_ICON_IMG --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 					<div class="list-inner">
-						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- IF topicrow.S_UNREAD_TOPIC -->
+							<a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> 
+							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- ELSE -->
+							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
-						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
+						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF -->
+						<br />
 						<!-- IF .topicrow.pagination -->
 						<div class="pagination">
 							<ul>
@@ -91,16 +97,16 @@
 						<!-- ENDIF -->
 						<div class="responsive-hide">
 							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
-							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; <a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a>
 						</div>
 						<div class="responsive-show" style="display: none;">
 							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
-							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
 						</div>
 					</div>
 				</dt>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
+					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <br />{topicrow.LAST_POST_TIME}</span>
 				</dd>
 				<dd class="mark"><input type="checkbox" name="t[{topicrow.TOPIC_ID}]" id="t{topicrow.TOPIC_ID}" /></dd>
 			</dl>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 360d9ae789..a94e9ef8ba 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -145,7 +145,12 @@
 				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 					<div class="list-inner">
 						<!-- EVENT topiclist_row_prepend -->
-						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT -->
+							<a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> 
+							<a href="{topicrow.U_NEWEST_POST}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- ELSE -->
+							<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+						<!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_REPORTED --><a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
@@ -165,12 +170,12 @@
 						<!-- ENDIF -->
 						<div class="responsive-hide">
 							<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->
-							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
+							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; <!-- IF not S_IS_BOT --><a href="{topicrow.U_VIEW_TOPIC}" title="{L_GOTO_FIRST_POST}">{topicrow.FIRST_POST_TIME}</a><!-- ELSE -->{topicrow.FIRST_POST_TIME}<!-- ENDIF -->
 							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> &raquo; {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
 						</div>
 						<!-- IF not S_IS_BOT -->
 						<div class="responsive-show" style="display: none;">
-							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
 							<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><br />{L_POSTED} {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
 							<!-- IF topicrow.REPLIES --><br />{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong><!-- ENDIF -->
 						</div>
@@ -182,7 +187,7 @@
 				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
 				<dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
-					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{topicrow.LAST_POST_TIME}</span>
+					<!-- IF not S_IS_BOT --><a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{topicrow.LAST_POST_TIME}</span>
 				</dd>
 			</dl>
 		</li>
-- 
cgit v1.2.1


From dbd4b5bdbce1e84e6686f8b76efdf4489a8c081f Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 25 Oct 2013 14:18:53 +0300
Subject: [ticket/11969] Change topic link to unread post in subsilver2

PHPBB3-11969
---
 phpBB/styles/subsilver2/template/search_results.html      | 2 +-
 phpBB/styles/subsilver2/template/ucp_main_bookmarks.html  | 2 +-
 phpBB/styles/subsilver2/template/ucp_main_front.html      | 2 +-
 phpBB/styles/subsilver2/template/ucp_main_subscribed.html | 2 +-
 phpBB/styles/subsilver2/template/viewforum_body.html      | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/search_results.html b/phpBB/styles/subsilver2/template/search_results.html
index 19ba0b196a..092779055d 100644
--- a/phpBB/styles/subsilver2/template/search_results.html
+++ b/phpBB/styles/subsilver2/template/search_results.html
@@ -36,7 +36,7 @@
 			<td class="row1">
 				<!-- EVENT topiclist_row_prepend -->
 				<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF -->
-				{searchresults.ATTACH_ICON_IMG} <a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a>
+				{searchresults.ATTACH_ICON_IMG} <a href="<!-- IF not S_IS_BOT and searchresults.S_UNREAD_TOPIC  -->{searchresults.U_NEWEST_POST}<!-- ELSE -->{searchresults.U_VIEW_TOPIC}<!-- ENDIF -->" class="topictitle">{searchresults.TOPIC_TITLE}</a>
 				<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED -->
 					<a href="{searchresults.U_MCP_QUEUE}" class="imageset">{searchresults.UNAPPROVED_IMG}</a>&nbsp;
 				<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html b/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html
index e91417503f..a8c6b4a9a8 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html
@@ -41,7 +41,7 @@
 			<td class="postdetails" style="padding: 4px" width="100%" colspan="2">{L_DELETED_TOPIC}</td>
 		<!-- ELSE -->
 			<td style="padding: 4px;" width="100%" valign="top">
-				<p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p>
+				<p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="<!-- IF topicrow.S_UNREAD_TOPIC -->{topicrow.U_NEWEST_POST}<!-- ELSE -->{topicrow.U_VIEW_TOPIC}<!-- ENDIF -->">{topicrow.TOPIC_TITLE}</a></p>
 				<!-- IF topicrow.S_GLOBAL_TOPIC --><span class="gensmall">{L_GLOBAL_ANNOUNCEMENT}</span><!-- ELSE --><span class="gensmall"><b>{L_FORUM}{L_COLON} </b><a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span><!-- ENDIF -->
 				<!-- IF .topicrow.pagination -->
 					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON} 
diff --git a/phpBB/styles/subsilver2/template/ucp_main_front.html b/phpBB/styles/subsilver2/template/ucp_main_front.html
index 5dea2b4f03..bc26266bef 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_front.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_front.html
@@ -16,7 +16,7 @@
 	<!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 		<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
 		<td class="row1" width="100%">
-			<p class="topictitle"><!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p><p class="gensmall">{topicrow.GOTO_PAGE}</p>
+			<p class="topictitle"><!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="<!-- IF topicrow.S_UNREAD -->{topicrow.U_NEWEST_POST}<!-- ELSE -->{topicrow.U_VIEW_TOPIC}<!-- ENDIF -->">{topicrow.TOPIC_TITLE}</a></p><p class="gensmall">{topicrow.GOTO_PAGE}</p>
 		</td>
 		<td class="row1" width="120" align="center" nowrap="nowrap">
 			<p class="topicdetails">{topicrow.LAST_POST_TIME}</p>
diff --git a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html
index 45094abe5f..9de44dd9ed 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html
@@ -50,7 +50,7 @@
 		<!-- IF topicrow.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
 			<td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
 			<td style="padding: 4px;" width="100%" valign="top">
-				<p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p>
+				<p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="<!-- IF topicrow.S_UNREAD_TOPIC -->{topicrow.U_NEWEST_POST}<!-- ELSE -->{topicrow.U_VIEW_TOPIC}<!-- ENDIF -->">{topicrow.TOPIC_TITLE}</a></p>
 				<!-- IF topicrow.S_GLOBAL_TOPIC --><span class="gensmall">{L_GLOBAL_ANNOUNCEMENT}</span><!-- ELSE --><span class="gensmall"><b>{L_FORUM}{L_COLON} </b><a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></span><!-- ENDIF -->
 				<!-- IF .topicrow.pagination -->
 					<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}{L_COLON} 
diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html
index dfbe0a605b..7ad81f5737 100644
--- a/phpBB/styles/subsilver2/template/viewforum_body.html
+++ b/phpBB/styles/subsilver2/template/viewforum_body.html
@@ -207,7 +207,8 @@
 				<td class="row1">
 					<!-- EVENT topiclist_row_prepend -->
 					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF -->
-					{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}{L_COLON} {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
+					{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF -->
+					<a title="{L_POSTED}{L_COLON} {topicrow.FIRST_POST_TIME}" href="<!-- IF not S_IS_BOT and topicrow.S_UNREAD_TOPIC -->{topicrow.U_NEWEST_POST}<!-- ELSE -->{topicrow.U_VIEW_TOPIC}<!-- ENDIF -->" class="topictitle">{topicrow.TOPIC_TITLE}</a>
 					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
 						<a href="{topicrow.U_MCP_QUEUE}" class="imageset">{topicrow.UNAPPROVED_IMG}</a>&nbsp;
 					<!-- ENDIF -->
-- 
cgit v1.2.1


From ee4c1ba5a87ae6c15fa187c40ff94939f09ab6a8 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 12:22:33 +0300
Subject: [ticket/11956] Check for children elements in tables

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 3b13211362..35b8290e5c 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -800,7 +800,7 @@ function parse_document(container)
 					return;
 				}
 
-				if (text.length && text !== '-') {
+				if ((text.length && text !== '-') || cell.children().length) {
 					cell.prepend('<dfn style="display: none;">' + headers[column] + '</dfn>');
 				}
 				else {
-- 
cgit v1.2.1


From 368b3f0d9e6af2fe625c2955130399cefb86e41b Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 16:29:37 +0300
Subject: [ticket/11956] Move dropdown handler to assets

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 110 +---------------------------
 1 file changed, 4 insertions(+), 106 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 35b8290e5c..c6301bad15 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -409,108 +409,6 @@ function insert_single_user(formId, user)
 	self.close();
 }
 
-function toggle_dropdown()
-{
-	var $this = $(this),
-		options = $this.data('dropdown-options'),
-		parent = options.parent,
-		visible = parent.hasClass('dropdown-visible');
-
-	if (!visible) {
-		// Hide other dropdown menus
-		$('.dropdown-container.dropdown-visible .dropdown-toggle').each(toggle_dropdown);
-
-		// Figure out direction of dropdown
-		var direction = options.direction,
-			verticalDirection = options.verticalDirection,
-			offset = $this.offset();
-
-		if (direction == 'auto') {
-			if (($(window).width() - $this.outerWidth(true)) / 2 > offset.left) {
-				direction = 'right';
-			}
-			else {
-				direction = 'left';
-			}
-		}
-		parent.toggleClass(options.leftClass, direction == 'left').toggleClass(options.rightClass, direction == 'right');
-
-		if (verticalDirection == 'auto') {
-			var height = $(window).height(),
-				top = offset.top - $(window).scrollTop();
-
-			if (top < height * 0.7) {
-				verticalDirection = 'down';
-			}
-			else {
-				verticalDirection = 'up';
-			}
-		}
-		parent.toggleClass(options.upClass, verticalDirection == 'up').toggleClass(options.downClass, verticalDirection == 'down');
-	}
-
-	options.dropdown.toggle();
-	parent.toggleClass(options.visibleClass, !visible).toggleClass('dropdown-visible', !visible);
-
-	// Check dimensions when showing dropdown
-	// !visible because variable shows state of dropdown before it was toggled
-	if (!visible) {
-		options.dropdown.find('.dropdown-contents').each(function() {
-			var $this = $(this),
-				windowWidth = $(window).width();
-
-			$this.css({
-				marginLeft: 0,
-				left: 0,
-				maxWidth: (windowWidth - 4) + 'px'
-			});
-
-			var offset = $this.offset().left,
-				width = $this.outerWidth(true);
-
-			if (offset < 2) {
-				$this.css('left', (2 - offset) + 'px');
-			}
-			else if ((offset + width + 2) > windowWidth) {
-				$this.css('margin-left', (windowWidth - offset - width - 2) + 'px');
-			}
-		});
-	}
-}
-
-/**
-* Dropdown handler
-* Shows/hides dropdown, decides which side to open to
-*
-* @param [jQuery] toggle Link that toggles dropdown
-* @param [jQuery] dropdown Dropdown menu
-* @param [Object] [options] List of options
-*/
-function register_dropdown(toggle, dropdown, options)
-{
-	var ops = {
-			parent: toggle.parent(), // Parent item to add classes to
-			direction: 'auto', // Direction of dropdown menu. Possible values: auto, left, right
-			verticalDirection: 'auto', // Vertical direction. Possible values: auto, up, down
-			visibleClass: 'visible', // Class to add to parent item when dropdown is visible
-			leftClass: 'dropdown-left', // Class to add to parent item when dropdown opens to left side
-			rightClass: 'dropdown-right', // Class to add to parent item when dropdown opens to right side
-			upClass: 'dropdown-up', // Class to add to parent item when dropdown opens above menu item
-			downClass: 'dropdown-down' // Class to add to parent item when dropdown opens below menu item
-		};
-	if (options) {
-		ops = $.extend(ops, options);
-	}
-	ops.dropdown = dropdown;
-
-	ops.parent.addClass('dropdown-container');
-	toggle.addClass('dropdown-toggle');
-
-	toggle.data('dropdown-options', ops);
-
-	toggle.click(toggle_dropdown);
-}
-
 /**
 * Parse document block
 */
@@ -943,7 +841,7 @@ function parse_document(container)
 			links.css('display', 'none');
 		}
 
-		register_dropdown(item.find('a.responsive-menu-link'), item.find('.dropdown'));
+		phpbb.registerDropdown(item.find('a.responsive-menu-link'), item.find('.dropdown'));
 
 		check();
 		$(window).resize(check);
@@ -985,7 +883,7 @@ function parse_document(container)
 			if (height <= maxHeight) {
 				responsive = false;
 				if (item.hasClass('dropdown-visible')) {
-					toggle_dropdown.call(item.find('a.responsive-tab-link').get(0));
+					phpbb.toggleDropdown.call(item.find('a.responsive-tab-link').get(0));
 				}
 				return;
 			}
@@ -1010,7 +908,7 @@ function parse_document(container)
 			menu.find('a').click(function() { check(true); });
 		}
 
-		register_dropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), {visibleClass: 'activetab'});
+		phpbb.registerDropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), {visibleClass: 'activetab'});
 
 		check(true);
 		$(window).resize(check);
@@ -1046,7 +944,7 @@ function parse_document(container)
 
 			var parents = $(e.target).parents();
 			if (!parents.is('.dropdown-container.dropdown-visible')) {
-				$('.dropdown-container.dropdown-visible .dropdown-toggle').each(toggle_dropdown);
+				$('.dropdown-container.dropdown-visible .dropdown-toggle').each(phpbb.toggleDropdown);
 			}
 		});
 
-- 
cgit v1.2.1


From c521380273be66ed99e2f16ba914a033a6bf3250 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 16:35:59 +0300
Subject: [ticket/11956] Move code that hides dropdowns to assets

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index c6301bad15..a01e7fd405 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -939,15 +939,6 @@ function parse_document(container)
 			$('#' + this.getAttribute('data-focus')).focus();
 		});
 
-		// Hide active dropdowns when click event happens outside
-		$('#phpbb').click(function(e) {
-
-			var parents = $(e.target).parents();
-			if (!parents.is('.dropdown-container.dropdown-visible')) {
-				$('.dropdown-container.dropdown-visible .dropdown-toggle').each(phpbb.toggleDropdown);
-			}
-		});
-
 		parse_document($('body'));
 	});
 })(jQuery);
-- 
cgit v1.2.1


From e8b4a50a3d17e812995828e1b274a2b6930389f6 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 26 Oct 2013 20:28:36 +0300
Subject: [ticket/11956] Ability to swap full and responsive text

PHPBB3-11956
---
 phpBB/styles/prosilver/template/forum_fn.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index a01e7fd405..1b2b1954ef 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -924,6 +924,31 @@ function parse_document(container)
 			$(this).addClass('responsive-hide');
 		}
 	});
+
+	/**
+	* Replace responsive text
+	*/
+	container.find('[data-responsive-text]').each(function() {
+		var $this = $(this),
+			fullText = $this.text(),
+			responsiveText = $this.attr('data-responsive-text'),
+			responsive = false;
+
+		function check() {
+			if ($(window).width() > 700) {
+				if (!responsive) return;
+				$this.text(fullText);
+				responsive = false;
+				return;
+			}
+			if (responsive) return;
+			$this.text(responsiveText);
+			responsive = true;
+		}
+
+		check();
+		$(window).resize(check);
+	});
 }
 
 /**
-- 
cgit v1.2.1


From da4e0c4219e5132ffddd67fc4621840c557c132a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 15 Oct 2013 21:37:53 -0700
Subject: [ticket/11928] Replace AJAX loading popup with animation.

PHPBB3-11928
---
 phpBB/styles/prosilver/template/overall_footer.html |   2 +-
 phpBB/styles/prosilver/theme/colours.css            |   5 +++++
 phpBB/styles/prosilver/theme/common.css             |  14 ++++++++++++++
 phpBB/styles/prosilver/theme/images/loading.gif     | Bin 0 -> 1320 bytes
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 phpBB/styles/prosilver/theme/images/loading.gif

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 86e55c54f6..a831ab6cb4 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -34,8 +34,8 @@
 
 	<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>
-		<div class="phpbb_alert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 	</div>
+	<div id="loading_indicator"></div>
 
 	<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
 		<a href="#" class="alert_close"></a>
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 960415afbf..d4e63bf3ec 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1104,6 +1104,11 @@ input.disabled {
 	background-color: #000000;
 }
 
+#loading_indicator {
+	background-color: #000000;
+	background-image: url("./images/loading.gif");
+}
+
 #notification_list ul li {
 	border-bottom-color: #B9B9B9;
 }
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 84aea8212c..1e5c9e4e6a 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -821,6 +821,20 @@ li.pagination ul {
 	opacity: 0.5;
 }
 
+#loading_indicator {
+	background: center center no-repeat;
+	border-radius: 5px;
+	display: none;
+	opacity: 0.8;
+	margin-top: -50px;
+	margin-left: -50px;
+	height: 50px;
+	width: 50px;
+	position: fixed;
+	left: 50%;
+	top: 50%;
+}
+
 /* Miscellaneous styles
 ---------------------------------------- */
 #forum-permissions {
diff --git a/phpBB/styles/prosilver/theme/images/loading.gif b/phpBB/styles/prosilver/theme/images/loading.gif
new file mode 100644
index 0000000000..e1ed0883e0
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/loading.gif differ
-- 
cgit v1.2.1


From 57fc62b000391438adde160f97efaea7e2f0329a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 29 Oct 2013 10:11:29 -0700
Subject: [ticket/11928] Make sure the indicator is on top of other elements.

PHPBB3-11928
---
 phpBB/styles/prosilver/theme/common.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 1e5c9e4e6a..225673a932 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -833,6 +833,7 @@ li.pagination ul {
 	position: fixed;
 	left: 50%;
 	top: 50%;
+	z-index: 51;
 }
 
 /* Miscellaneous styles
-- 
cgit v1.2.1


From dffe790f19a17e45b25ab44391d14ca8b36ba420 Mon Sep 17 00:00:00 2001
From: erangamapa <erangamapa@gmail.com>
Date: Sun, 19 May 2013 19:10:20 +0530
Subject: [ticket/11030] Fixing cursor appearing in file upload browse button.

Removed unnecessary cursor CSS properties added for form inputs in both acp
and prosilver styles. Added cursor:pointer property only for buttons.

PHPBB3-11030
---
 phpBB/styles/prosilver/theme/forms.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index f128450955..dd0ef0e50e 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -11,7 +11,6 @@ fieldset {
 
 input {
 	font-weight: normal;
-	cursor: pointer;
 	vertical-align: middle;
 	padding: 0 3px;
 	font-size: 1em;
@@ -279,7 +278,6 @@ fieldset.submit-buttons input {
 .inputbox {
 	border: 1px solid transparent;
 	padding: 2px;
-	cursor: text;
 }
 
 .inputbox:hover, .inputbox:focus {
@@ -337,6 +335,10 @@ input.button3 {
 	font-variant: small-caps;
 }
 
+input[type="button"], input[type="submit"], input[type="reset"] { 
+	cursor: pointer; 
+}
+
 /* Alternative button */
 a.button2, input.button2, input.button3 {
 	border: 1px solid transparent;
-- 
cgit v1.2.1


From 7ce34f3f909a9b19ab98d453af411d5be1c644bc Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 30 Oct 2013 11:51:16 +0200
Subject: [ticket/11030] Fix cursor for checkboxes

PHPBB3-11030
---
 phpBB/styles/prosilver/theme/forms.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index dd0ef0e50e..1ee364ce93 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -335,7 +335,7 @@ input.button3 {
 	font-variant: small-caps;
 }
 
-input[type="button"], input[type="submit"], input[type="reset"] { 
+input[type="button"], input[type="submit"], input[type="reset"], input[type="checkbox"], input[type="radio"] { 
 	cursor: pointer; 
 }
 
-- 
cgit v1.2.1


From e4008308fc7b0eba44b4b12c8155ae6473e5afb0 Mon Sep 17 00:00:00 2001
From: Marcus Vinny <vinny@suportephpbb.com.br>
Date: Thu, 31 Oct 2013 15:30:02 -0300
Subject: [ticket/11992] Fix Users with most Warnings block

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html
index 5a332cf202..c8ac765777 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_front.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_front.html
@@ -51,7 +51,7 @@
 				<td>{highest.WARNING_TIME}</td>
 				<td><a href="{highest.U_NOTES}">{L_VIEW_NOTES}</a></td>
 			</tr>
-		<!-- END latest -->
+		<!-- END highest -->
 		</tbody>
 		</table>
 	<!-- ELSE -->
-- 
cgit v1.2.1


From 069f8061698e95f9a94ac65cbf4c8f3c6a7a7714 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 24 Oct 2013 19:44:40 -0700
Subject: [ticket/11972] Add posting_editor_subject_after template event

PHPBB3-11972
---
 phpBB/styles/prosilver/template/posting_editor.html | 2 ++
 phpBB/styles/subsilver2/template/posting_body.html  | 1 +
 2 files changed, 3 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index f3e62db649..a4be602bdf 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -97,6 +97,8 @@
 	<!-- ENDIF -->
 	<!-- ENDIF -->
 
+	<!-- EVENT posting_editor_subject_after -->
+
 	<!-- INCLUDE posting_buttons.html -->
 
 	<div id="smiley-box">
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 635b05aaa0..ea35ccc20f 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -168,6 +168,7 @@
 	<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}{L_COLON}</b></td>
 	<td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}" /></td>
 </tr>
+<!-- EVENT posting_editor_subject_after -->
 <tr>
 	<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}{L_COLON}</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}&nbsp;</span><br /><br />
 	<!-- IF S_SMILIES_ALLOWED -->
-- 
cgit v1.2.1


From 3be5fe535470f075af9718dc301b06981c9c695f Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 30 Oct 2013 21:25:57 -0700
Subject: [ticket/11972] Add posting_editor_subject_before template event

PHPBB3-11972
---
 phpBB/styles/prosilver/template/posting_editor.html | 2 ++
 phpBB/styles/subsilver2/template/posting_body.html  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index a4be602bdf..9e7716e542 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -86,6 +86,8 @@
 	</dl>
 	<!-- ENDIF -->
 
+	<!-- EVENT posting_editor_subject_before -->
+
 	<!-- IF S_POST_ACTION or S_PRIVMSGS or S_EDIT_DRAFT -->
 	<dl style="clear: left;">
 		<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index ea35ccc20f..efd606550e 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -163,7 +163,7 @@
 	</tr>
 	<!-- ENDIF -->
 <!-- ENDIF -->
-
+<!-- EVENT posting_editor_subject_before -->
 <tr>
 	<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}{L_COLON}</b></td>
 	<td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->120<!-- ELSE -->124<!-- ENDIF -->" tabindex="2" value="{SUBJECT}" /></td>
-- 
cgit v1.2.1


From b8eeca7048cdb6573b3c055f4e2aa3410cb4b506 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 30 Oct 2013 21:27:40 -0700
Subject: [ticket/11972] Add posting_editor_message_before template event

PHPBB3-11972
---
 phpBB/styles/prosilver/template/posting_editor.html | 2 ++
 phpBB/styles/subsilver2/template/posting_body.html  | 1 +
 2 files changed, 3 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 9e7716e542..5afd317fc3 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -133,6 +133,8 @@
 		<!-- ENDIF -->
 	</div>
 
+	<!-- EVENT posting_editor_message_before -->
+
 	<div id="message-box">
 		<textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="4" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
 	</div>
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index efd606550e..ee36e76eb0 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -203,6 +203,7 @@
 
 		<table width="100%" cellspacing="0" cellpadding="0" border="0">
 		<!-- INCLUDE posting_buttons.html -->
+		<!-- EVENT posting_editor_message_before -->
 		<tr>
 			<td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" style="width: 700px; height: 270px; min-width: 98%; max-width: 98%;">{MESSAGE}</textarea></td>
 			<!-- IF S_BBCODE_ALLOWED -->
-- 
cgit v1.2.1


From 835900123e2b6a16288cb6eb635716326dd523c0 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 30 Oct 2013 21:28:50 -0700
Subject: [ticket/11972] Add posting_editor_message_after template event

PHPBB3-11972
---
 phpBB/styles/prosilver/template/posting_editor.html | 2 ++
 phpBB/styles/subsilver2/template/posting_body.html  | 1 +
 2 files changed, 3 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 5afd317fc3..5677b92fc3 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -138,6 +138,8 @@
 	<div id="message-box">
 		<textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="15" cols="76" tabindex="4" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea>
 	</div>
+
+	<!-- EVENT posting_editor_message_after -->
 </fieldset>
 
 <!-- IF $EXTRA_POSTING_OPTIONS eq 1 -->
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index ee36e76eb0..9395e24eb1 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -216,6 +216,7 @@
 			</td>
 			<!-- ENDIF -->
 	 	</tr>
+	 	<!-- EVENT posting_editor_message_after -->
 		</table>
 	</td>
 </tr>
-- 
cgit v1.2.1


From abd035fcc963803ad4bbce140dcf0050f0402960 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 25 Oct 2013 18:33:01 -0700
Subject: [ticket/11975] Add ACP link next to MCP link in header

PHPBB3-11975
---
 phpBB/styles/prosilver/template/index_body.html      | 2 +-
 phpBB/styles/prosilver/template/mcp_header.html      | 4 +---
 phpBB/styles/prosilver/template/viewforum_body.html  | 2 +-
 phpBB/styles/prosilver/template/viewtopic_body.html  | 3 ++-
 phpBB/styles/subsilver2/template/index_body.html     | 4 ++--
 phpBB/styles/subsilver2/template/mcp_header.html     | 4 +---
 phpBB/styles/subsilver2/template/posting_body.html   | 4 ++--
 phpBB/styles/subsilver2/template/viewforum_body.html | 2 +-
 phpBB/styles/subsilver2/template/viewtopic_body.html | 2 +-
 9 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index 4565a2d7c7..29d1154ef5 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -1,7 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
 <p class="{S_CONTENT_FLOW_END} responsive-center<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p>
-<!-- IF U_MCP --><p class="responsive-center">{CURRENT_TIME} <br />[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ELSEIF S_USER_LOGGED_IN --><p class="responsive-center">{CURRENT_TIME}</p><!-- ENDIF -->
+<!-- IF U_MCP or U_ACP --><p class="responsive-center">{CURRENT_TIME} <br />[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ELSEIF S_USER_LOGGED_IN --><p class="responsive-center">{CURRENT_TIME}</p><!-- ENDIF -->
 
 <!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) -->
 <ul class="linklist bulletin">
diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html
index 7b9e4c13cb..8a80a7948c 100644
--- a/phpBB/styles/prosilver/template/mcp_header.html
+++ b/phpBB/styles/prosilver/template/mcp_header.html
@@ -4,9 +4,7 @@
 
 <!-- IF U_MCP -->
 	<p class="linkmcp">
-		[ <a href="{U_MCP}">{L_MCP}</a><!-- IF U_MCP_FORUM --> | <a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF -->
-		<!-- IF U_MCP_TOPIC --> | <a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF -->
-		<!-- IF U_MCP_POST --> | <a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF --> ]
+		[<!-- IF U_ACP -->&nbsp;<a href="{U_ACP}">{L_ACP}</a>&nbsp;|<!-- ENDIF -->&nbsp;<a href="{U_MCP}">{L_MCP}</a><!-- IF U_MCP_FORUM -->&nbsp;|&nbsp;<a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF --><!-- IF U_MCP_TOPIC -->&nbsp;|&nbsp;<a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF --><!-- IF U_MCP_POST -->&nbsp;|&nbsp;<a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF -->&nbsp;]
 	</p>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 360d9ae789..f0979da0c3 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -1,5 +1,5 @@
 <!-- INCLUDE overall_header.html -->
-<!-- IF U_MCP --><p>[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ENDIF -->
+<!-- IF U_ACP or U_MCP --><p>[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
 <h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
 
 <!-- IF FORUM_DESC or MODERATORS or U_MCP -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 763d7edb16..e0e4954611 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -1,5 +1,6 @@
 <!-- INCLUDE overall_header.html -->
-<!-- IF U_MCP --><p>[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ENDIF -->
+<!-- IF U_ACP or U_MCP --><p>[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
+<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
 <h2><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
 <!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
 <!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index e07cfda8b3..158e5f2720 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -1,8 +1,8 @@
 <!-- INCLUDE overall_header.html -->
 
-<!-- IF U_MCP -->
+<!-- IF U_MCP or U_ACP -->
 	<div id="pageheader">
-		<p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p>
+		<p class="linkmcp">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p>
 	</div>
 
 	<br clear="all" /><br />
diff --git a/phpBB/styles/subsilver2/template/mcp_header.html b/phpBB/styles/subsilver2/template/mcp_header.html
index f107732234..9b9f7849f4 100644
--- a/phpBB/styles/subsilver2/template/mcp_header.html
+++ b/phpBB/styles/subsilver2/template/mcp_header.html
@@ -3,9 +3,7 @@
 <div id="pageheader">
 	<!-- IF U_MCP -->
 		<p class="linkmcp">
-			[ <a href="{U_MCP}">{L_MCP}</a><!-- IF U_MCP_FORUM --> | <a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF -->
-			<!-- IF U_MCP_TOPIC --> | <a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF -->
-			<!-- IF U_MCP_POST --> | <a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF --> ]
+			[<!-- IF U_ACP -->&nbsp;<a href="{U_ACP}">{L_ACP}</a>&nbsp;|<!-- ENDIF -->&nbsp;<a href="{U_MCP}">{L_MCP}</a><!-- IF U_MCP_FORUM -->&nbsp;|&nbsp;<a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF --><!-- IF U_MCP_TOPIC -->&nbsp;|&nbsp;<a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF --><!-- IF U_MCP_POST -->&nbsp;|&nbsp;<a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF -->&nbsp;]
 		</p>
 	<!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 9395e24eb1..7b77f85694 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -25,8 +25,8 @@
 		<!-- IF MODERATORS -->
 			<p class="moderators">{L_MODERATORS}{L_COLON} {MODERATORS}</p>
 		<!-- ENDIF -->
-		<!-- IF U_MCP -->
-			<p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p>
+		<!-- IF U_MCP or U_ACP -->
+			<p class="linkmcp">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p>
 		<!-- ENDIF -->
 	</div>
 
diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html
index dfbe0a605b..612c2e42ea 100644
--- a/phpBB/styles/subsilver2/template/viewforum_body.html
+++ b/phpBB/styles/subsilver2/template/viewforum_body.html
@@ -109,7 +109,7 @@
 			<p class="moderators"><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON} {MODERATORS}</p>
 		<!-- ENDIF -->
 		<!-- IF U_MCP -->
-			<p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p>
+			<p class="linkmcp">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p>
 		<!-- ENDIF -->
 	</div>
 
diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index 26e74b8c38..c3f8bf205b 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -21,7 +21,7 @@
 	<p class="moderators"><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON} {MODERATORS}</p>
 <!-- ENDIF -->
 <!-- IF U_MCP -->
-	<p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p>
+	<p class="linkmcp">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p>
 <!-- ENDIF -->
 </div>
 
-- 
cgit v1.2.1


From 54e82392f0788d442e856a663a931e5811816c55 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 26 Oct 2013 10:17:24 -0700
Subject: [ticket/11975] Make link text shorter on smaller resolutions

PHPBB3-11975
---
 phpBB/styles/prosilver/template/index_body.html     | 2 +-
 phpBB/styles/prosilver/template/mcp_header.html     | 4 ++--
 phpBB/styles/prosilver/template/viewforum_body.html | 2 +-
 phpBB/styles/prosilver/template/viewtopic_body.html | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index 29d1154ef5..89efee4e15 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -1,7 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
 <p class="{S_CONTENT_FLOW_END} responsive-center<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p>
-<!-- IF U_MCP or U_ACP --><p class="responsive-center">{CURRENT_TIME} <br />[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ELSEIF S_USER_LOGGED_IN --><p class="responsive-center">{CURRENT_TIME}</p><!-- ENDIF -->
+<!-- IF U_MCP or U_ACP --><p class="responsive-center">{CURRENT_TIME} <br />[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}"><span class="responsive-hide">{L_ACP}</span><span class="responsive-show-inline" style="display: none;">{L_ACP_SHORT}</span></a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}"><span class="responsive-hide">{L_MCP}</span><span class="responsive-show-inline" style="display: none;">{L_MCP_SHORT}</span></a><!-- ENDIF -->&nbsp;]</p><!-- ELSEIF S_USER_LOGGED_IN --><p class="responsive-center">{CURRENT_TIME}</p><!-- ENDIF -->
 
 <!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) -->
 <ul class="linklist bulletin">
diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html
index 8a80a7948c..5b3729a699 100644
--- a/phpBB/styles/prosilver/template/mcp_header.html
+++ b/phpBB/styles/prosilver/template/mcp_header.html
@@ -1,10 +1,10 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2>{L_MCP}</h2>
+<h2>{L_MCP_SHORT}</h2>
 
 <!-- IF U_MCP -->
 	<p class="linkmcp">
-		[<!-- IF U_ACP -->&nbsp;<a href="{U_ACP}">{L_ACP}</a>&nbsp;|<!-- ENDIF -->&nbsp;<a href="{U_MCP}">{L_MCP}</a><!-- IF U_MCP_FORUM -->&nbsp;|&nbsp;<a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF --><!-- IF U_MCP_TOPIC -->&nbsp;|&nbsp;<a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF --><!-- IF U_MCP_POST -->&nbsp;|&nbsp;<a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF -->&nbsp;]
+		[<!-- IF U_ACP -->&nbsp;<a href="{U_ACP}" title="{L_ACP}"><span class="responsive-hide">{L_ACP}</span><span class="responsive-show-inline" style="display: none;">{L_ACP_SHORT}</span></a>&nbsp;|<!-- ENDIF -->&nbsp;<a href="{U_MCP}" title="{L_MCP}"><span class="responsive-hide">{L_MCP}</span><span class="responsive-show-inline" style="display: none;">{L_MCP_SHORT}</span></a><!-- IF U_MCP_FORUM -->&nbsp;|&nbsp;<a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF --><!-- IF U_MCP_TOPIC -->&nbsp;|&nbsp;<a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF --><!-- IF U_MCP_POST -->&nbsp;|&nbsp;<a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF -->&nbsp;]
 	</p>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index f0979da0c3..0b747f06a5 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -1,5 +1,5 @@
 <!-- INCLUDE overall_header.html -->
-<!-- IF U_ACP or U_MCP --><p>[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
+<!-- IF U_ACP or U_MCP --><p>[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}"><span class="responsive-hide">{L_ACP}</span><span class="responsive-show-inline" style="display: none;">{L_ACP_SHORT}</span></a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}"><span class="responsive-hide">{L_MCP}</span><span class="responsive-show-inline" style="display: none;">{L_MCP_SHORT}</span></a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
 <h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
 
 <!-- IF FORUM_DESC or MODERATORS or U_MCP -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index e0e4954611..309f378268 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -1,5 +1,5 @@
 <!-- INCLUDE overall_header.html -->
-<!-- IF U_ACP or U_MCP --><p>[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
+<!-- IF U_ACP or U_MCP --><p>[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}"><span class="responsive-hide">{L_ACP}</span><span class="responsive-show-inline" style="display: none;">{L_ACP_SHORT}</span></a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}"><span class="responsive-hide">{L_MCP}</span><span class="responsive-show-inline" style="display: none;">{L_MCP_SHORT}</span></a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
 <h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
 <h2><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
 <!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
-- 
cgit v1.2.1


From 47f7992bf167e1ea3e09999cba52c9a6e6d8d529 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Wed, 30 Oct 2013 21:15:38 -0700
Subject: [ticket/11975] Change shortened ACP/MCP label to Administer/Moderate

Also utilizing the new data-responsive-text attribute

PHPBB3-11975
---
 phpBB/styles/prosilver/template/index_body.html     | 2 +-
 phpBB/styles/prosilver/template/mcp_header.html     | 6 +++---
 phpBB/styles/prosilver/template/viewforum_body.html | 2 +-
 phpBB/styles/prosilver/template/viewtopic_body.html | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index 89efee4e15..8acc0a8812 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -1,7 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
 <p class="{S_CONTENT_FLOW_END} responsive-center<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p>
-<!-- IF U_MCP or U_ACP --><p class="responsive-center">{CURRENT_TIME} <br />[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}"><span class="responsive-hide">{L_ACP}</span><span class="responsive-show-inline" style="display: none;">{L_ACP_SHORT}</span></a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}"><span class="responsive-hide">{L_MCP}</span><span class="responsive-show-inline" style="display: none;">{L_MCP_SHORT}</span></a><!-- ENDIF -->&nbsp;]</p><!-- ELSEIF S_USER_LOGGED_IN --><p class="responsive-center">{CURRENT_TIME}</p><!-- ENDIF -->
+<!-- IF S_USER_LOGGED_IN --><p class="responsive-center">{CURRENT_TIME}<!-- IF U_MCP or U_ACP --> <br />[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF -->&nbsp;]<!-- ENDIF --></p><!-- ENDIF -->
 
 <!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) -->
 <ul class="linklist bulletin">
diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html
index 5b3729a699..e3efe49943 100644
--- a/phpBB/styles/prosilver/template/mcp_header.html
+++ b/phpBB/styles/prosilver/template/mcp_header.html
@@ -1,10 +1,10 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2>{L_MCP_SHORT}</h2>
+<h2>{L_MCP}</h2>
 
 <!-- IF U_MCP -->
-	<p class="linkmcp">
-		[<!-- IF U_ACP -->&nbsp;<a href="{U_ACP}" title="{L_ACP}"><span class="responsive-hide">{L_ACP}</span><span class="responsive-show-inline" style="display: none;">{L_ACP_SHORT}</span></a>&nbsp;|<!-- ENDIF -->&nbsp;<a href="{U_MCP}" title="{L_MCP}"><span class="responsive-hide">{L_MCP}</span><span class="responsive-show-inline" style="display: none;">{L_MCP_SHORT}</span></a><!-- IF U_MCP_FORUM -->&nbsp;|&nbsp;<a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF --><!-- IF U_MCP_TOPIC -->&nbsp;|&nbsp;<a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF --><!-- IF U_MCP_POST -->&nbsp;|&nbsp;<a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF -->&nbsp;]
+	<p class="linkmcp responsive-center">
+		[<!-- IF U_ACP -->&nbsp;<a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a>&nbsp;|<!-- ENDIF -->&nbsp;<a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- IF U_MCP_FORUM -->&nbsp;|&nbsp;<a href="{U_MCP_FORUM}">{L_MODERATE_FORUM}</a><!-- ENDIF --><!-- IF U_MCP_TOPIC -->&nbsp;|&nbsp;<a href="{U_MCP_TOPIC}">{L_MODERATE_TOPIC}</a><!-- ENDIF --><!-- IF U_MCP_POST -->&nbsp;|&nbsp;<a href="{U_MCP_POST}">{L_MODERATE_POST}</a><!-- ENDIF -->&nbsp;]
 	</p>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 0b747f06a5..ee279908b0 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -1,5 +1,5 @@
 <!-- INCLUDE overall_header.html -->
-<!-- IF U_ACP or U_MCP --><p>[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}"><span class="responsive-hide">{L_ACP}</span><span class="responsive-show-inline" style="display: none;">{L_ACP_SHORT}</span></a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}"><span class="responsive-hide">{L_MCP}</span><span class="responsive-show-inline" style="display: none;">{L_MCP_SHORT}</span></a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
+<!-- IF U_MCP or U_ACP --><p class="responsive-center">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
 <h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
 
 <!-- IF FORUM_DESC or MODERATORS or U_MCP -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 309f378268..406aba89ac 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -1,5 +1,5 @@
 <!-- INCLUDE overall_header.html -->
-<!-- IF U_ACP or U_MCP --><p>[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}"><span class="responsive-hide">{L_ACP}</span><span class="responsive-show-inline" style="display: none;">{L_ACP_SHORT}</span></a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}"><span class="responsive-hide">{L_MCP}</span><span class="responsive-show-inline" style="display: none;">{L_MCP_SHORT}</span></a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
+<!-- IF U_MCP or U_ACP --><p class="responsive-center">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
 <h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
 <h2><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
 <!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
-- 
cgit v1.2.1


From 6ee8f19fea6146b4588a4d170fad46bc0c82ef6d Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 2 Nov 2013 15:53:40 -0700
Subject: [ticket/11975] Remove copy/paste fail, fix tests

PHPBB3-11975
---
 phpBB/styles/prosilver/template/viewtopic_body.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 406aba89ac..4e652db372 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -1,6 +1,5 @@
 <!-- INCLUDE overall_header.html -->
 <!-- IF U_MCP or U_ACP --><p class="responsive-center">[&nbsp;<!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP -->&nbsp;|&nbsp;<!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF -->&nbsp;]</p><!-- ENDIF -->
-<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
 <h2><!-- EVENT viewtopic_topic_title_prepend --><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
 <!-- NOTE: remove the style="display: none" when you want to have the forum description on the topic body -->
 <!-- IF FORUM_DESC --><div style="display: none !important;">{FORUM_DESC}<br /></div><!-- ENDIF -->
-- 
cgit v1.2.1


From fbedce8d4abe8af73526ed5f8484feb82edcd41b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 5 Nov 2013 17:01:59 +0100
Subject: [ticket/11914] Add assets version to included plupload scripts

PHPBB3-11914
---
 phpBB/styles/prosilver/template/plupload.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html
index 3297e5d0b0..9b1911f708 100644
--- a/phpBB/styles/prosilver/template/plupload.html
+++ b/phpBB/styles/prosilver/template/plupload.html
@@ -1,5 +1,5 @@
-<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.full.min.js"></script>
-<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js"></script>
+<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.full.min.js?assets_version={T_ASSETS_VERSION}"></script>
+<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js?assets_version={T_ASSETS_VERSION}"></script>
 <script type="text/javascript">
 //<![CDATA[
 phpbb.plupload = {
-- 
cgit v1.2.1


From 253f8d75934492a460a9e38cb948f792e01096f5 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 8 Nov 2013 06:13:55 -0800
Subject: [ticket/12001] Ensure that form data is sent to server in AJAX
 requests.

PHPBB3-12001
---
 phpBB/styles/prosilver/template/confirm_body.html  | 17 ++++-----
 .../prosilver/template/confirm_delete_body.html    | 40 ++++++++++++----------
 2 files changed, 30 insertions(+), 27 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/confirm_body.html b/phpBB/styles/prosilver/template/confirm_body.html
index bf575c20fa..a0428025cf 100644
--- a/phpBB/styles/prosilver/template/confirm_body.html
+++ b/phpBB/styles/prosilver/template/confirm_body.html
@@ -1,12 +1,13 @@
 <!-- IF S_AJAX_REQUEST -->
-
-	<h3>{MESSAGE_TITLE}</h3>
-	<p>{MESSAGE_TEXT}</p>
-
-	<fieldset class="submit-buttons">
-		<input type="button" name="confirm" value="{L_YES}" class="button2" />&nbsp;
-		<input type="button" name="cancel" value="{L_NO}" class="button2" />
-	</fieldset>
+	<form action="{S_CONFIRM_ACTION}" method="post">
+		<h3>{MESSAGE_TITLE}</h3>
+		<p>{MESSAGE_TEXT}</p>
+
+		<fieldset class="submit-buttons">
+			<input type="button" name="confirm" value="{L_YES}" class="button2" />&nbsp;
+			<input type="button" name="cancel" value="{L_NO}" class="button2" />
+		</fieldset>
+	</form>
 
 <!-- ELSE -->
 
diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html
index 759b6b46b2..dc09974d1c 100644
--- a/phpBB/styles/prosilver/template/confirm_delete_body.html
+++ b/phpBB/styles/prosilver/template/confirm_delete_body.html
@@ -1,27 +1,29 @@
 <!-- IF S_AJAX_REQUEST -->
-	<p>{MESSAGE_TEXT}</p>
+	<form action="{S_CONFIRM_ACTION}" method="post">
+		<p>{MESSAGE_TEXT}</p>
 
-	<!-- IF not S_SOFTDELETED and (S_DELETE_REASON or (S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE)) -->
-		<!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
-			<label>
-				<strong>{L_DELETE_PERMANENTLY}{L_COLON}</strong>
-				<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
-				<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF -->
-			</label>
-		<!-- ENDIF -->
+		<!-- IF not S_SOFTDELETED and (S_DELETE_REASON or (S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE)) -->
+			<!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
+				<label>
+					<strong>{L_DELETE_PERMANENTLY}{L_COLON}</strong>
+					<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
+					<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF -->
+				</label>
+			<!-- ENDIF -->
 
-		<!-- IF S_DELETE_REASON -->
-			<label for="delete_reason">
-				<strong>{L_DELETE_REASON}{L_COLON}</strong><br /><span>{L_DELETE_REASON_EXPLAIN}</span><br />
-				<input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" />
-			</label>
+			<!-- IF S_DELETE_REASON -->
+				<label for="delete_reason">
+					<strong>{L_DELETE_REASON}{L_COLON}</strong><br /><span>{L_DELETE_REASON_EXPLAIN}</span><br />
+					<input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" />
+				</label>
+			<!-- ENDIF -->
 		<!-- ENDIF -->
-	<!-- ENDIF -->
 
-	<fieldset class="submit-buttons">
-		<input type="button" name="confirm" value="{L_YES}" class="button1" />&nbsp;
-		<input type="button" name="cancel" value="{L_NO}" class="button2" />
-	</fieldset>
+		<fieldset class="submit-buttons">
+			<input type="button" name="confirm" value="{L_YES}" class="button1" />&nbsp;
+			<input type="button" name="cancel" value="{L_NO}" class="button2" />
+		</fieldset>
+	</form>
 
 <!-- ELSE -->
 
-- 
cgit v1.2.1


From 9328d42809ff85d654f55cbf53218301a5d13491 Mon Sep 17 00:00:00 2001
From: Lukasz <luki_9@wp.pl>
Date: Thu, 7 Nov 2013 20:09:02 +0100
Subject: [ticket/12005] Delete templates files PHPBB3-12005

---
 phpBB/styles/prosilver/template/ucp_pm_popup.html  | 25 ---------------
 phpBB/styles/subsilver2/template/ucp_pm_popup.html | 37 ----------------------
 2 files changed, 62 deletions(-)
 delete mode 100644 phpBB/styles/prosilver/template/ucp_pm_popup.html
 delete mode 100644 phpBB/styles/subsilver2/template/ucp_pm_popup.html

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_popup.html b/phpBB/styles/prosilver/template/ucp_pm_popup.html
deleted file mode 100644
index 4cc39ee450..0000000000
--- a/phpBB/styles/prosilver/template/ucp_pm_popup.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-/**
-* Jump to inbox
-*/
-function jump_to_inbox(url)
-{
-	opener.document.location.href = url.replace(/&amp;/g, '&');
-	window.close();
-}
-// ]]>
-</script>
-
-<div class="panel">
-	<div class="inner">
-	<div class="content">
-		<p><!-- IF S_NOT_LOGGED_IN -->{L_LOGIN_CHECK_PM}<!-- ELSE -->{MESSAGE}<br /><br />{CLICK_TO_VIEW}<!-- ENDIF --></p>
-		<p class="small"><a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a></p>
-	</div>
-	</div>
-</div>
-
-<!-- INCLUDE simple_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_popup.html b/phpBB/styles/subsilver2/template/ucp_pm_popup.html
deleted file mode 100644
index b7032c6c30..0000000000
--- a/phpBB/styles/subsilver2/template/ucp_pm_popup.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-
-<script type="text/javascript">
-// <![CDATA[
-/**
-* Jump to inbox
-*/
-function jump_to_inbox(url)
-{
-	opener.document.location.href = url.replace(/&amp;/g, '&');
-	window.close();
-}
-// ]]>
-</script>
-
-<table width="100%" border="0" cellspacing="0" cellpadding="10">
-<tr>
-	<td>
-		<table width="100%" border="0" cellspacing="1" cellpadding="4" class="tablebg">
-		<tr class="row1"> 
-			<td valign="top" align="center">
-				<br /><span class="gen">
-				<!-- IF S_NOT_LOGGED_IN -->
-					{L_LOGIN_CHECK_PM}
-				<!-- ELSE -->
-					{MESSAGE}<br /><br />{CLICK_TO_VIEW}
-				<!-- ENDIF -->
-				</span>
-				<br /><br /><span class="genmed"><a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a></span><br /><br />
-			</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-
-<!-- INCLUDE simple_footer.html -->
-- 
cgit v1.2.1


From 069cd4a19581a8053ed9b2a3eb5b3f778a0ed89b Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 8 Nov 2013 17:38:06 -0800
Subject: [ticket/12010] Make the navbar icons clickable.

PHPBB3-12010
---
 phpBB/styles/prosilver/template/overall_footer.html | 10 +++++-----
 phpBB/styles/prosilver/template/overall_header.html | 16 ++++++++--------
 phpBB/styles/prosilver/theme/bidi.css               | 14 +++++++++++---
 phpBB/styles/prosilver/theme/buttons.css            | 14 +++++---------
 phpBB/styles/prosilver/theme/colours.css            |  1 -
 phpBB/styles/prosilver/theme/links.css              |  6 ++++++
 6 files changed, 35 insertions(+), 26 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index a831ab6cb4..7b78284d34 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -6,14 +6,14 @@
 		<div class="inner">
 
 		<ul class="linklist bulletin">
-			<li class="icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong></span> <!-- ENDIF --><span class="crumb"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></span>
+			<li class="small-icon icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong></span> <!-- ENDIF --><span class="crumb"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></span>
 				<!-- EVENT overall_footer_breadcrumb_append -->
 			</li>
 			<!-- IF not S_IS_BOT -->
-				<!-- IF U_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
-				<!-- IF U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="<!-- IF not S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">{S_WATCH_TOPIC_TITLE}</a></li><!-- ENDIF -->
-				<!-- IF U_BOOKMARK_TOPIC --><li class="icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}">{S_BOOKMARK_TOPIC}</a></li><!-- ENDIF -->
-				<!-- IF U_BUMP_TOPIC --><li class="icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->
+				<!-- IF U_WATCH_FORUM_LINK --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
+				<!-- IF U_WATCH_TOPIC --><li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"><a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">{S_WATCH_TOPIC_TITLE}</a></li><!-- ENDIF -->
+				<!-- IF U_BOOKMARK_TOPIC --><li class="small-icon icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}">{S_BOOKMARK_TOPIC}</a></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 -->
 			<!-- ENDIF -->
 			<li class="rightside">{S_TIMEZONE}</li>
 			<!-- 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 -->
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 6186fe051e..fde8bbf147 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -84,7 +84,7 @@
 
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
-				<li class="icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong></span> <!-- ENDIF -->
+				<li class="small-icon icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong></span> <!-- ENDIF -->
 					<span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a></span> 
 					<!-- BEGIN navlinks --> <span class="crumb"><strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a></span><!-- END navlinks -->
 					<!-- EVENT overall_header_breadcrumb_append -->
@@ -100,7 +100,7 @@
 			<ul class="linklist bulletin">
 			<!-- IF not S_IS_BOT and S_USER_LOGGED_IN -->
 				<!-- IF S_NOTIFICATIONS_DISPLAY -->
-				<li class="icon-notification" data-skip-responsive="true">
+				<li class="small-icon icon-notification" 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>
 					<div id="notification_list" class="dropdown notification_list">
 						<div class="pointer"><div class="pointer-inner"></div></div>
@@ -141,11 +141,11 @@
 				</li>
 				<!-- ENDIF -->
 				<!-- IF S_DISPLAY_PM -->
-					<li class="icon-pm">
+					<li class="small-icon icon-pm">
 						<a href="{U_PRIVATEMSGS}"><span>{L_PRIVATE_MESSAGES} [</span><strong>{PRIVATE_MESSAGE_COUNT}</strong><span>]</span></a>
 					</li>
 				<!-- ENDIF -->
-				<li class="icon-ucp">
+				<li class="small-icon icon-ucp">
 					<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
 				</li>
 				<!-- IF S_DISPLAY_SEARCH -->
@@ -158,11 +158,11 @@
 
 				<!-- EVENT overall_header_navigation_append -->
 				<!-- IF not S_IS_BOT -->
-					<li class="icon-logout rightside no-bulletin"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
-					<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="icon-register rightside no-bulletin"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
-					<!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members rightside no-bulletin"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
+					<li class="small-icon icon-logout rightside no-bulletin"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x">{L_LOGIN_LOGOUT}</a></li>
+					<!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --><li class="small-icon icon-register rightside no-bulletin"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF -->
+					<!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside no-bulletin"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF -->
 				<!-- ENDIF -->
-				<li class="icon-faq rightside no-bulletin"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
+				<li class="small-icon icon-faq rightside no-bulletin"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li>
 				<!-- EVENT overall_header_navigation_prepend -->
 			</ul>
 
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 542440e847..b04e6576d3 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -231,6 +231,11 @@
 	unicode-bidi: embed;
 }
 
+ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
+	padding-left: 0;
+	padding-right: 19px;
+}
+
 .rtl a.top {
 	float: left;
 }
@@ -527,10 +532,13 @@
 
 /* Icon images
 ---------------------------------------- */
-.rtl .sitehome, .rtl .icon-faq, .rtl .icon-members, .rtl .icon-home, .rtl .icon-ucp, .rtl .icon-register, .rtl .icon-logout,
-.rtl .icon-bookmark, .rtl .icon-bump, .rtl .icon-subscribe, .rtl .icon-unsubscribe, .rtl .icon-pages, .rtl .icon-search, .rtl .icon-notification, .rtl .icon-pm {
+.rtl .small-icon {
 	background-position: 100% 50%;
-	padding: 1px 17px 0 0;
+	padding: 1px 19px 0 0;
+}
+
+.rtl ul.linklist li.small-icon {
+	padding-right: 0;
 }
 
 /* Poster profile icons
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 33f924717a..cdd325fb13 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -90,23 +90,19 @@ a.sendemail {
 
 /* Icon images
 ---------------------------------------- */
-.sitehome, .icon-faq, .icon-members, .icon-home, .icon-ucp, .icon-register, .icon-logout,
-.icon-bookmark, .icon-bump, .icon-subscribe, .icon-unsubscribe, .icon-pages, .icon-search, .icon-notification, .icon-pm {
+.small-icon {
 	background-position: 0 50%;
 	background-repeat: no-repeat;
 	background-image: none;
 	padding: 1px 0 0 17px;
 }
 
-ul.linklist.bulletin li.icon-home:before, ul.linklist.bulletin li.icon-ucp:before, ul.linklist.bulletin li.icon-notification:before, ul.linklist.bulletin li.icon-pm:before,
-ul.linklist.bulletin li.icon-bookmark:before, ul.linklist.bulletin li.icon-bump:before, ul.linklist.bulletin li.icon-subscribe:before, ul.linklist.bulletin li.icon-unsubscribe:before {
-	display: none;
+ul.linklist li.small-icon {
+	padding-left: 0;
 }
 
-.icon-home > span:first-child > a, .icon-notification > a, .icon-pm > a {
-	display: inline-block;
-	margin-left: -17px;
-	padding-left: 17px;
+ul.linklist.bulletin li.small-icon:before {
+	display: none;
 }
 
 /* Poster profile icons
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index d4e63bf3ec..55b01f1269 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -684,7 +684,6 @@ a.sendemail {
 
 /* Icon images
 ---------------------------------------- */
-.sitehome						{ background-image: url("./images/icon_home.gif"); }
 .icon-faq						{ background-image: url("./images/icon_faq.gif"); }
 .icon-members					{ background-image: url("./images/icon_members.gif"); }
 .icon-home						{ background-image: url("./images/icon_home.gif"); }
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 5dc8a13313..7e3dc094f0 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -43,6 +43,12 @@ a:active {
 	text-decoration: none;
 }
 
+/* Navigation bar links */
+ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
+	display: inline-block;
+	padding-left: 17px;
+}
+
 /* Links for forum/topic lists */
 a.forumtitle {
 	font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif;
-- 
cgit v1.2.1


From e74f1c1790bae04c1729491e0a728c70b41009ec Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 11 Nov 2013 15:28:18 -0800
Subject: [ticket/12014] Template Event index_body.html before forumlist

Add content above the forums list (on forum index only)

PHPBB3-12014
---
 phpBB/styles/prosilver/template/index_body.html  | 2 ++
 phpBB/styles/subsilver2/template/index_body.html | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index 8acc0a8812..bd640fd63f 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -19,6 +19,8 @@
 </ul>
 <!-- ENDIF -->
 
+<!-- EVENT index_body_forumlist_before -->
+
 <!-- INCLUDE forumlist_body.html -->
 
 <!-- IF not S_USER_LOGGED_IN and not S_IS_BOT -->
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index 158e5f2720..00c328e994 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -8,6 +8,8 @@
 	<br clear="all" /><br />
 <!-- ENDIF -->
 
+<!-- EVENT index_body_forumlist_before -->
+
 <!-- INCLUDE forumlist_body.html -->
 
 <!-- IF not S_IS_BOT or U_TEAM -->
-- 
cgit v1.2.1


From c386bf7911edfc4613c6a70dae37db76bfe645cb Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 18 Oct 2013 20:47:22 -0700
Subject: [ticket/11472] Make prosilver's editor.js an asset used by all
 styles.

PHPBB3-11472
---
 phpBB/styles/prosilver/template/editor.js          | 422 ---------------------
 .../styles/prosilver/template/posting_buttons.html |   2 +-
 .../styles/prosilver/template/posting_smilies.html |   2 +-
 phpBB/styles/subsilver2/template/editor.js         | 385 -------------------
 .../subsilver2/template/posting_buttons.html       |   2 +-
 .../subsilver2/template/posting_smilies.html       |   2 +-
 6 files changed, 4 insertions(+), 811 deletions(-)
 delete mode 100644 phpBB/styles/prosilver/template/editor.js
 delete mode 100644 phpBB/styles/subsilver2/template/editor.js

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
deleted file mode 100644
index 66a3cb51ac..0000000000
--- a/phpBB/styles/prosilver/template/editor.js
+++ /dev/null
@@ -1,422 +0,0 @@
-/**
-* bbCode control by subBlue design [ www.subBlue.com ]
-* Includes unixsafe colour palette selector by SHS`
-*/
-
-// Startup variables
-var imageTag = false;
-var theSelection = false;
-var bbcodeEnabled = true;
-
-// Check for Browser & Platform for PC & IE specific bits
-// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
-var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-var clientVer = parseInt(navigator.appVersion, 10); // Get browser version
-
-var is_ie = ((clientPC.indexOf('msie') !== -1) && (clientPC.indexOf('opera') === -1));
-var is_win = ((clientPC.indexOf('win') !== -1) || (clientPC.indexOf('16bit') !== -1));
-var baseHeight;
-
-/**
-* Shows the help messages in the helpline window
-*/
-function helpline(help) {
-	document.forms[form_name].helpbox.value = help_line[help];
-}
-
-/**
-* Fix a bug involving the TextRange object. From
-* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() {
-	var doc;
-
-	if (document.forms[form_name]) {
-		doc = document;
-	} else {
-		doc = opener.document;
-	}
-
-	var textarea = doc.forms[form_name].elements[text_name];
-
-	if (is_ie && typeof(baseHeight) !== 'number') {
-		textarea.focus();
-		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
-
-		if (!document.forms[form_name]) {
-			document.body.focus();
-		}
-	}
-}
-
-/**
-* bbstyle
-*/
-function bbstyle(bbnumber) {
-	if (bbnumber !== -1) {
-		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	} else {
-		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();
-	}
-}
-
-/**
-* Apply bbcodes
-*/
-function bbfontstyle(bbopen, bbclose) {
-	theSelection = false;
-
-	var textarea = document.forms[form_name].elements[text_name];
-
-	textarea.focus();
-
-	if ((clientVer >= 4) && is_ie && is_win) {
-		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection) {
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
-			return;
-		}
-	} else if (document.forms[form_name].elements[text_name].selectionEnd
-			&& (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) {
-		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
-		document.forms[form_name].elements[text_name].focus();
-		theSelection = '';
-		return;
-	}
-
-	//The new position for the cursor after adding the bbcode
-	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;
-
-	// Open tag
-	insert_text(bbopen + bbclose);
-
-	// Center the cursor when we don't have a selection
-	// Gecko and proper browsers
-	if (!isNaN(textarea.selectionStart)) {
-		textarea.selectionStart = new_pos;
-		textarea.selectionEnd = new_pos;
-	}
-	// IE
-	else if (document.selection) {
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
-		range.select();
-		storeCaret(textarea);
-	}
-
-	textarea.focus();
-	return;
-}
-
-/**
-* Insert text at position
-*/
-function insert_text(text, spaces, popup) {
-	var textarea;
-
-	if (!popup) {
-		textarea = document.forms[form_name].elements[text_name];
-	} else {
-		textarea = opener.document.forms[form_name].elements[text_name];
-	}
-
-	if (spaces) {
-		text = ' ' + text + ' ';
-	}
-
-	// Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way.
-	// Therefore we simply add a !is_ie here until IE fixes the text-selection completely.
-	if (!isNaN(textarea.selectionStart) && !is_ie) {
-		var sel_start = textarea.selectionStart;
-		var sel_end = textarea.selectionEnd;
-
-		mozWrap(textarea, text, '');
-		textarea.selectionStart = sel_start + text.length;
-		textarea.selectionEnd = sel_end + text.length;
-	} else if (textarea.createTextRange && textarea.caretPos) {
-		if (baseHeight !== textarea.caretPos.boundingHeight) {
-			textarea.focus();
-			storeCaret(textarea);
-		}
-
-		var caret_pos = textarea.caretPos;
-		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) === ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-	} else {
-		textarea.value = textarea.value + text;
-	}
-
-	if (!popup) {
-		textarea.focus();
-	}
-}
-
-/**
-* Add inline attachment at position
-*/
-function attach_inline(index, filename) {
-	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
-	document.forms[form_name].elements[text_name].focus();
-}
-
-/**
-* Add quote text to message
-*/
-function addquote(post_id, username, l_wrote) {
-	var message_name = 'message_' + post_id;
-	var theSelection = '';
-	var divarea = false;
-	var i;
-
-	if (l_wrote === undefined) {
-		// Backwards compatibility
-		l_wrote = 'wrote';
-	}
-
-	if (document.all) {
-		divarea = document.all[message_name];
-	} else {
-		divarea = document.getElementById(message_name);
-	}
-
-	// Get text selection - not only the post content :(
-	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
-	if (window.getSelection && !is_ie && !window.opera) {
-		theSelection = window.getSelection().toString();
-	} else if (document.getSelection && !is_ie) {
-		theSelection = document.getSelection();
-	} else if (document.selection) {
-		theSelection = document.selection.createRange().text;
-	}
-
-	if (theSelection === '' || typeof theSelection === 'undefined' || theSelection === null) {
-		if (divarea.innerHTML) {
-			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
-			theSelection = theSelection.replace(/<br\/>/ig, '\n');
-			theSelection = theSelection.replace(/&lt\;/ig, '<');
-			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');
-			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
-		} else if (document.all) {
-			theSelection = divarea.innerText;
-		} else if (divarea.textContent) {
-			theSelection = divarea.textContent;
-		} else if (divarea.firstChild.nodeValue) {
-			theSelection = divarea.firstChild.nodeValue;
-		}
-	}
-
-	if (theSelection) {
-		if (bbcodeEnabled) {
-			insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
-		} else {
-			insert_text(username + ' ' + l_wrote + ':' + '\n');
-			var lines = split_lines(theSelection);
-			for (i = 0; i < lines.length; i++) {
-				insert_text('> ' + lines[i] + '\n');
-			}
-		}
-	}
-
-	return;
-}
-
-function split_lines(text) {
-	var lines = text.split('\n');
-	var splitLines = new Array();
-	var j = 0;
-	var i;
-
-	for(i = 0; i < lines.length; i++) {
-		if (lines[i].length <= 80) {
-			splitLines[j] = lines[i];
-			j++;
-		} else {
-			var line = lines[i];
-			var splitAt;
-			do {
-				splitAt = line.indexOf(' ', 80);
-
-				if (splitAt === -1) {
-					splitLines[j] = line;
-					j++;
-				} else {
-					splitLines[j] = line.substring(0, splitAt);
-					line = line.substring(splitAt);
-					j++;
-				}
-			}
-			while(splitAt !== -1);
-		}
-	}
-	return splitLines;
-}
-
-/**
-* From http://www.massless.org/mozedit/
-*/
-function mozWrap(txtarea, open, close) {
-	var selLength = (typeof(txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength;
-	var selStart = txtarea.selectionStart;
-	var selEnd = txtarea.selectionEnd;
-	var scrollTop = txtarea.scrollTop;
-
-	if (selEnd === 1 || selEnd === 2) {
-		selEnd = selLength;
-	}
-
-	var s1 = (txtarea.value).substring(0,selStart);
-	var s2 = (txtarea.value).substring(selStart, selEnd);
-	var s3 = (txtarea.value).substring(selEnd, selLength);
-
-	txtarea.value = s1 + open + s2 + close + s3;
-	txtarea.selectionStart = selStart + open.length;
-	txtarea.selectionEnd = selEnd + open.length;
-	txtarea.focus();
-	txtarea.scrollTop = scrollTop;
-
-	return;
-}
-
-/**
-* Insert at Caret position. Code from
-* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
-*/
-function storeCaret(textEl) {
-	if (textEl.createTextRange) {
-		textEl.caretPos = document.selection.createRange().duplicate();
-	}
-}
-
-/**
-* Color pallette
-*/
-function colorPalette(dir, width, height) {
-	var r = 0, 
-		g = 0, 
-		b = 0,
-		numberList = new Array(6),
-		color = '',
-		html = '';
-
-	numberList[0] = '00';
-	numberList[1] = '40';
-	numberList[2] = '80';
-	numberList[3] = 'BF';
-	numberList[4] = 'FF';
-
-	html += '<table>';
-
-	for (r = 0; r < 5; r++) {
-		if (dir == 'h') {
-			html += '<tr>';
-		}
-
-		for (g = 0; g < 5; g++) {
-			if (dir == 'v') {
-				html += '<tr>';
-			}
-
-			for (b = 0; b < 5; b++) {
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				html += '<td style="background-color: #' + color + '; width: ' + width + 'px; height: ' + height + 'px;">';
-				html += '<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" style="display: block; width: ' + width + 'px; height: ' + height + 'px; " alt="#' + color + '" title="#' + color + '"></a>';
-				html += '</td>';
-			}
-
-			if (dir == 'v') {
-				html += '</tr>';
-			}
-		}
-
-		if (dir == 'h') {
-			html += '</tr>';
-		}
-	}
-	html += '</table>';
-	return html;
-}
-
-(function($) {
-	$(document).ready(function() {
-		$('#color_palette_placeholder').each(function() {
-			$(this).html(colorPalette('h', 15, 12));
-		});
-	});
-})(jQuery);
-
-/**
-* Caret Position object
-*/
-function caretPosition() {
-	var start = null;
-	var end = null;
-}
-
-/**
-* Get the caret position in an textarea
-*/
-function getCaretPosition(txtarea) {
-	var caretPos = new caretPosition();
-
-	// simple Gecko/Opera way
-	if (txtarea.selectionStart || txtarea.selectionStart === 0) {
-		caretPos.start = txtarea.selectionStart;
-		caretPos.end = txtarea.selectionEnd;
-	}
-	// dirty and slow IE way
-	else if (document.selection) {
-		// get current selection
-		var range = document.selection.createRange();
-
-		// a new selection of the whole textarea
-		var range_all = document.body.createTextRange();
-		range_all.moveToElementText(txtarea);
-
-		// calculate selection start point by moving beginning of range_all to beginning of range
-		var sel_start;
-		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++) {
-			range_all.moveStart('character', 1);
-		}
-
-		txtarea.sel_start = sel_start;
-
-		// we ignore the end value for IE, this is already dirty enough and we don't need it
-		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;
-	}
-
-	return caretPos;
-}
-
-/**
-* Allow to use tab character when typing code
-* Keep indentation of last line of code when typing code
-*/
-(function($) {
-	$(document).ready(function() {
-		var doc, textarea;
-
-		// find textarea, make sure browser supports necessary functions
-		if (document.forms[form_name]) {
-			doc = document;
-		} else {
-			doc = opener.document;
-		}
-
-		if (!doc.forms[form_name]) {
-			return;
-		}
-
-		textarea = doc.forms[form_name].elements[text_name];
-
-		phpbb.applyCodeEditor(textarea);
-	});
-})(jQuery);
-
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 798faa2ff7..b4b02d3f00 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -49,7 +49,7 @@
 
 // ]]>
 </script>
-<!-- INCLUDEJS editor.js -->
+<!-- INCLUDEJS {ROOT_PATH}assets/javascript/editor.js -->
 
 <!-- IF S_BBCODE_ALLOWED -->
 <div id="colour_palette" style="display: none;">
diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html
index 3d56a932b7..7f8780b8a0 100644
--- a/phpBB/styles/prosilver/template/posting_smilies.html
+++ b/phpBB/styles/prosilver/template/posting_smilies.html
@@ -6,7 +6,7 @@
 	var text_name = opener.text_name;
 // ]]>
 </script>
-<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
+<!-- INCLUDEJS {ROOT_PATH}assets/javascript/editor.js -->
 
 <h2>{L_SMILIES}</h2>
 <div class="panel">
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
deleted file mode 100644
index 6cf616e180..0000000000
--- a/phpBB/styles/subsilver2/template/editor.js
+++ /dev/null
@@ -1,385 +0,0 @@
-/**
-* bbCode control by subBlue design [ www.subBlue.com ]
-* Includes unixsafe colour palette selector by SHS`
-*/
-
-// Startup variables
-var imageTag = false;
-var theSelection = false;
-var bbcodeEnabled = true;
-
-// Check for Browser & Platform for PC & IE specific bits
-// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
-var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-var clientVer = parseInt(navigator.appVersion, 10); // Get browser version
-
-var is_ie = ((clientPC.indexOf('msie') !== -1) && (clientPC.indexOf('opera') === -1));
-var is_win = ((clientPC.indexOf('win') !== -1) || (clientPC.indexOf('16bit') !== -1));
-var baseHeight;
-
-/**
-* Shows the help messages in the helpline window
-*/
-function helpline(help) {
-	document.forms[form_name].helpbox.value = help_line[help];
-}
-
-/**
-* Fix a bug involving the TextRange object. From
-* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
-*/ 
-function initInsertions() {
-	var doc;
-
-	if (document.forms[form_name]) {
-		doc = document;
-	} else {
-		doc = opener.document;
-	}
-
-	var textarea = doc.forms[form_name].elements[text_name];
-	phpbb.applyCodeEditor(textarea);
-
-	if (is_ie && typeof(baseHeight) !== 'number') {
-		textarea.focus();
-		baseHeight = doc.selection.createRange().duplicate().boundingHeight;
-
-		if (!document.forms[form_name]) {
-			document.body.focus();
-		}
-	}
-}
-
-/**
-* bbstyle
-*/
-function bbstyle(bbnumber) {
-	if (bbnumber !== -1) {
-		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
-	} else {
-		insert_text('[*]');
-		document.forms[form_name].elements[text_name].focus();
-	}
-}
-
-/**
-* Apply bbcodes
-*/
-function bbfontstyle(bbopen, bbclose) {
-	theSelection = false;
-
-	var textarea = document.forms[form_name].elements[text_name];
-
-	textarea.focus();
-
-	if ((clientVer >= 4) && is_ie && is_win) {
-		// Get text selection
-		theSelection = document.selection.createRange().text;
-
-		if (theSelection) {
-			// Add tags around selection
-			document.selection.createRange().text = bbopen + theSelection + bbclose;
-			document.forms[form_name].elements[text_name].focus();
-			theSelection = '';
-			return;
-		}
-	} else if (document.forms[form_name].elements[text_name].selectionEnd
-			&& (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) {
-		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
-		document.forms[form_name].elements[text_name].focus();
-		theSelection = '';
-		return;
-	}
-
-	//The new position for the cursor after adding the bbcode
-	var caret_pos = getCaretPosition(textarea).start;
-	var new_pos = caret_pos + bbopen.length;
-
-	// Open tag
-	insert_text(bbopen + bbclose);
-
-	// Center the cursor when we don't have a selection
-	// Gecko and proper browsers
-	if (!isNaN(textarea.selectionStart)) {
-		textarea.selectionStart = new_pos;
-		textarea.selectionEnd = new_pos;
-	}
-	// IE
-	else if (document.selection) {
-		var range = textarea.createTextRange(); 
-		range.move("character", new_pos); 
-		range.select();
-		storeCaret(textarea);
-	}
-
-	textarea.focus();
-	return;
-}
-
-/**
-* Insert text at position
-*/
-function insert_text(text, spaces, popup) {
-	var textarea;
-
-	if (!popup) {
-		textarea = document.forms[form_name].elements[text_name];
-	} else {
-		textarea = opener.document.forms[form_name].elements[text_name];
-	}
-
-	if (spaces) {
-		text = ' ' + text + ' ';
-	}
-
-	// Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way.
-	// Therefore we simply add a !is_ie here until IE fixes the text-selection completely.
-	if (!isNaN(textarea.selectionStart) && !is_ie) {
-		var sel_start = textarea.selectionStart;
-		var sel_end = textarea.selectionEnd;
-
-		mozWrap(textarea, text, '');
-		textarea.selectionStart = sel_start + text.length;
-		textarea.selectionEnd = sel_end + text.length;
-	} else if (textarea.createTextRange && textarea.caretPos) {
-		if (baseHeight !== textarea.caretPos.boundingHeight) {
-			textarea.focus();
-			storeCaret(textarea);
-		}
-
-		var caret_pos = textarea.caretPos;
-		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) === ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
-	} else {
-		textarea.value = textarea.value + text;
-	}
-
-	if (!popup) {
-		textarea.focus();
-	}
-}
-
-/**
-* Add inline attachment at position
-*/
-function attach_inline(index, filename) {
-	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
-	document.forms[form_name].elements[text_name].focus();
-}
-
-/**
-* Add quote text to message
-*/
-function addquote(post_id, username, l_wrote) {
-	var message_name = 'message_' + post_id;
-	var theSelection = '';
-	var divarea = false;
-	var i;
-
-	if (l_wrote === undefined) {
-		// Backwards compatibility
-		l_wrote = 'wrote';
-	}
-
-	if (document.all) {
-		divarea = document.all[message_name];
-	} else {
-		divarea = document.getElementById(message_name);
-	}
-
-	// Get text selection - not only the post content :(
-	// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
-	if (window.getSelection && !is_ie && !window.opera) {
-		theSelection = window.getSelection().toString();
-	} else if (document.getSelection && !is_ie) {
-		theSelection = document.getSelection();
-	} else if (document.selection) {
-		theSelection = document.selection.createRange().text;
-	}
-
-	if (theSelection === '' || typeof theSelection === 'undefined' || theSelection === null) {
-		if (divarea.innerHTML) {
-			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
-			theSelection = theSelection.replace(/<br\/>/ig, '\n');
-			theSelection = theSelection.replace(/&lt\;/ig, '<');
-			theSelection = theSelection.replace(/&gt\;/ig, '>');
-			theSelection = theSelection.replace(/&amp\;/ig, '&');
-			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
-		} else if (document.all) {
-			theSelection = divarea.innerText;
-		} else if (divarea.textContent) {
-			theSelection = divarea.textContent;
-		} else if (divarea.firstChild.nodeValue) {
-			theSelection = divarea.firstChild.nodeValue;
-		}
-	}
-
-	if (theSelection) {
-		if (bbcodeEnabled) {
-			insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
-		} else {
-			insert_text(username + ' ' + l_wrote + ':' + '\n');
-			var lines = split_lines(theSelection);
-			for (i = 0; i < lines.length; i++) {
-				insert_text('> ' + lines[i] + '\n');
-			}
-		}
-	}
-
-	return;
-}
-
-function split_lines(text) {
-	var lines = text.split('\n');
-	var splitLines = new Array();
-	var j = 0;
-	var i;
-
-	for(i = 0; i < lines.length; i++) {
-		if (lines[i].length <= 80) {
-			splitLines[j] = lines[i];
-			j++;
-		} else {
-			var line = lines[i];
-			var splitAt;
-			do {
-				splitAt = line.indexOf(' ', 80);
-
-				if (splitAt === -1) {
-					splitLines[j] = line;
-					j++;
-				} else {
-					splitLines[j] = line.substring(0, splitAt);
-					line = line.substring(splitAt);
-					j++;
-				}
-			}
-			while(splitAt !== -1);
-		}
-	}
-	return splitLines;
-}
-
-/**
-* From http://www.massless.org/mozedit/
-*/
-function mozWrap(txtarea, open, close) {
-	var selLength = (typeof(txtarea.textLength) === 'undefined') ? txtarea.value.length : txtarea.textLength;
-	var selStart = txtarea.selectionStart;
-	var selEnd = txtarea.selectionEnd;
-	var scrollTop = txtarea.scrollTop;
-
-	if (selEnd === 1 || selEnd === 2) {
-		selEnd = selLength;
-	}
-
-	var s1 = (txtarea.value).substring(0,selStart);
-	var s2 = (txtarea.value).substring(selStart, selEnd);
-	var s3 = (txtarea.value).substring(selEnd, selLength);
-
-	txtarea.value = s1 + open + s2 + close + s3;
-	txtarea.selectionStart = selStart + open.length;
-	txtarea.selectionEnd = selEnd + open.length;
-	txtarea.focus();
-	txtarea.scrollTop = scrollTop;
-
-	return;
-}
-
-/**
-* Insert at Caret position. Code from
-* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
-*/
-function storeCaret(textEl) {
-	if (textEl.createTextRange) {
-		textEl.caretPos = document.selection.createRange().duplicate();
-	}
-}
-
-/**
-* Color pallette
-*/
-function colorPalette(dir, width, height) {
-	var r = 0, g = 0, b = 0;
-	var numberList = new Array(6);
-	var color = '';
-
-	numberList[0] = '00';
-	numberList[1] = '40';
-	numberList[2] = '80';
-	numberList[3] = 'BF';
-	numberList[4] = 'FF';
-
-	document.writeln('<table cellspacing="1" cellpadding="0" border="0">');
-
-	for (r = 0; r < 5; r++) {
-		if (dir === 'h') {
-			document.writeln('<tr>');
-		}
-
-		for (g = 0; g < 5; g++) {
-			if (dir === 'v') {
-				document.writeln('<tr>');
-			}
-
-			for (b = 0; b < 5; b++) {
-				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
-				document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">');
-				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
-				document.writeln('</td>');
-			}
-
-			if (dir === 'v') {
-				document.writeln('</tr>');
-			}
-		}
-
-		if (dir === 'h') {
-			document.writeln('</tr>');
-		}
-	}
-	document.writeln('</table>');
-}
-
-/**
-* Caret Position object
-*/
-function caretPosition() {
-	var start = null;
-	var end = null;
-}
-
-/**
-* Get the caret position in an textarea
-*/
-function getCaretPosition(txtarea) {
-	var caretPos = new caretPosition();
-
-	// simple Gecko/Opera way
-	if (txtarea.selectionStart || txtarea.selectionStart === 0) {
-		caretPos.start = txtarea.selectionStart;
-		caretPos.end = txtarea.selectionEnd;
-	}
-	// dirty and slow IE way
-	else if (document.selection) {
-		// get current selection
-		var range = document.selection.createRange();
-
-		// a new selection of the whole textarea
-		var range_all = document.body.createTextRange();
-		range_all.moveToElementText(txtarea);
-
-		// calculate selection start point by moving beginning of range_all to beginning of range
-		var sel_start;
-		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++) {
-			range_all.moveStart('character', 1);
-		}
-
-		txtarea.sel_start = sel_start;
-
-		// we ignore the end value for IE, this is already dirty enough and we don't need it
-		caretPos.start = txtarea.sel_start;
-		caretPos.end = txtarea.sel_start;
-	}
-
-	return caretPos;
-}
diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index 1a7093e1be..6ffb1d89d8 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -33,7 +33,7 @@
 
 		// ]]>
 		</script>
-		<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
+		<!-- INCLUDEJS {ROOT_PATH}assets/javascript/editor.js -->
 
 <!-- IF S_BBCODE_ALLOWED -->
 		<input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html
index d0ced9ff12..c916198ca5 100644
--- a/phpBB/styles/subsilver2/template/posting_smilies.html
+++ b/phpBB/styles/subsilver2/template/posting_smilies.html
@@ -6,7 +6,7 @@
 	var text_name = opener.text_name;
 // ]]>
 </script>
-<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/editor.js"></script>
+<!-- INCLUDEJS {ROOT_PATH}assets/javascript/editor.js -->
 
 <table width="100%" cellspacing="1" cellpadding="4" border="0">
 <tr>
-- 
cgit v1.2.1


From 79b5e9689617df62030be13f8b9912aee32e7bcb Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 18 Oct 2013 21:23:53 -0700
Subject: [ticket/11472] Make the color swatch configurable and fix it in
 subsilver2

PHPBB3-11472
---
 phpBB/styles/prosilver/template/posting_buttons.html        | 2 +-
 phpBB/styles/subsilver2/template/posting_body.html          | 7 +------
 phpBB/styles/subsilver2/template/ucp_main_drafts.html       | 7 +------
 phpBB/styles/subsilver2/template/ucp_profile_signature.html | 7 +------
 phpBB/styles/subsilver2/theme/stylesheet.css                | 5 +++++
 5 files changed, 9 insertions(+), 19 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index b4b02d3f00..232f033b5f 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -55,7 +55,7 @@
 <div id="colour_palette" style="display: none;">
 	<dl style="clear: left;">
 		<dt><label>{L_FONT_COLOR}{L_COLON}</label></dt>
-		<dd id="color_palette_placeholder"></dd>
+		<dd id="color_palette_placeholder" data-orientation="h" data-height="12" data-width="15"></dd>
 	</dl>
 </div>
 
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 7b77f85694..53e8e02d33 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -207,12 +207,7 @@
 		<tr>
 			<td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" style="width: 700px; height: 270px; min-width: 98%; max-width: 98%;">{MESSAGE}</textarea></td>
 			<!-- IF S_BBCODE_ALLOWED -->
-			<td width="80" align="center" valign="top">
-				<script type="text/javascript">
-				// <![CDATA[
-					colorPalette('v', 7, 6)
-				// ]]>
-				</script>
+			<td width="80" align="center" valign="top" id="color_palette_placeholder" data-orientation="v" data-width="7" data-height="6">
 			</td>
 			<!-- ENDIF -->
 	 	</tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_main_drafts.html b/phpBB/styles/subsilver2/template/ucp_main_drafts.html
index 8e18e9cabf..96af9c44e4 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_drafts.html
@@ -75,12 +75,7 @@
 				<td colspan="9">
 					<table cellspacing="0" cellpadding="0" border="0" width="100%">
 					<tr>
-						<td align="{S_CONTENT_FLOW_BEGIN}">
-							<script type="text/javascript">
-							// <![CDATA[
-								colorPalette('h', 6, 5)
-							// ]]>
-							</script>
+						<td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="7" data-height="6">
 						</td>
 					</tr>
 					</table>
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html
index 85c8b0f616..4ed3287b39 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_signature.html
@@ -61,12 +61,7 @@
 			<td colspan="2">
 				<table cellspacing="0" cellpadding="0" border="0" width="100%">
 				<tr>
-					<td align="{S_CONTENT_FLOW_BEGIN}">
-						<script type="text/javascript">
-						// <![CDATA[
-							colorPalette('h', 6, 5)
-						// ]]>
-						</script>
+					<td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="7" data-height="6">
 					</td>
 				</tr>
 				</table>
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 7d14376454..22a3ada275 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -303,6 +303,11 @@ p.topicdetails {
 
 /* Tables
  ------------ */
+#color_palette_placeholder table {
+	border-collapse: separate;
+	border-spacing: 1px;
+}
+
 th {
 	color: #FFA34F;
 	font-size: 1.1em;
-- 
cgit v1.2.1


From 1ea07e2270a0e18bc6008f4ac28df03b5fd52432 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 20 Oct 2013 16:35:28 -0700
Subject: [ticket/11472] Use {T_ASSETS_PATH}.

PHPBB3-11472
---
 phpBB/styles/prosilver/template/posting_buttons.html  | 2 +-
 phpBB/styles/prosilver/template/posting_smilies.html  | 2 +-
 phpBB/styles/subsilver2/template/posting_buttons.html | 2 +-
 phpBB/styles/subsilver2/template/posting_smilies.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 232f033b5f..aa269058cc 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -49,7 +49,7 @@
 
 // ]]>
 </script>
-<!-- INCLUDEJS {ROOT_PATH}assets/javascript/editor.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <!-- IF S_BBCODE_ALLOWED -->
 <div id="colour_palette" style="display: none;">
diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html
index 7f8780b8a0..cb542c1a8c 100644
--- a/phpBB/styles/prosilver/template/posting_smilies.html
+++ b/phpBB/styles/prosilver/template/posting_smilies.html
@@ -6,7 +6,7 @@
 	var text_name = opener.text_name;
 // ]]>
 </script>
-<!-- INCLUDEJS {ROOT_PATH}assets/javascript/editor.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <h2>{L_SMILIES}</h2>
 <div class="panel">
diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index 6ffb1d89d8..7a3a4ca73c 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -33,7 +33,7 @@
 
 		// ]]>
 		</script>
-		<!-- INCLUDEJS {ROOT_PATH}assets/javascript/editor.js -->
+		<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <!-- IF S_BBCODE_ALLOWED -->
 		<input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" onmouseout="helpline('tip')" />
diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html
index c916198ca5..0be71098db 100644
--- a/phpBB/styles/subsilver2/template/posting_smilies.html
+++ b/phpBB/styles/subsilver2/template/posting_smilies.html
@@ -6,7 +6,7 @@
 	var text_name = opener.text_name;
 // ]]>
 </script>
-<!-- INCLUDEJS {ROOT_PATH}assets/javascript/editor.js -->
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/editor.js -->
 
 <table width="100%" cellspacing="1" cellpadding="4" border="0">
 <tr>
-- 
cgit v1.2.1


From 13d2d7d03684c44d2d2dc12fa205ee05e71e923d Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 29 Oct 2013 06:52:38 -0700
Subject: [ticket/11472] Expand palette cell links to the full block size.

PHPBB3-11472
---
 phpBB/styles/subsilver2/template/posting_body.html          | 2 +-
 phpBB/styles/subsilver2/template/ucp_main_drafts.html       | 2 +-
 phpBB/styles/subsilver2/template/ucp_profile_signature.html | 2 +-
 phpBB/styles/subsilver2/theme/stylesheet.css                | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 53e8e02d33..79c0fa2dbb 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -207,7 +207,7 @@
 		<tr>
 			<td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" style="width: 700px; height: 270px; min-width: 98%; max-width: 98%;">{MESSAGE}</textarea></td>
 			<!-- IF S_BBCODE_ALLOWED -->
-			<td width="80" align="center" valign="top" id="color_palette_placeholder" data-orientation="v" data-width="7" data-height="6">
+			<td width="80" align="center" valign="top" id="color_palette_placeholder" data-orientation="v" data-width="11" data-height="10">
 			</td>
 			<!-- ENDIF -->
 	 	</tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_main_drafts.html b/phpBB/styles/subsilver2/template/ucp_main_drafts.html
index 96af9c44e4..0206c7c613 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_drafts.html
@@ -75,7 +75,7 @@
 				<td colspan="9">
 					<table cellspacing="0" cellpadding="0" border="0" width="100%">
 					<tr>
-						<td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="7" data-height="6">
+						<td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="11" data-height="10">
 						</td>
 					</tr>
 					</table>
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html
index 4ed3287b39..5a2690edda 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_signature.html
@@ -61,7 +61,7 @@
 			<td colspan="2">
 				<table cellspacing="0" cellpadding="0" border="0" width="100%">
 				<tr>
-					<td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="7" data-height="6">
+					<td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="11" data-height="10">
 					</td>
 				</tr>
 				</table>
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 22a3ada275..da99051329 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -308,6 +308,10 @@ p.topicdetails {
 	border-spacing: 1px;
 }
 
+#color_palette_placeholder td {
+	padding: 0;
+}
+
 th {
 	color: #FFA34F;
 	font-size: 1.1em;
-- 
cgit v1.2.1


From c5680ca8227915ff7fc5f56bb4c4e9fd42b08e20 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 13 Nov 2013 01:24:37 -0800
Subject: [ticket/10810] Update all palettes.

PHPBB3-10810
---
 phpBB/styles/prosilver/template/posting_buttons.html    | 2 +-
 phpBB/styles/prosilver/template/ucp_groups_manage.html  | 7 ++++++-
 phpBB/styles/prosilver/theme/common.css                 | 5 +++++
 phpBB/styles/prosilver/theme/forms.css                  | 5 -----
 phpBB/styles/subsilver2/template/posting_body.html      | 2 +-
 phpBB/styles/subsilver2/template/ucp_groups_manage.html | 6 +++++-
 phpBB/styles/subsilver2/template/ucp_main_drafts.html   | 2 +-
 7 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index aa269058cc..c5cdfad156 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -55,7 +55,7 @@
 <div id="colour_palette" style="display: none;">
 	<dl style="clear: left;">
 		<dt><label>{L_FONT_COLOR}{L_COLON}</label></dt>
-		<dd id="color_palette_placeholder" data-orientation="h" data-height="12" data-width="15"></dd>
+		<dd id="color_palette_placeholder" data-orientation="h" data-height="12" data-width="15" data-bbcode="true"></dd>
 	</dl>
 </div>
 
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index 019b5aa3e1..eb431e9f3f 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -54,7 +54,12 @@
 	<fieldset>
 	<dl>
 		<dt><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt>
-		<dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" /> <span style="background-color: {GROUP_COLOUR};">&nbsp;&nbsp;&nbsp;</span> [ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false;">{L_COLOUR_SWATCH}</a> ]</dd>
+		<dd>
+			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" class="inputbox narrow" />
+			<span style="background-color: {GROUP_COLOUR};">&nbsp;&nbsp;&nbsp;</span>
+			[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]
+			<div id="color_palette_placeholder" class="hidden" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
+		</dd>
 	</dl>
 	<dl>
 		<dt><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></dt>
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 225673a932..de55b8188f 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -631,6 +631,11 @@ table.info tbody th {
 	margin: 0 -1px;
 }
 
+#color_palette_placeholder table {
+	border-collapse: separate;
+	border-spacing: 1px;
+}
+
 /* Misc layout styles
 ---------------------------------------- */
 /* column[1-2] styles are containers for two column layouts
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 1ee364ce93..755ce4a19d 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -235,11 +235,6 @@ fieldset.submit-buttons input {
 /* Posting page styles
 ----------------------------------------*/
 
-#colour_palette table {
-	border-collapse: separate;
-	border-spacing: 1px;
-}
-
 /* Buttons used in the editor */
 #format-buttons {
 	margin: 15px 0 2px 0;
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 79c0fa2dbb..b501c4146a 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -207,7 +207,7 @@
 		<tr>
 			<td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" onfocus="initInsertions();" style="width: 700px; height: 270px; min-width: 98%; max-width: 98%;">{MESSAGE}</textarea></td>
 			<!-- IF S_BBCODE_ALLOWED -->
-			<td width="80" align="center" valign="top" id="color_palette_placeholder" data-orientation="v" data-width="11" data-height="10">
+			<td width="80" align="center" valign="top" id="color_palette_placeholder" data-orientation="v" data-width="11" data-height="10" data-bbcode="true">
 			</td>
 			<!-- ENDIF -->
 	 	</tr>
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
index b8e7e29481..1499f90eaf 100644
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -49,7 +49,11 @@
 	</tr>
 	<tr>
 		<td class="row1" width="35%"><label for="group_colour">{L_GROUP_COLOR}{L_COLON}</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></td>
-		<td class="row2"><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;<span>[ <a href="{U_SWATCH}" onclick="popup(this.href, 636, 150, '_swatch'); return false;">{L_COLOUR_SWATCH}</a> ]</span></td>
+		<td class="row2">
+			<input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" />&nbsp;&nbsp;
+			<span>[ <a href="#" id="color_palette_toggle">{L_COLOUR_SWATCH}</a> ]</span>
+			<div id="color_palette_placeholder" style="display: none;" data-orientation="h" data-height="12" data-width="15" data-target="#group_colour"></div>
+		</td>
 	</tr>
 	<tr>
 		<td class="row1" width="35%"><label for="group_rank">{L_GROUP_RANK}{L_COLON}</label></td>
diff --git a/phpBB/styles/subsilver2/template/ucp_main_drafts.html b/phpBB/styles/subsilver2/template/ucp_main_drafts.html
index 0206c7c613..d63d678250 100644
--- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html
+++ b/phpBB/styles/subsilver2/template/ucp_main_drafts.html
@@ -75,7 +75,7 @@
 				<td colspan="9">
 					<table cellspacing="0" cellpadding="0" border="0" width="100%">
 					<tr>
-						<td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="11" data-height="10">
+						<td align="{S_CONTENT_FLOW_BEGIN}" id="color_palette_placeholder" data-orientation="h" data-width="11" data-height="10" data-bbcode="true">
 						</td>
 					</tr>
 					</table>
-- 
cgit v1.2.1


From 6b39f3b6a7a4b45b454cf5db9ad71d5d72e5dc8a Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 27 Oct 2013 11:36:19 +0200
Subject: [ticket/11979] Add ability to create dropdown menu to prosilver

PHPBB3-11979
---
 phpBB/styles/prosilver/template/forum_fn.js | 33 +++++++++++++++++++++++++++++
 phpBB/styles/prosilver/theme/common.css     | 25 +++++++++++++++++-----
 2 files changed, 53 insertions(+), 5 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 1b2b1954ef..d4653c1be3 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -433,6 +433,39 @@ function parse_document(container)
 		jumpto($(this));
 	});
 
+	/**
+	* 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.verticalDirection = 'left';
+		if ($this.hasClass('dropdown-right')) options.verticalDirection = 'right';
+
+		phpbb.registerDropdown(trigger, contents, options);
+	});
+
 	/**
 	* Adjust HTML code for IE8 and older versions		
 	*/
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 225673a932..41cfb37cf2 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -407,6 +407,14 @@ li.responsive-menu .dropdown .dropdown-contents {
 	padding: 0 5px;
 }
 
+ul.linklist .dropdown-down .dropdown {
+	top: 22px;
+}
+
+ul.linklist .dropdown-up .dropdown {
+	bottom: 18px;
+}
+
 ul.linklist .dropdown li {
 	clear: both;
 }
@@ -437,10 +445,18 @@ ul.linklist.bulletin li.no-bulletin:before {
 
 /* Dropdown menu
 ----------------------------------------*/
+.dropdown-container {
+	position: relative;
+}
+
+.nojs .dropdown-container:hover .dropdown {
+	display: block !important;
+}
+
 .dropdown {
 	position: absolute;
 	left: 0;
-	top: 22px;
+	top: 1.2em;
 	z-index: 2;
 	border: 1px solid transparent;
 	border-radius: 5px;
@@ -449,16 +465,15 @@ ul.linklist.bulletin li.no-bulletin:before {
 
 .dropdown-up .dropdown {
 	top: auto;
-	bottom: 18px;
+	bottom: 1.2em;
 	padding: 0 0 9px;
 }
 
-.dropdown-left .dropdown {
+.dropdown-left .dropdown, .nojs .rightside .dropdown {
 	left: auto;
 	right: 0;
 }
 
-
 .dropdown .pointer, .dropdown .pointer-inner {
 	position: absolute;
 	width: 0;
@@ -488,7 +503,7 @@ ul.linklist.bulletin li.no-bulletin:before {
 	top: auto;
 }
 
-.dropdown-left .dropdown .pointer {
+.dropdown-left .dropdown .pointer, .nojs .rightside .dropdown .pointer {
 	left: auto;
 	right: 10px;
 }
-- 
cgit v1.2.1


From 6ee05d369e5aa0acb307bf88f0ac15fb33aade2b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 13 Nov 2013 17:50:57 +0100
Subject: [prep-release-3.1.0-a2] Update version to 3.1.0-a2

---
 phpBB/styles/prosilver/style.cfg  | 4 ++--
 phpBB/styles/subsilver2/style.cfg | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index aac9d993f5..aef7a3b12a 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -18,8 +18,8 @@
 # General Information about this style
 name = prosilver
 copyright = &copy; phpBB Group, 2007
-style_version = 3.1.0-a1
-phpbb_version = 3.1.0-a1
+style_version = 3.1.0-a2
+phpbb_version = 3.1.0-a2
 
 # Defining a different template bitfield
 # template_bitfield = lNg=
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 1d50352885..b588567153 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -18,8 +18,8 @@
 # General Information about this style
 name = subsilver2
 copyright = &copy; 2005 phpBB Group
-style_version = 3.1.0-a1
-phpbb_version = 3.1.0-a1
+style_version = 3.1.0-a2
+phpbb_version = 3.1.0-a2
 
 # Defining a different template bitfield
 # template_bitfield = lNg=
-- 
cgit v1.2.1


From 9d39457e35632d2770af986f78286d239fd00c78 Mon Sep 17 00:00:00 2001
From: OpenShift guest <dachebodt@gmail.com>
Date: Mon, 18 Nov 2013 23:17:03 -0500
Subject: [ticket/12024] Template event overall_header_content_before

http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44959
http://tracker.phpbb.com/browse/PHPBB3-12024

PHPBB3-12024
---
 phpBB/styles/prosilver/template/overall_footer.html  | 1 +
 phpBB/styles/prosilver/template/overall_header.html  | 1 +
 phpBB/styles/subsilver2/template/overall_footer.html | 1 +
 phpBB/styles/subsilver2/template/overall_header.html | 1 +
 4 files changed, 4 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index bf5ce30f37..766dc93655 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -1,3 +1,4 @@
+		<!-- EVENT overall_footer_content_after -->
 	</div>
 
 <div id="page-footer">
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index a53e0f8d60..7002ebc630 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -213,3 +213,4 @@
 			</div>
 		</div>
 		<!-- ENDIF -->
+		<!-- EVENT overall_header_content_before -->
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 3a29a0d752..84a02430b9 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -1,3 +1,4 @@
+	<!-- EVENT overall_footer_content_after -->
 	<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
 </div>
 
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 0317d6e45c..20d06e4921 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -243,3 +243,4 @@ function marklist(id, name, state)
 	<!-- DEFINE $S_MICRODATA = 0 -->
 
 	<br />
+	<!-- EVENT overall_header_content_before -->
\ No newline at end of file
-- 
cgit v1.2.1


From bc47455dfba70f43bf335753e0329e2eff6d7082 Mon Sep 17 00:00:00 2001
From: OpenShift guest <dachebodt@gmail.com>
Date: Mon, 18 Nov 2013 23:43:39 -0500
Subject: [ticket/12024] Replace newline PHPBB3-12024

---
 phpBB/styles/subsilver2/template/overall_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 20d06e4921..02e056798b 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -243,4 +243,4 @@ function marklist(id, name, state)
 	<!-- DEFINE $S_MICRODATA = 0 -->
 
 	<br />
-	<!-- EVENT overall_header_content_before -->
\ No newline at end of file
+	<!-- EVENT overall_header_content_before -->
-- 
cgit v1.2.1


From 55670d75b00079a06ed1ac701786e41d7a367f89 Mon Sep 17 00:00:00 2001
From: OpenShift guest <dachebodt@gmail.com>
Date: Tue, 19 Nov 2013 09:55:58 -0500
Subject: [ticket/12024] Add new line

PHPBB3-12024
---
 phpBB/styles/prosilver/template/overall_header.html  | 1 +
 phpBB/styles/subsilver2/template/overall_footer.html | 1 +
 2 files changed, 2 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 7002ebc630..809c0affcb 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -213,4 +213,5 @@
 			</div>
 		</div>
 		<!-- ENDIF -->
+
 		<!-- EVENT overall_header_content_before -->
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 84a02430b9..4d69f8dff1 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -1,4 +1,5 @@
 	<!-- EVENT overall_footer_content_after -->
+
 	<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
 </div>
 
-- 
cgit v1.2.1


From 094da3ba167e1075a8d3e75096c7e83712d74f87 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 29 Oct 2013 01:16:30 +0200
Subject: [ticket/11984] Prevent AJAX background animation flicker in prosilver

PHPBB3-11984
---
 phpBB/styles/prosilver/theme/common.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 225673a932..9714e87af2 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -810,6 +810,8 @@ li.pagination ul {
 
 #darkenwrapper {
 	display: none;
+	position: relative;
+	z-index: 44;
 }
 
 #darken {
@@ -819,6 +821,7 @@ li.pagination ul {
 	width: 100%;
 	height: 100%;
 	opacity: 0.5;
+	z-index: 45;
 }
 
 #loading_indicator {
-- 
cgit v1.2.1


From be3bab49460274e9cce5b92b9e66435d1b622a8e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Wed, 20 Nov 2013 00:17:28 +0200
Subject: [ticket/11979] Fix errors in dropdown

PHPBB3-11979
---
 phpBB/styles/prosilver/template/forum_fn.js | 4 ++--
 phpBB/styles/prosilver/theme/common.css     | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index d4653c1be3..a45f750a63 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -460,8 +460,8 @@ function parse_document(container)
 
 		if ($this.hasClass('dropdown-up')) options.verticalDirection = 'up';
 		if ($this.hasClass('dropdown-down')) options.verticalDirection = 'down';
-		if ($this.hasClass('dropdown-left')) options.verticalDirection = 'left';
-		if ($this.hasClass('dropdown-right')) options.verticalDirection = 'right';
+		if ($this.hasClass('dropdown-left')) options.direction = 'left';
+		if ($this.hasClass('dropdown-right')) options.direction = 'right';
 
 		phpbb.registerDropdown(trigger, contents, options);
 	});
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 41cfb37cf2..a133d62239 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -522,10 +522,13 @@ ul.linklist.bulletin li.no-bulletin:before {
 .dropdown .dropdown-contents {
 	z-index: 2;
 	overflow: hidden;
+	overflow-y: auto;
 	border: 1px solid transparent;
 	border-radius: 5px;
 	padding: 5px;
 	position: relative;
+	min-width: 40px;
+	max-height: 200px;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
-- 
cgit v1.2.1


From 263f213ffe9fa5999fff8274983daa24eec07f55 Mon Sep 17 00:00:00 2001
From: s9e <s9e.dev@gmail.com>
Date: Thu, 21 Nov 2013 23:20:16 +0100
Subject: [ticket/12028] Replace L_COLON with literal colon

Replace L_COLON with literal colon in JavaScript context.

[ci skip]

PHPBB3-12028
---
 phpBB/styles/prosilver/template/posting_buttons.html  | 2 +-
 phpBB/styles/subsilver2/template/posting_buttons.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index c5cdfad156..e8338c6c86 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -28,7 +28,7 @@
 		y: '{LA_BBCODE_Y_HELP}',
 		d: '{LA_BBCODE_D_HELP}'
 		<!-- BEGIN custom_tags -->
-			,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
+			,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
 		<!-- END custom_tags -->
 	}
 
diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index 7a3a4ca73c..06de2c3169 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -27,7 +27,7 @@
 			d: '{LA_BBCODE_D_HELP}',
 			tip: '{L_STYLES_TIP}'
 			<!-- BEGIN custom_tags -->
-				,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}'
+				,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
 			<!-- END custom_tags -->
 		}
 
-- 
cgit v1.2.1


From 6a2d0c345c9990a60a89e02542fc46e53f474cfa Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 27 Nov 2013 18:09:38 +0100
Subject: [ticket/12042] Add all language strings from PLUpload 2.0 to the
 language file

PHPBB3-12042
---
 phpBB/styles/prosilver/template/plupload.html | 45 ++++++++++++++++++---------
 1 file changed, 31 insertions(+), 14 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html
index 9b1911f708..bf0863d2a7 100644
--- a/phpBB/styles/prosilver/template/plupload.html
+++ b/phpBB/styles/prosilver/template/plupload.html
@@ -4,27 +4,44 @@
 //<![CDATA[
 phpbb.plupload = {
 	i18n: {
-		'Select files': '{LA_PLUPLOAD_SELECT_FILES}',
+		'b': '{LA_B}',
+		'kb': '{LA_KB}',
+		'mb': '{LA_MB}',
+		'gb': '{LA_GB}',
+		'tb': '{LA_TB}',
+		'Add Files': '{LA_PLUPLOAD_ADD_FILES}',
 		'Add files to the upload queue and click the start button.': '{LA_PLUPLOAD_ADD_FILES_TO_QUEUE}',
-		'Filename': '{LA_PLUPLOAD_FILENAME}',
-		'Status': '{LA_PLUPLOAD_STATUS}',
-		'Size': '{LA_PLUPLOAD_SIZE}',
-		'Add files': '{LA_PLUPLOAD_ADD_FILES}',
-		'Stop current upload': '{LA_PLUPLOAD_STOP_CURRENT_UPLOAD}',
-		'Start uploading queue': '{LA_PLUPLOAD_START_CURRENT_UPLOAD}',
-		'Uploaded %d/%d files': '{LA_PLUPLOAD_UPLOADED}',
-		'N/A': '{LA_PLUPLOAD_NOT_APPLICABLE}',
+		'Close': '{LA_PLUPLOAD_CLOSE}',
 		'Drag files here.': '{LA_PLUPLOAD_DRAG}',
+		'Duplicate file error.': '{LA_PLUPLOAD_DUPLICATE_ERROR}',
+		'Error: File too large:': '{LA_PLUPLOAD_ERR_FILE_TOO_LARGE}',
+		'Error: Invalid file extension:': '{LA_PLUPLOAD_ERR_FILE_INVALID_EXT}',
+		'File: %s': '{LA_PLUPLOAD_FILE}',
+		'File: %s, size: %d, max file size: %d': '{LA_PLUPLOAD_FILE_DETAILS}',
+		'File count error.': '{LA_PLUPLOAD_ERR_FILE_COUNT}',
 		'File extension error.': '{LA_PLUPLOAD_EXTENSION_ERROR}',
 		'File size error.': '{LA_PLUPLOAD_SIZE_ERROR}',
-		'Init error.': '{LA_PLUPLOAD_INIT_ERROR}',
-		'HTTP Error.': '{LA_PLUPLOAD_HTTP_ERROR}',
-		'Security error.': '{LA_PLUPLOAD_SECURITY_ERROR}',
+		'Filename': '{LA_PLUPLOAD_FILENAME}',
 		'Generic error.': '{LA_PLUPLOAD_GENERIC_ERROR}',
+		'HTTP Error.': '{LA_PLUPLOAD_HTTP_ERROR}',
+		'Image format either wrong or not supported.': '{LA_PLUPLOAD_IMAGE_FORMAT}',
+		'Init error.': '{LA_PLUPLOAD_INIT_ERROR}',
 		'IO error.': '{LA_PLUPLOAD_IO_ERROR}',
+		'N/A': '{LA_PLUPLOAD_NOT_APPLICABLE}',
+		'Runtime ran out of available memory.': '{LA_PLUPLOAD_ERR_RUNTIME_MEMORY}',
+		'Security error.': '{LA_PLUPLOAD_SECURITY_ERROR}',
+		'Select files': '{LA_PLUPLOAD_SELECT_FILES}',
+		'Size': '{LA_PLUPLOAD_SIZE}',
+		'Start Upload': '{LA_PLUPLOAD_START_UPLOAD}',
+		'Start uploading queue': '{LA_PLUPLOAD_START_CURRENT_UPLOAD}',
+		'Status': '{LA_PLUPLOAD_STATUS}',
 		'Stop Upload': '{LA_PLUPLOAD_STOP_UPLOAD}',
-		'Start upload': '{LA_PLUPLOAD_START_UPLOAD}',
-		'%d files queued': '{LA_PLUPLOAD_FILES_QUEUED}'
+		'Stop current upload': '{LA_PLUPLOAD_STOP_CURRENT_UPLOAD}',
+		'Upload element accepts only %d file(s) at a time. Extra files were stripped.': '{LA_PLUPLOAD_ERR_UPLOAD_LIMIT}',
+		"Upload URL might be wrong or doesn't exist.": '{LA_PLUPLOAD_ERR_UPLOAD_URL}',
+		'Uploaded %d/%d files': '{LA_PLUPLOAD_UPLOADED}',
+		'%d files queued': '{LA_PLUPLOAD_FILES_QUEUED}',
+		'%s already present in the queue.': '{LA_PLUPLOAD_ALREADY_QUEUED}'
 	},
 	config: {
 		runtimes: 'html5',
-- 
cgit v1.2.1


From f3d7823050880ea6e597defefd265b32058c975b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 27 Nov 2013 18:54:51 +0100
Subject: [ticket/12042] Replace B with a more meaningful key name

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html
index bf0863d2a7..290992ddd6 100644
--- a/phpBB/styles/prosilver/template/plupload.html
+++ b/phpBB/styles/prosilver/template/plupload.html
@@ -4,7 +4,7 @@
 //<![CDATA[
 phpbb.plupload = {
 	i18n: {
-		'b': '{LA_B}',
+		'b': '{LA_BYTES_SHORT}',
 		'kb': '{LA_KB}',
 		'mb': '{LA_MB}',
 		'gb': '{LA_GB}',
-- 
cgit v1.2.1


From 5ab5bd6bda83e2949444e38b4511421e3465c2e0 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 1 Dec 2013 17:16:31 -0800
Subject: [ticket/11346] Hide "Mark topics read" link when forum is empty.

TOTAL_POSTS and TOTAL_USERS are not defined for viewforum.php.

PHPBB3-11346
---
 .../styles/prosilver/template/viewforum_body.html  | 27 +++++++++-------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index f0994f0716..eb2e96175f 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -55,17 +55,15 @@
 		</div>
 	<!-- ENDIF -->
 
-	<!-- IF .pagination or TOTAL_POSTS or TOTAL_TOPICS -->
-		<div class="pagination">
-			<!-- IF not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
-			<!-- IF TOTAL_TOPICS -->{TOTAL_TOPICS} &bull; <!-- ENDIF -->
-			<!-- IF .pagination -->
-				<!-- INCLUDE pagination.html -->
-			<!-- ELSE -->
-				{PAGE_NUMBER}
-			<!-- ENDIF -->
-		</div>
-	<!-- ENDIF -->
+	<div class="pagination">
+		<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
+		{TOTAL_TOPICS} &bull; 
+		<!-- IF .pagination -->
+			<!-- INCLUDE pagination.html -->
+		<!-- ELSE -->
+			{PAGE_NUMBER}
+		<!-- ENDIF -->
+	</div>
 
 	</div>
 <!-- ENDIF -->
@@ -227,18 +225,15 @@
 		</div>
 		<!-- ENDIF -->
 
-		<!-- IF PAGE_NUMBER or TOTAL_POSTS or TOTAL_TOPICS -->
 		<div class="pagination">
-			<!-- IF TOTAL_TOPICS and not S_IS_BOT and U_MARK_TOPICS --><a href="{U_MARK_TOPICS}" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> &bull;  <!-- ENDIF -->
-			<!-- IF TOTAL_POSTS and not NEWEST_USER --> {TOTAL_POSTS}<!-- ELSEIF TOTAL_TOPICS and not NEWEST_USER --> {TOTAL_TOPICS} &bull; <!-- ENDIF -->
-			<!-- IF TOTAL_USERS -->{TOTAL_USERS} &bull; <!-- ENDIF -->
+			<!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" data-ajax="mark_topics_read" data-overlay="false">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
+			{TOTAL_TOPICS} &bull; 
 			<!-- IF .pagination -->
 				<!-- INCLUDE pagination.html -->
 			<!-- ELSE -->
 				{PAGE_NUMBER}
 			<!-- ENDIF -->
 		</div>
-		<!-- ENDIF -->
 	</div>
 <!-- ENDIF -->
 
-- 
cgit v1.2.1


From 4b0410a9d9ab9a405722f0d14d659ab3b7096f11 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 8 Nov 2013 11:32:42 -0800
Subject: [ticket/11241] Add dropdown control button.

PHPBB3-11241
---
 phpBB/styles/prosilver/theme/buttons.css           |  40 +++++++++++++++++++--
 phpBB/styles/prosilver/theme/colours.css           |  27 +++++++++++---
 phpBB/styles/prosilver/theme/common.css            |  18 ++++++++++
 phpBB/styles/prosilver/theme/images/buttons.png    | Bin 2563 -> 2923 bytes
 .../prosilver/theme/images/icon_download.gif       | Bin 0 -> 198 bytes
 5 files changed, 78 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 phpBB/styles/prosilver/theme/images/buttons.png
 create mode 100644 phpBB/styles/prosilver/theme/images/icon_download.gif

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index cdd325fb13..89fdcd85a8 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -11,13 +11,13 @@
 }
 
 /* Rollover state */
-.buttons div {
+.buttons div, .dropdown-select {
 	float: left;
 	margin: 0 5px 0 0;
 }
 
 /* Rolloff state */
-.buttons div a {
+.buttons div a, .dropdown-select {
 	display: inline-block;
 	line-height: 17.5px;
 	height: 18px;
@@ -38,7 +38,7 @@
 
 .buttons div span { display: none; }
 
-.buttons div a:after {
+.buttons div a:after, .dropdown-select:after {
 	content: '';
 	display: block;
 	position: absolute;
@@ -54,6 +54,35 @@
 	background-position: 0 -20px;
 }
 
+.dropdown-select {
+	cursor: pointer;
+	font-family: inherit;
+	font-size: 1em;
+	font-weight: normal;
+}
+
+.dropdown-select:after {
+	background-position: -103px 10px;
+	border-left: 1px solid;
+	margin-top: 0;
+	top: 0;
+	right: 0;
+	height: 21px;
+	width: 15px;
+}
+
+.dropdown-visible .dropdown-select:after, .nojs .dropdown-container:hover .dropdown-select:after {
+	background-position: -103px -10px;
+}
+
+.dropdown-select-icon:before {
+	content: '';
+	display: block;
+	float: left;
+	margin-right: 4px;
+	margin-top: 2px;
+}
+
 /* Big button images */
 .buttons div.reply-icon a:after, .buttons div.pmreply-icon a:after { background-position: -20px 0; }
 .buttons div.reply-icon a:hover:after, .buttons div.pmreply-icon a:hover:after	{ background-position: -20px -20px; }
@@ -67,6 +96,11 @@
 .buttons div.forwardpm-icon a:after	{ background-position: -40px 0; }
 .buttons div.forwardpm-icon a:hover:after	{ background-position: -40px -20px; }
 
+.dropdown-select.tools-icon:before { background-position: -80px 0; height: 16px; width: 16px; }
+
+.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 {
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 55b01f1269..8258262276 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -231,7 +231,6 @@ p.post-notice.reported:before, p.post-notice.error:before {
 	background-image: url("./images/icon_topic_reported.gif");
 }
 
-
 /*
 --------------------------------------------------------------
 Colours and backgrounds for links.css
@@ -655,7 +654,7 @@ a.sendemail {
 	background-image: url("./images/icon_sendemail.gif");
 }
 
-.buttons div a {
+.buttons div a, .dropdown-select {
 	border-color: #C7C3BF;
 	background-color: #FFFFFF;
 	background-image: -moz-linear-gradient(top, #FFFFFF, #E9E9E9);
@@ -668,7 +667,15 @@ a.sendemail {
 	color: #BC2A4D !important;
 }
 
-.buttons div a:hover {
+.dropdown-select {
+	color: #5C6482 !important;
+}
+
+.dropdown-select:after {
+	border-color: #DADADA;
+}
+
+.buttons div a:hover, .dropdown-select:hover {
 	border-color: #0a8ed0;
 	background-image: -moz-linear-gradient(top, #E9E9E9, #FFFFFF);
 	background-image: -webkit-linear-gradient(top, #E9E9E9, #FFFFFF);
@@ -678,7 +685,18 @@ a.sendemail {
 	text-shadow: 1px 1px 0 #FFFFFF, -1px -1px 0 #FFFFFF, -1px -1px 0 rgba(188, 42, 77, 0.2);
 }
 
-.buttons div a:after {
+.dropdown-select:hover {
+	border-color: #C7C3BF; 
+}
+
+.dropdown-visible .dropdown-select, .dropdown-visible .dropdown-select:hover, .nojs .dropdown-container:hover .dropdown-select {
+	background-color: #FFFFFF;
+	background-image: none;
+	border-color: #A6B2BA;
+	color: #105289 !important;
+}
+
+.buttons div a:after, .dropdown-select-icon:before, .dropdown-select:after {
 	background-image: url("images/buttons.png");
 }
 
@@ -698,6 +716,7 @@ a.sendemail {
 .icon-search, .responsive-search a	{ background-image: url("./images/icon_search.gif"); }
 .icon-notification				{ background-image: url("./images/icon_notification.gif"); }
 .icon-pm						{ background-image: url("./images/icon_pm.gif"); }
+.icon-download					{ background-image: url("./images/icon_download.gif"); }
 
 /* Profile & navigation icons */
 .email-icon, .email-icon a		{ background-image: url("./images/icon_contact_email.gif"); }
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 3cc3ce1afe..8d65c96a72 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -463,6 +463,10 @@ ul.linklist.bulletin li.no-bulletin:before {
 	padding: 9px 0 0;
 }
 
+.dropdown-container.topic-tools {
+	float: left;
+}
+
 .dropdown-up .dropdown {
 	top: auto;
 	bottom: 1.2em;
@@ -474,6 +478,15 @@ ul.linklist.bulletin li.no-bulletin:before {
 	right: 0;
 }
 
+.dropdown-button-control .dropdown {
+	top: 24px;
+}
+
+.dropdown-button-control.dropdown-up .dropdown {
+	top: auto;
+	bottom: 24px;
+}
+
 .dropdown .pointer, .dropdown .pointer-inner {
 	position: absolute;
 	width: 0;
@@ -536,11 +549,16 @@ ul.linklist.bulletin li.no-bulletin:before {
 
 .dropdown li {
 	float: none;
+	list-style: none;
 	margin: 0;
 	white-space: nowrap;
 	text-align: left;
 }
 
+.dropdown li li {
+	padding-left: 10px;
+}
+
 .wrap .dropdown li, .dropdown.wrap li, #notification_list li {
 	white-space: normal;
 }
diff --git a/phpBB/styles/prosilver/theme/images/buttons.png b/phpBB/styles/prosilver/theme/images/buttons.png
old mode 100644
new mode 100755
index a19abdc2b8..3a8c2f2f65
Binary files a/phpBB/styles/prosilver/theme/images/buttons.png and b/phpBB/styles/prosilver/theme/images/buttons.png differ
diff --git a/phpBB/styles/prosilver/theme/images/icon_download.gif b/phpBB/styles/prosilver/theme/images/icon_download.gif
new file mode 100644
index 0000000000..70cd61caf2
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/icon_download.gif differ
-- 
cgit v1.2.1


From e110d591a93b518edca00f01823d62c4d1a0ca91 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 11 Oct 2013 18:48:09 -0700
Subject: [ticket/11241] Consolidate topic actions into "Topic tools" dropdown.

PHPBB3-11241
---
 .../styles/prosilver/template/overall_footer.html  |  3 --
 .../styles/prosilver/template/viewtopic_body.html  | 51 +++++++++++++++++-----
 2 files changed, 41 insertions(+), 13 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 6f297660a2..bbffe8dc3d 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -12,9 +12,6 @@
 			</li>
 			<!-- IF not S_IS_BOT -->
 				<!-- IF U_WATCH_FORUM_LINK --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
-				<!-- IF U_WATCH_TOPIC --><li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"><a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">{S_WATCH_TOPIC_TITLE}</a></li><!-- ENDIF -->
-				<!-- IF U_BOOKMARK_TOPIC --><li class="small-icon icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}">{S_BOOKMARK_TOPIC}</a></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 -->
 			<!-- ENDIF -->
 			<li class="rightside">{S_TIMEZONE}</li>
 			<!-- 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 -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 46881d3b03..b4d6a67712 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -33,6 +33,46 @@
 	<!-- ENDIF -->
 	</div>
 
+	{% block topic_tools %}
+		<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS) -->
+			<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">
+					<div class="pointer"><div class="pointer-inner"></div></div>
+					<ul class="dropdown-contents">
+						<!-- IF U_WATCH_TOPIC -->
+							<li class="small-icon <!-- IF S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->">
+								<a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon <!-- IF not S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">
+									{S_WATCH_TOPIC_TITLE}
+								</a>
+							</li>
+						<!-- ENDIF -->
+						<!-- IF U_BOOKMARK_TOPIC -->
+							<li class="small-icon icon-bookmark">
+								<a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}">
+									{S_BOOKMARK_TOPIC}
+								</a>
+							</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 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>
+								<ul class="dropdown-submenu hidden">
+									<li>
+									<!-- BEGIN dl_method -->
+										<a href="{dl_method.LINK}">{dl_method.TYPE}</a><!-- IF not dl_method.S_LAST_ROW --> &bull; <!-- ENDIF --> 
+									<!-- END dl_method -->
+									</li>
+								</ul>
+							</li>
+						<!-- ENDIF -->
+					</ul>
+				</div>
+			</div>
+		<!-- ENDIF -->
+	{% endblock %}
+
 	<!-- IF S_DISPLAY_SEARCHBOX -->
 		<div class="search-box">
 			<form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}">
@@ -299,16 +339,7 @@
 	<!-- ENDIF -->
 	</div>
 
-	<!-- IF S_HAS_ATTACHMENTS -->
-		<div class="dl_links">
-			<strong>{L_DOWNLOAD_ALL_ATTACHMENTS}{L_COLON}</strong>
-			<ul>
-			<!-- BEGIN dl_method -->
-				<li>[ <a href="{dl_method.LINK}">{dl_method.TYPE}</a> ]</li>
-			<!-- END dl_method -->
-			</ul>
-		</div>
-	<!-- ENDIF -->
+	{{ block('topic_tools') }}
 
 	<!-- IF .pagination or TOTAL_POSTS -->
 		<div class="pagination">
-- 
cgit v1.2.1


From 9c9c20ad55d909922a40fae5ba502b515b7679f4 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 11 Oct 2013 23:05:35 -0700
Subject: [ticket/11241] Use DEFINE for the block.

PHPBB3-11241
---
 phpBB/styles/prosilver/template/viewtopic_body.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index b4d6a67712..86501f8ff5 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -33,7 +33,7 @@
 	<!-- ENDIF -->
 	</div>
 
-	{% block topic_tools %}
+	<!-- DEFINE $TOPIC_TOOLS_BLOCK -->
 		<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS) -->
 			<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>
@@ -71,7 +71,8 @@
 				</div>
 			</div>
 		<!-- ENDIF -->
-	{% endblock %}
+	<!-- ENDDEFINE -->
+	{$TOPIC_TOOLS_BLOCK}
 
 	<!-- IF S_DISPLAY_SEARCHBOX -->
 		<div class="search-box">
@@ -339,7 +340,7 @@
 	<!-- ENDIF -->
 	</div>
 
-	{{ block('topic_tools') }}
+	{$TOPIC_TOOLS_BLOCK}
 
 	<!-- IF .pagination or TOTAL_POSTS -->
 		<div class="pagination">
-- 
cgit v1.2.1


From a25b1e6a402d62c6aeff73d7c1cf5ddde7c2f533 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 12 Oct 2013 00:03:34 -0700
Subject: [ticket/11241] Fix the dropdown in RTL languages.

PHPBB3-11241
---
 phpBB/styles/prosilver/theme/bidi.css | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index b04e6576d3..d5e98d6197 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -90,6 +90,21 @@
 	text-align: left;
 }
 
+/* Dropdown menu
+---------------------------------------- */
+.rtl .dropdown-container.topic-tools {
+	float: right;
+}
+
+.rtl .dropdown li {
+	text-align: right;
+}
+
+.rtl .dropdown li li {
+	padding-left: 0;
+	padding-right: 10px;
+}
+
 /* Table styles
 ----------------------------------------*/
 .rtl table.table1 thead th {
-- 
cgit v1.2.1


From 5579dc24124ab843726c3362336067d42491b022 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Thu, 17 Oct 2013 19:05:35 -0700
Subject: [ticket/11241] Add events & var for extensions to dropdown.

PHPBB3-11241
---
 phpBB/styles/prosilver/template/viewtopic_body.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 86501f8ff5..41a34a2039 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -34,12 +34,13 @@
 	</div>
 
 	<!-- DEFINE $TOPIC_TOOLS_BLOCK -->
-		<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS) -->
+		<!-- 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) -->
 			<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">
 					<div class="pointer"><div class="pointer-inner"></div></div>
 					<ul class="dropdown-contents">
+						<!-- EVENT viewtopic_topic_tools_before -->
 						<!-- IF U_WATCH_TOPIC -->
 							<li class="small-icon <!-- IF S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->">
 								<a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon <!-- IF not S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">
@@ -67,6 +68,7 @@
 								</ul>
 							</li>
 						<!-- ENDIF -->
+						<!-- EVENT viewtopic_topic_tools_after -->
 					</ul>
 				</div>
 			</div>
-- 
cgit v1.2.1


From 42a70154faa0eb987e6bb0bccf296c5c802e06a6 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 9 Nov 2013 00:40:58 -0800
Subject: [ticket/11241] Add border to dropdown menu options.

PHPBB3-11241
---
 .../styles/prosilver/template/viewtopic_body.html  | 45 +---------------------
 .../prosilver/template/viewtopic_topic_tools.html  | 39 +++++++++++++++++++
 phpBB/styles/prosilver/theme/colours.css           |  4 ++
 phpBB/styles/prosilver/theme/common.css            | 20 +++++++++-
 4 files changed, 64 insertions(+), 44 deletions(-)
 create mode 100644 phpBB/styles/prosilver/template/viewtopic_topic_tools.html

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 41a34a2039..155b9f0a05 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -33,48 +33,7 @@
 	<!-- ENDIF -->
 	</div>
 
-	<!-- DEFINE $TOPIC_TOOLS_BLOCK -->
-		<!-- 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) -->
-			<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">
-					<div class="pointer"><div class="pointer-inner"></div></div>
-					<ul class="dropdown-contents">
-						<!-- EVENT viewtopic_topic_tools_before -->
-						<!-- IF U_WATCH_TOPIC -->
-							<li class="small-icon <!-- IF S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->">
-								<a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon <!-- IF not S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">
-									{S_WATCH_TOPIC_TITLE}
-								</a>
-							</li>
-						<!-- ENDIF -->
-						<!-- IF U_BOOKMARK_TOPIC -->
-							<li class="small-icon icon-bookmark">
-								<a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}">
-									{S_BOOKMARK_TOPIC}
-								</a>
-							</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 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>
-								<ul class="dropdown-submenu hidden">
-									<li>
-									<!-- BEGIN dl_method -->
-										<a href="{dl_method.LINK}">{dl_method.TYPE}</a><!-- IF not dl_method.S_LAST_ROW --> &bull; <!-- ENDIF --> 
-									<!-- END dl_method -->
-									</li>
-								</ul>
-							</li>
-						<!-- ENDIF -->
-						<!-- EVENT viewtopic_topic_tools_after -->
-					</ul>
-				</div>
-			</div>
-		<!-- ENDIF -->
-	<!-- ENDDEFINE -->
-	{$TOPIC_TOOLS_BLOCK}
+	<!-- INCLUDE viewtopic_topic_tools.html -->
 
 	<!-- IF S_DISPLAY_SEARCHBOX -->
 		<div class="search-box">
@@ -342,7 +301,7 @@
 	<!-- ENDIF -->
 	</div>
 
-	{$TOPIC_TOOLS_BLOCK}
+	<!-- INCLUDE viewtopic_topic_tools.html -->
 
 	<!-- IF .pagination or TOTAL_POSTS -->
 		<div class="pagination">
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
new file mode 100644
index 0000000000..ec17185bae
--- /dev/null
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
@@ -0,0 +1,39 @@
+<!-- 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) -->
+	<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">
+			<div class="pointer"><div class="pointer-inner"></div></div>
+			<ul class="dropdown-contents">
+				<!-- EVENT viewtopic_topic_tools_before -->
+				<!-- IF U_WATCH_TOPIC -->
+					<li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->">
+						<a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">
+							{S_WATCH_TOPIC_TITLE}
+						</a>
+					</li>
+				<!-- ENDIF -->
+				<!-- IF U_BOOKMARK_TOPIC -->
+					<li class="small-icon icon-bookmark">
+						<a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}">
+							{S_BOOKMARK_TOPIC}
+						</a>
+					</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 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>
+						<ul class="dropdown-submenu hidden">
+							<li>
+							<!-- BEGIN dl_method -->
+								<a href="{dl_method.LINK}">{dl_method.TYPE}</a><!-- IF not dl_method.S_LAST_ROW --> &bull; <!-- ENDIF --> 
+							<!-- END dl_method -->
+							</li>
+						</ul>
+					</li>
+				<!-- ENDIF -->
+				<!-- EVENT viewtopic_topic_tools_after -->
+			</ul>
+		</div>
+	</div>
+<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 8258262276..7291a9d83d 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1181,6 +1181,10 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist
 	box-shadow: 1px 0 5px rgba(0, 0, 0, 0.2);
 }
 
+.dropdown li, .dropdown li li {
+	border-color: #DCDCDC;
+}
+
 #minitabs .dropdown-contents {
 	background-color: #F1F8FF;
 }
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 8d65c96a72..cacae74649 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -548,14 +548,32 @@ ul.linklist.bulletin li.no-bulletin:before {
 }
 
 .dropdown li {
-	float: none;
+	border-bottom: 1px dotted transparent;
+	float: none !important;
+	line-height: normal !important;
+	font-size: 1em !important;
 	list-style: none;
 	margin: 0;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	white-space: nowrap;
 	text-align: left;
 }
 
+.dropdown li:last-child, .dropdown li li {
+	border-bottom: 0;
+}
+
+.dropdown li li:first-child {
+	margin-top: 4px;
+}
+
+.dropdown li li:last-child {
+	padding-bottom: 0;
+}
+
 .dropdown li li {
+	border-top: 1px dotted transparent;
 	padding-left: 10px;
 }
 
-- 
cgit v1.2.1


From 664e7862d07a93e75ce786f68b3ca9e2f6e7f156 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 9 Nov 2013 03:36:41 -0800
Subject: [ticket/11241] Fix the disappearing dropdown when responsive changes
 take effect

PHPBB3-11241
---
 phpBB/styles/prosilver/template/viewtopic_body.html |  4 ++--
 phpBB/styles/prosilver/theme/responsive.css         | 13 +++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 155b9f0a05..338c67dd33 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -57,9 +57,8 @@
 			<!-- ENDIF -->
 		</div>
 	<!-- ENDIF -->
-
+	<div class="clear"></div>
 </div>
-<div class="clear"></div>
 
 <!-- IF S_HAS_POLL -->
 	<form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" class="topic_poll">
@@ -313,6 +312,7 @@
 			<!-- ENDIF -->
 		</div>
 	<!-- ENDIF -->
+	<div class="clear"></div>
 </div>
 
 <!-- EVENT viewtopic_body_footer_before -->
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index d7af7519b7..397ff12942 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -468,10 +468,6 @@ p.rightside {
 	float: none;
 }
 
-.topic-actions {
-	overflow: hidden;
-}
-
 fieldset.quickmod {
 	width: auto;
 	float: none;
@@ -511,17 +507,14 @@ fieldset.display-actions {
 		margin: 0;
 	}
 
-	.topic-actions > div {
-		float: none;
-		overflow: hidden;
-		clear: both;
-	}
-
 	.topic-actions > .pagination, fieldset.jumpbox {
 		text-align: center;
 	}
 
 	.topic-actions > .pagination {
+		float: none;
+		overflow: hidden;
+		clear: both;
 		padding-bottom: 1px;
 	}
 
-- 
cgit v1.2.1


From dbe7154065fd4195395d620654ae7897e057a37e Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 6 Dec 2013 03:32:49 -0800
Subject: [ticket/11241] Retain button gradient when menu is active.

PHPBB3-11241
---
 phpBB/styles/prosilver/theme/colours.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 7291a9d83d..68fbcde4f9 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -675,7 +675,8 @@ a.sendemail {
 	border-color: #DADADA;
 }
 
-.buttons div a:hover, .dropdown-select:hover {
+.buttons div a:hover, .dropdown-select:hover, .dropdown-visible .dropdown-select,
+.dropdown-visible .dropdown-select:hover, .nojs .dropdown-container:hover .dropdown-select  {
 	border-color: #0a8ed0;
 	background-image: -moz-linear-gradient(top, #E9E9E9, #FFFFFF);
 	background-image: -webkit-linear-gradient(top, #E9E9E9, #FFFFFF);
@@ -690,8 +691,6 @@ a.sendemail {
 }
 
 .dropdown-visible .dropdown-select, .dropdown-visible .dropdown-select:hover, .nojs .dropdown-container:hover .dropdown-select {
-	background-color: #FFFFFF;
-	background-image: none;
 	border-color: #A6B2BA;
 	color: #105289 !important;
 }
-- 
cgit v1.2.1


From 204d6781d80b6f88a45723bafe3de23cac0d72f7 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Fri, 6 Dec 2013 19:59:33 +0100
Subject: [ticket/12061] Fix keyboard shortcut in firefox

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 25b60be6e1..fc6a37cbe3 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -6,7 +6,7 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 
 		<ul class="linklist">
-			<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>
+			<li class="icon-home"><a href="{U_INDEX}">{L_INDEX}</a></li>
 				<!-- IF not S_IS_BOT -->
 					<!-- IF S_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{S_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
 					<!-- IF U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a></li><!-- ENDIF -->
-- 
cgit v1.2.1


From 6098134cc6e37cccd5039681ef192bc837addfac Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sat, 7 Dec 2013 00:43:55 -0800
Subject: [ticket/12067] Remove double scrollbar from notifications dropdown.

PHPBB3-12067
---
 phpBB/styles/prosilver/theme/common.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index cacae74649..66ee77f60b 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -1022,6 +1022,7 @@ form > p.post-notice strong {
 }
 
 #notification_list .dropdown-contents {
+	max-height: none;
 	padding: 0;
 }
 
-- 
cgit v1.2.1