From 9b2024a48e5607e2a9473546916663bb27cb43cc Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 11 Nov 2012 11:11:47 +0100
Subject: [ticket/11175] Add microdata to subsilver2

Add breadcrumb data to subsilver2

PHPBB3-11175
---
 phpBB/styles/subsilver2/template/breadcrumbs.html    | 3 ++-
 phpBB/styles/subsilver2/template/overall_header.html | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index 73386ed851..49e31c0749 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -1,7 +1,8 @@
+	<!-- IF $S_MICRODATA --><!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' --><!-- ELSE --><!-- DEFINE $MICRODATA = '' --><!-- ENDIF -->
 	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;">
 	<tr>
 		<td class="row1">
-			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}">{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
+			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA}>{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
 			<p class="datetime">{S_TIMEZONE}</p>
 		</td>
 	</tr>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 8bedec4c9e..1c212969a4 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -195,6 +195,8 @@ function marklist(id, name, state)
 
 	<br style="clear: both;" />
 
+	<!-- DEFINE $S_MICRODATA = 1 -->
 	<!-- INCLUDE breadcrumbs.html -->
+	<!-- DEFINE $S_MICRODATA = 0 -->
 
 	<br />
-- 
cgit v1.2.1


From f72eaa0d95edf399df2c021303ecdb7566308606 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 11 Nov 2012 11:15:48 +0100
Subject: [ticket/11175] Add microdata to prosilver

Add breadcrumb microdata to prosilver

PHPBB3-11175
---
 phpBB/styles/prosilver/template/overall_header.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 0900222d09..291b67812b 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -120,7 +120,8 @@
 			<div class="inner">
 
 			<ul class="linklist navlinks">
-				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
+				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
+				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
 
 				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
 				<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
-- 
cgit v1.2.1


From 170967c48a583e4db5fa1131e23d7abe71681ae6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 13 Nov 2012 20:26:49 +0100
Subject: [ticket/10879] Remove arrow icon from attachment link in editor

If you upload a file with a long filename the filename will partially
cover the arrow icon background image. Remove the icon as it's not needed
anyways.

PHPBB3-10879
---
 phpBB/styles/prosilver/template/posting_editor.html | 2 +-
 1 file changed, 1 insertion(+), 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 5b3f2beed0..5acdb3a08c 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -165,7 +165,7 @@
 
 				<dt><label for="comment_list_{attach_row.ASSOC_INDEX}">{L_FILE_COMMENT}:</label></dt>
 				<dd><textarea name="comment_list[{attach_row.ASSOC_INDEX}]" id="comment_list_{attach_row.ASSOC_INDEX}" rows="1" cols="35" class="inputbox">{attach_row.FILE_COMMENT}</textarea></dd>
-				<dd><a href="{attach_row.U_VIEW_ATTACHMENT}" class="{S_CONTENT_FLOW_END}">{attach_row.FILENAME}</a></dd>
+				<dd><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></dd>
 				<dd style="margin-top: 5px;">
 					<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" onclick="attach_inline({attach_row.ASSOC_INDEX}, '{attach_row.A_FILENAME}');" class="button2" />&nbsp; <!-- ENDIF -->
 					<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2" />
-- 
cgit v1.2.1


From 5f15c98c1d6cce71fb94e2a36ccabd5472a4de1f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 15 Oct 2012 23:31:43 +0200
Subject: [ticket/11197] Prefix the css classes for the small arrow with
 "arrow"

It does not make sense to have classes named "right" and "left" produce a
small arrow next to text. It should be made clear that an arrow will
appear.

PHPBB3-11197
---
 phpBB/styles/prosilver/template/jumpbox.html       |  8 ++++----
 phpBB/styles/prosilver/template/mcp_forum.html     |  4 ++--
 phpBB/styles/prosilver/template/mcp_logs.html      |  4 ++--
 .../styles/prosilver/template/mcp_notes_user.html  |  4 ++--
 phpBB/styles/prosilver/template/mcp_queue.html     |  4 ++--
 phpBB/styles/prosilver/template/mcp_reports.html   |  4 ++--
 phpBB/styles/prosilver/template/mcp_whois.html     |  4 ++--
 .../styles/prosilver/template/memberlist_body.html |  4 ++--
 phpBB/styles/prosilver/template/message_body.html  |  2 +-
 .../styles/prosilver/template/search_results.html  | 10 ++++-----
 .../styles/prosilver/template/ucp_attachments.html |  4 ++--
 .../prosilver/template/ucp_pm_message_header.html  |  2 +-
 .../prosilver/template/ucp_pm_viewfolder.html      |  4 ++--
 .../prosilver/template/ucp_pm_viewmessage.html     |  8 ++++----
 .../styles/prosilver/template/viewforum_body.html  |  4 ++--
 .../styles/prosilver/template/viewonline_body.html |  2 +-
 .../styles/prosilver/template/viewtopic_body.html  |  4 ++--
 phpBB/styles/prosilver/theme/colours.css           | 14 ++++++-------
 phpBB/styles/prosilver/theme/links.css             | 24 +++++++++++-----------
 19 files changed, 57 insertions(+), 57 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
index 0060e83b15..ff234464dc 100644
--- a/phpBB/styles/prosilver/template/jumpbox.html
+++ b/phpBB/styles/prosilver/template/jumpbox.html
@@ -1,12 +1,12 @@
 
 <!-- IF S_VIEWTOPIC -->
-	<p></p><p><a href="{U_VIEW_FORUM}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {FORUM_NAME}</a></p>
+	<p></p><p><a href="{U_VIEW_FORUM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {FORUM_NAME}</a></p>
 <!-- ELSEIF S_VIEWFORUM -->
-	<p></p><p><a href="{U_INDEX}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {L_INDEX}</a></p>
+	<p></p><p><a href="{U_INDEX}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {L_INDEX}</a></p>
 <!-- ELSEIF SEARCH_TOPIC -->
-	<p></p><p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO}{L_COLON} {SEARCH_TOPIC}</a></p>
+	<p></p><p><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO}{L_COLON} {SEARCH_TOPIC}</a></p>
 <!-- ELSEIF S_SEARCH_ACTION -->
-	<p></p><p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_RETURN_TO_SEARCH_ADV}</a></p>
+	<p></p><p><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_RETURN_TO_SEARCH_ADV}</a></p>
 <!-- ENDIF -->
 
 <!-- IF S_DISPLAY_JUMPBOX -->
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index cd4ae69fe7..e559f178f2 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -80,8 +80,8 @@
 	<!-- ENDIF -->
 
 	<fieldset class="display-options">
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
+		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
+		<!-- IF PREVIOUS_PAGE --><a href="{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>
diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html
index 15974802bc..9e4a6f272e 100644
--- a/phpBB/styles/prosilver/template/mcp_logs.html
+++ b/phpBB/styles/prosilver/template/mcp_logs.html
@@ -54,8 +54,8 @@
 
 	<!-- IF .log -->
 		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
+			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
+			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
 			<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}</label>
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index c7c568657c..3bbbd10f12 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -95,8 +95,8 @@
 	<hr />
 
 	<fieldset class="display-options">
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
+		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
+		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
 		<label>{L_DISPLAY_LOG}{L_COLON} {S_SELECT_SORT_DAYS}</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" />
diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html
index dc8869713d..847151a01e 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -65,8 +65,8 @@
 		</ul>
 
 		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
+			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
+			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
 			<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}</label>
 			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html
index f9a0ec4bd6..ea9a4edd6f 100644
--- a/phpBB/styles/prosilver/template/mcp_reports.html
+++ b/phpBB/styles/prosilver/template/mcp_reports.html
@@ -68,8 +68,8 @@
 		</ul>
 
 		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
+			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
+			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
 			<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}</label>
 			<!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" />&nbsp; <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/mcp_whois.html b/phpBB/styles/prosilver/template/mcp_whois.html
index 88d3269a71..41a825458d 100644
--- a/phpBB/styles/prosilver/template/mcp_whois.html
+++ b/phpBB/styles/prosilver/template/mcp_whois.html
@@ -4,11 +4,11 @@
 <div class="panel">
 	<div class="inner">
 	
-		<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p>
+		<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p>
 		<div class="postbody"><div class="content">
 			<pre>{WHOIS}</pre>
 		</div></div>
-		<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p>
+		<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_RETURN_POST}">{L_RETURN_POST}</a></p>
 	
 	</div>
 </div>
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 273182ec3f..4ba0c5cb2a 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -143,8 +143,8 @@
 
 <!-- IF S_IN_SEARCH_POPUP and not S_SEARCH_USER -->
 <fieldset class="display-options">
-	<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-	<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
+	<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
+	<!-- IF NEXT_PAGE --><a href="{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>
 </fieldset>
diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html
index fb6dfce35f..a844246055 100644
--- a/phpBB/styles/prosilver/template/message_body.html
+++ b/phpBB/styles/prosilver/template/message_body.html
@@ -8,7 +8,7 @@
 	<div class="inner">
 	<h2>{MESSAGE_TITLE}</h2>
 	<p>{MESSAGE_TEXT}</p>
-	<!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV --><p><a href="{U_SEARCH}" class="{S_CONTENT_FLOW_BEGIN}">{L_RETURN_TO_SEARCH_ADV}</a></p><!-- ENDIF -->
+	<!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV --><p><a href="{U_SEARCH}" class="arrow-{S_CONTENT_FLOW_BEGIN}">{L_RETURN_TO_SEARCH_ADV}</a></p><!-- ENDIF -->
 	</div>
 </div>
 
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 136ca991b1..62b7c61eb3 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -6,9 +6,9 @@
 <!-- IF PHRASE_SEARCH_DISABLED --> <p><strong>{L_PHRASE_SEARCH_DISABLED}</strong></p><!-- ENDIF -->
 
 <!-- IF SEARCH_TOPIC -->
-	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO}{L_COLON} {SEARCH_TOPIC}</a></p>
+	<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO}{L_COLON} {SEARCH_TOPIC}</a></p>
 <!-- ELSE -->
-	<p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p>
+	<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p>
 <!-- ENDIF -->
 
 <!-- IF .pagination or SEARCH_MATCHES or PAGE_NUMBER -->
@@ -131,7 +131,7 @@
 
 	<!-- IF not searchresults.S_IGNORE_POST -->
 		<ul class="searchresults">
-			<li ><a href="{searchresults.U_VIEW_POST}" class="{S_CONTENT_FLOW_END}">{L_JUMP_TO_POST}</a></li>
+			<li ><a href="{searchresults.U_VIEW_POST}" class="arrow-{S_CONTENT_FLOW_END}">{L_JUMP_TO_POST}</a></li>
 		</ul>
 	<!-- ENDIF -->
 
@@ -150,8 +150,8 @@
 	<form method="post" action="{S_SEARCH_ACTION}">
 
 	<fieldset class="display-options">
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
+		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
+		<!-- IF NEXT_PAGE --><a href="{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>
diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html
index 8c93547388..478b14ab86 100644
--- a/phpBB/styles/prosilver/template/ucp_attachments.html
+++ b/phpBB/styles/prosilver/template/ucp_attachments.html
@@ -47,8 +47,8 @@
 		</ul>
 
 		<fieldset class="display-options">
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
+			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
+			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
 			<label for="sk">{L_SORT_BY}{L_COLON} <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label> 
 			<label><select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
 			<input class="button2" type="submit" name="sort" value="{L_SORT}" />
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index 29e6a5a46b..c47f93f739 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -18,7 +18,7 @@
 	<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
 	<ul class="linklist">
 		<li class="rightside pagination">
-			<!-- IF S_VIEW_MESSAGE --><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF -->
+			<!-- IF S_VIEW_MESSAGE --><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF -->
 			<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
 				<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES} &bull; <!-- ENDIF -->
 				<!-- IF .pagination -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index cb373dc5b6..96668284eb 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -119,8 +119,8 @@
 
 	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
 	<fieldset class="display-options">
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
+		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
+		<!-- IF NEXT_PAGE --><a href="{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>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index c456be1090..22149c8b80 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -8,8 +8,8 @@
 
 <!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) -->
 	<fieldset class="display-options clearfix">
-		<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
-		<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
+		<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
+		<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
 	</fieldset>
 <!-- ENDIF -->
 
@@ -113,8 +113,8 @@
 
 <!-- IF S_VIEW_MESSAGE -->
 <fieldset class="display-options">
-	<!-- IF U_PREVIOUS_PM --><a href="{U_PREVIOUS_PM}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_PM}</a><!-- ENDIF -->
-	<!-- IF U_NEXT_PM --><a href="{U_NEXT_PM}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_PM}</a><!-- ENDIF -->
+	<!-- IF U_PREVIOUS_PM --><a href="{U_PREVIOUS_PM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_PM}</a><!-- ENDIF -->
+	<!-- IF U_NEXT_PM --><a href="{U_NEXT_PM}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_VIEW_NEXT_PM}</a><!-- ENDIF -->
 
 	<!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label>&nbsp;<input class="button2" type="submit" name="submit_mark" value="{L_GO}" /><!-- ENDIF -->
 	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}{L_COLON} <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 0a818e725b..a3239602ae 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -189,8 +189,8 @@
 <!-- IF S_SELECT_SORT_DAYS and not S_DISPLAY_ACTIVE -->
 	<form method="post" action="{S_FORUM_ACTION}">
 		<fieldset class="display-options">
-			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
+			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
+			<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
 	<!-- 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>
diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html
index 7ae1b6bc58..cb19a40d8f 100644
--- a/phpBB/styles/prosilver/template/viewonline_body.html
+++ b/phpBB/styles/prosilver/template/viewonline_body.html
@@ -49,7 +49,7 @@
 
 <!-- IF PREVIOUS_PAGE or NEXT_PAGE -->
 <fieldset class="display-options right-box">
-	<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ELSE -->{L_PREVIOUS}<!-- ENDIF --> &bull; <!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ELSE -->{L_NEXT}<!-- ENDIF -->
+	<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ELSE -->{L_PREVIOUS}<!-- ENDIF --> &bull; <!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="arrow-{S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ELSE -->{L_NEXT}<!-- ENDIF -->
 </fieldset>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 9455d10f72..1b7d78e063 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -249,8 +249,8 @@
 	<form id="viewtopic" method="post" action="{S_TOPIC_ACTION}">
 
 	<fieldset class="display-options" style="margin-top: 0; ">
-		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
-		<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
+		<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
+		<!-- IF NEXT_PAGE --><a href="{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>
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index d7ce9a7622..a5a18dc6a1 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -331,20 +331,20 @@ a.top2 {
 }
 
 /* Arrow links  */
-a.up		{ background-image: url("./images/arrow_up.gif") }
-a.down		{ background-image: url("./images/arrow_down.gif") }
-a.left		{ background-image: url("./images/arrow_left.gif") }
-a.right		{ background-image: url("./images/arrow_right.gif") }
+a.arrow-up			{ background-image: url("./images/arrow_up.gif") }
+a.arrow-down		{ background-image: url("./images/arrow_down.gif") }
+a.arrow-left		{ background-image: url("./images/arrow_left.gif") }
+a.arrow-right		{ background-image: url("./images/arrow_right.gif") }
 
-a.up:hover {
+a.arrow-up:hover {
 	background-color: transparent;
 }
 
-a.left:hover {
+a.arrow-left:hover {
 	color: #368AD2;
 }
 
-a.right:hover {
+a.arrow-right:hover {
 	color: #368AD2;
 }
 
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 66c3aed03e..5dc8a13313 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -145,44 +145,44 @@ a.top2 {
 }
 
 /* Arrow links  */
-a.up		{ background: none no-repeat left center; }
-a.down		{ background: none no-repeat right center; }
-a.left		{ background: none no-repeat 3px 60%; }
-a.right		{ background: none no-repeat 95% 60%; }
+a.arrow-up		{ background: none no-repeat left center; }
+a.arrow-down		{ background: none no-repeat right center; }
+a.arrow-left		{ background: none no-repeat 3px 60%; }
+a.arrow-right		{ background: none no-repeat 95% 60%; }
 
-a.up, a.up:link, a.up:active, a.up:visited {
+a.arrow-up, a.arrow-up:link, a.arrow-up:active, a.arrow-up:visited {
 	padding-left: 10px;
 	text-decoration: none;
 	border-bottom-width: 0;
 }
 
-a.up:hover {
+a.arrow-up:hover {
 	background-position: left top;
 }
 
-a.down, a.down:link, a.down:active, a.down:visited {
+a.arrow-down, a.arrow-down:link, a.arrow-down:active, a.arrow-down:visited {
 	padding-right: 10px;
 }
 
-a.down:hover {
+a.arrow-down:hover {
 	background-position: right bottom;
 	text-decoration: none;
 }
 
-a.left, a.left:active, a.left:visited {
+a.arrow-left, a.arrow-left:active, a.arrow-left:visited {
 	padding-left: 12px;
 }
 
-a.left:hover {
+a.arrow-left:hover {
 	text-decoration: none;
 	background-position: 0 60%;
 }
 
-a.right, a.right:active, a.right:visited {
+a.arrow-right, a.arrow-right:active, a.arrow-right:visited {
 	padding-right: 12px;
 }
 
-a.right:hover {
+a.arrow-right:hover {
 	text-decoration: none;
 	background-position: 100% 60%;
 }
-- 
cgit v1.2.1


From 83e85810aa7b04b992c8c24ec8b2eac700c4594e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 6 Nov 2012 14:28:46 -0500
Subject: [ticket/11095] Use get method in jumpboxes.

PHPBB3-11095
---
 phpBB/styles/prosilver/template/jumpbox.html      | 2 +-
 phpBB/styles/subsilver2/template/jumpbox.html     | 2 +-
 phpBB/styles/subsilver2/template/mcp_jumpbox.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
index ff234464dc..562c115495 100644
--- a/phpBB/styles/prosilver/template/jumpbox.html
+++ b/phpBB/styles/prosilver/template/jumpbox.html
@@ -10,7 +10,7 @@
 <!-- ENDIF -->
 
 <!-- IF S_DISPLAY_JUMPBOX -->
-	<form method="post" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(this.f.value == -1){return false;}">
+	<form method="get" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(this.f.value == -1){return false;}">
 
 	<!-- IF $CUSTOM_FIELDSET_CLASS -->
 		<fieldset class="{$CUSTOM_FIELDSET_CLASS}">
diff --git a/phpBB/styles/subsilver2/template/jumpbox.html b/phpBB/styles/subsilver2/template/jumpbox.html
index f4153d7692..0a11524813 100644
--- a/phpBB/styles/subsilver2/template/jumpbox.html
+++ b/phpBB/styles/subsilver2/template/jumpbox.html
@@ -1,6 +1,6 @@
 
 <!-- IF S_DISPLAY_JUMPBOX -->
-	<form method="post" name="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(document.jumpbox.f.value == -1){return false;}">
+	<form method="get" name="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(document.jumpbox.f.value == -1){return false;}">
 
 	<table cellspacing="0" cellpadding="0" border="0">
 	<tr>
diff --git a/phpBB/styles/subsilver2/template/mcp_jumpbox.html b/phpBB/styles/subsilver2/template/mcp_jumpbox.html
index 734222bc77..0e3433e3d6 100644
--- a/phpBB/styles/subsilver2/template/mcp_jumpbox.html
+++ b/phpBB/styles/subsilver2/template/mcp_jumpbox.html
@@ -1,6 +1,6 @@
 <!-- Note: no longer in use... -->
 
-<form name="jumpbox" method="post" action="{S_JUMPBOX_ACTION}">
+<form name="jumpbox" method="get" action="{S_JUMPBOX_ACTION}">
 
 	<span class="gensmall">{L_JUMP_TO}{L_COLON}</span>&nbsp;<select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.jumpbox.current_f.value){ document.forms['jumpbox'].submit() }">
 
-- 
cgit v1.2.1


From 2a39df1a53ae4d9798bcba9ceee610190702cc4b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 29 Nov 2012 13:36:00 -0500
Subject: [ticket/11095] Forward GET parameters into hidden fields for jumpbox.

PHPBB3-11095
---
 phpBB/styles/prosilver/template/jumpbox.html      | 1 +
 phpBB/styles/subsilver2/template/jumpbox.html     | 2 +-
 phpBB/styles/subsilver2/template/mcp_jumpbox.html | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
index 562c115495..dd793fbadc 100644
--- a/phpBB/styles/prosilver/template/jumpbox.html
+++ b/phpBB/styles/prosilver/template/jumpbox.html
@@ -17,6 +17,7 @@
 	<!-- ELSE -->
 		<fieldset class="jumpbox">
 	<!-- ENDIF -->
+			{HIDDEN_FIELDS_FOR_JUMPBOX}
 			<label for="f" accesskey="j"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->{L_COLON}</label>
 			<select name="f" id="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">
 			<!-- BEGIN jumpbox_forums -->
diff --git a/phpBB/styles/subsilver2/template/jumpbox.html b/phpBB/styles/subsilver2/template/jumpbox.html
index 0a11524813..e0603c6a6e 100644
--- a/phpBB/styles/subsilver2/template/jumpbox.html
+++ b/phpBB/styles/subsilver2/template/jumpbox.html
@@ -4,7 +4,7 @@
 
 	<table cellspacing="0" cellpadding="0" border="0">
 	<tr>
-		<td nowrap="nowrap"><span class="gensmall"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->{L_COLON}</span>&nbsp;<select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">
+		<td nowrap="nowrap">{HIDDEN_FIELDS_FOR_JUMPBOX}<span class="gensmall"><!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->{L_COLON}</span>&nbsp;<select name="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.forms['jumpbox'].submit() }">
 
 		<!-- BEGIN jumpbox_forums -->
 			<!-- IF jumpbox_forums.S_FORUM_COUNT eq 1 --><option value="-1">------------------</option><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/mcp_jumpbox.html b/phpBB/styles/subsilver2/template/mcp_jumpbox.html
index 0e3433e3d6..e6ef4ecdad 100644
--- a/phpBB/styles/subsilver2/template/mcp_jumpbox.html
+++ b/phpBB/styles/subsilver2/template/mcp_jumpbox.html
@@ -2,6 +2,7 @@
 
 <form name="jumpbox" method="get" action="{S_JUMPBOX_ACTION}">
 
+	{HIDDEN_FIELDS_FOR_JUMPBOX}
 	<span class="gensmall">{L_JUMP_TO}{L_COLON}</span>&nbsp;<select name="f" onChange="if(this.options[this.selectedIndex].value != -1 && this.options[this.selectedIndex].value != document.jumpbox.current_f.value){ document.forms['jumpbox'].submit() }">
 
 <!-- IF S_ENABLE_SELECT_ALL -->
-- 
cgit v1.2.1


From af064cdaad357f705fc7c80f4d018d57cffa8d33 Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Wed, 16 May 2012 23:02:20 +0200
Subject: [ticket/10841] Modifying style and language selectors in UCP

Commit also deletes all unnecessary blank spaces at
the end of the lines in both ucp_prefs_personal.html

PHPBB3-10841
---
 .../prosilver/template/ucp_prefs_personal.html     | 42 +++++++++++-----------
 .../subsilver2/template/ucp_prefs_personal.html    | 18 +++++-----
 2 files changed, 32 insertions(+), 28 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index 9022346627..416343e57d 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -12,21 +12,21 @@
 	<dl>
 		<dt><label for="viewemail0">{L_SHOW_EMAIL}:</label></dt>
 		<dd>
-			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label for="viewemail0"><input type="radio" name="viewemail" id="viewemail0" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="massemail1">{L_ADMIN_EMAIL}:</label></dt>
 		<dd>
-			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label for="massemail0"><input type="radio" name="massemail" id="massemail0" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="allowpm1">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
 		<dd>
-			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label for="allowpm0"><input type="radio" name="allowpm" id="allowpm0" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
@@ -34,17 +34,17 @@
 		<dl>
 			<dt><label for="hideonline0">{L_HIDE_ONLINE}:</label><br /><span>{L_HIDE_ONLINE_EXPLAIN}</span></dt>
 			<dd>
-				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
-	<!-- ENDIF -->		
+	<!-- ENDIF -->
 	<!-- IF S_SELECT_NOTIFY -->
 		<dl>
 			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}:</label></dt>
 			<dd>
-				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label> 
-				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label> 
+				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
+				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
 				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label>
 			</dd>
 		</dl>
@@ -52,22 +52,24 @@
 	<dl>
 		<dt><label for="notifypm1">{L_NOTIFY_ON_PM}:</label></dt>
 		<dd>
-			<label for="notifypm1"><input type="radio" name="notifypm" id="notifypm1" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+			<label for="notifypm1"><input type="radio" name="notifypm" id="notifypm1" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label for="notifypm0"><input type="radio" name="notifypm" id="notifypm0" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="popuppm0">{L_POPUP_ON_PM}:</label></dt>
 		<dd>
-			<label for="popuppm1"><input type="radio" name="popuppm" id="popuppm1" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+			<label for="popuppm1"><input type="radio" name="popuppm" id="popuppm1" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label for="popuppm0"><input type="radio" name="popuppm" id="popuppm0" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
-	<dl>
-		<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
-		<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>
-	</dl>
-	<!-- IF S_STYLE_OPTIONS -->
+	<!-- IF S_MORE_LANGUAGES -->
+		<dl>
+			<dt><label for="lang">{L_BOARD_LANGUAGE}:</label></dt>
+			<dd><select name="lang" id="lang">{S_LANG_OPTIONS}</select></dd>
+		</dl>
+	<!-- ENDIF -->
+	<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->
 		<dl>
 			<dt><label for="style">{L_BOARD_STYLE}:</label></dt>
 			<dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd>
@@ -80,7 +82,7 @@
 	<dl>
 		<dt><label for="dst1">{L_BOARD_DST}:</label></dt>
 		<dd>
-			<label for="dst1"><input type="radio" name="dst" id="dst1" value="1"<!-- IF S_DST --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
+			<label for="dst1"><input type="radio" name="dst" id="dst1" value="1"<!-- IF S_DST --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
 			<label for="dst0"><input type="radio" name="dst" id="dst0" value="0"<!-- IF not S_DST --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
@@ -97,9 +99,9 @@
 
 	<span class="corners-bottom"><span></span></span></div>
 </div>
-	
+
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
 	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
@@ -113,9 +115,9 @@
 	function customDates()
 	{
 		var e = document.getElementById('dateoptions');
-	
+
 		e.selectedIndex = e.length - 1;
-	
+
 		// Loop and match date_format in menu
 		for (var i = 0; i < e.length; i++)
 		{
@@ -125,7 +127,7 @@
 				break;
 			}
 		}
-	
+
 		// Show/hide custom field
 		if (e.selectedIndex == e.length - 1)
 		{
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
index e2266b7d38..c604671c5c 100644
--- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
@@ -29,43 +29,45 @@
 		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
-<tr> 
+<tr>
 	<td class="row1" width="50%"><b class="genmed">{L_SHOW_EMAIL}:</b></td>
 	<td class="row2"><input type="radio" class="radio" name="viewemail" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="viewemail" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="50%"><b class="genmed">{L_ADMIN_EMAIL}:</b></td>
 	<td class="row2"><input type="radio" class="radio" name="massemail" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="massemail" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="50%"><b class="genmed">{L_ALLOW_PM}:</b><br /><span class="gensmall">{L_ALLOW_PM_EXPLAIN}</span></td>
 	<td class="row2"><input type="radio" class="radio" name="allowpm" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="allowpm" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 </tr>
 <!-- IF S_CAN_HIDE_ONLINE -->
-	<tr> 
+	<tr>
 		<td class="row1" width="50%"><b class="genmed">{L_HIDE_ONLINE}:</b><br /><span class="gensmall">{L_HIDE_ONLINE_EXPLAIN}</span></td>
 		<td class="row2"><input type="radio" class="radio" name="hideonline" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="hideonline" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 	</tr>
 <!-- ENDIF -->
 <!-- IF S_SELECT_NOTIFY -->
-	<tr> 
+	<tr>
 		<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_METHOD}:</b><br /><span class="gensmall">{L_NOTIFY_METHOD_EXPLAIN}</span></td>
 		<td class="row2"><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_EMAIL}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifymethod" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_IM}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifymethod" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_BOTH}</span></td>
 	</tr>
 <!-- ENDIF -->
-<tr> 
+<tr>
 	<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_ON_PM}:</b></td>
 	<td class="row2"><input type="radio" class="radio" name="notifypm" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifypm" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 </tr>
-<tr> 
+<tr>
 	<td class="row1" width="50%"><b class="genmed">{L_POPUP_ON_PM}:</b></td>
 	<td class="row2"><input type="radio" class="radio" name="popuppm" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="popuppm" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 </tr>
+<!-- IF S_MORE_LANGUAGES -->
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_BOARD_LANGUAGE}:</b></td>
 	<td class="row2"><select name="lang">{S_LANG_OPTIONS}</select></td>
 </tr>
-<!-- IF S_STYLE_OPTIONS -->
+<!-- ENDIF -->
+<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_BOARD_STYLE}:</b></td>
 	<td class="row2"><select name="style">{S_STYLE_OPTIONS}</select></td>
-- 
cgit v1.2.1


From 0793f8e2e60453db8de1ff8e231a36b2c9024f3d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 5 Dec 2012 11:54:49 -0500
Subject: [ticket/10841] Revert whitespace changes.

PHPBB3-10841
---
 .../prosilver/template/ucp_prefs_personal.html     | 26 +++++++++++-----------
 .../subsilver2/template/ucp_prefs_personal.html    | 14 ++++++------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index 416343e57d..01e0c9ba28 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -12,21 +12,21 @@
 	<dl>
 		<dt><label for="viewemail0">{L_SHOW_EMAIL}:</label></dt>
 		<dd>
-			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label for="viewemail1"><input type="radio" name="viewemail" id="viewemail1" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="viewemail0"><input type="radio" name="viewemail" id="viewemail0" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="massemail1">{L_ADMIN_EMAIL}:</label></dt>
 		<dd>
-			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label for="massemail1"><input type="radio" name="massemail" id="massemail1" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="massemail0"><input type="radio" name="massemail" id="massemail0" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="allowpm1">{L_ALLOW_PM}:</label><br /><span>{L_ALLOW_PM_EXPLAIN}</span></dt>
 		<dd>
-			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label for="allowpm1"><input type="radio" name="allowpm" id="allowpm1" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="allowpm0"><input type="radio" name="allowpm" id="allowpm0" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
@@ -34,17 +34,17 @@
 		<dl>
 			<dt><label for="hideonline0">{L_HIDE_ONLINE}:</label><br /><span>{L_HIDE_ONLINE_EXPLAIN}</span></dt>
 			<dd>
-				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+				<label for="hideonline1"><input type="radio" name="hideonline" id="hideonline1" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 				<label for="hideonline0"><input type="radio" name="hideonline" id="hideonline0" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 			</dd>
 		</dl>
-	<!-- ENDIF -->
+	<!-- ENDIF -->		
 	<!-- IF S_SELECT_NOTIFY -->
 		<dl>
 			<dt><label for="notifymethod0">{L_NOTIFY_METHOD}:</label></dt>
 			<dd>
-				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label>
-				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label>
+				<label for="notifymethod0"><input type="radio" name="notifymethod" id="notifymethod0" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_EMAIL}</label> 
+				<label for="notifymethod1"><input type="radio" name="notifymethod" id="notifymethod1" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_IM}</label> 
 				<label for="notifymethod2"><input type="radio" name="notifymethod" id="notifymethod2" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /> {L_NOTIFY_METHOD_BOTH}</label>
 			</dd>
 		</dl>
@@ -82,7 +82,7 @@
 	<dl>
 		<dt><label for="dst1">{L_BOARD_DST}:</label></dt>
 		<dd>
-			<label for="dst1"><input type="radio" name="dst" id="dst1" value="1"<!-- IF S_DST --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label for="dst1"><input type="radio" name="dst" id="dst1" value="1"<!-- IF S_DST --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="dst0"><input type="radio" name="dst" id="dst0" value="0"<!-- IF not S_DST --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
@@ -99,9 +99,9 @@
 
 	<span class="corners-bottom"><span></span></span></div>
 </div>
-
+	
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp; 
 	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
 	{S_FORM_TOKEN}
 </fieldset>
@@ -115,9 +115,9 @@
 	function customDates()
 	{
 		var e = document.getElementById('dateoptions');
-
+	
 		e.selectedIndex = e.length - 1;
-
+	
 		// Loop and match date_format in menu
 		for (var i = 0; i < e.length; i++)
 		{
@@ -127,7 +127,7 @@
 				break;
 			}
 		}
-
+	
 		// Show/hide custom field
 		if (e.selectedIndex == e.length - 1)
 		{
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
index c604671c5c..4cd0f37a80 100644
--- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
@@ -29,35 +29,35 @@
 		<td class="row3" colspan="2" align="center"><span class="gensmall error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
-<tr>
+<tr> 
 	<td class="row1" width="50%"><b class="genmed">{L_SHOW_EMAIL}:</b></td>
 	<td class="row2"><input type="radio" class="radio" name="viewemail" value="1"<!-- IF S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="viewemail" value="0"<!-- IF not S_VIEW_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 </tr>
-<tr>
+<tr> 
 	<td class="row1" width="50%"><b class="genmed">{L_ADMIN_EMAIL}:</b></td>
 	<td class="row2"><input type="radio" class="radio" name="massemail" value="1"<!-- IF S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="massemail" value="0"<!-- IF not S_MASS_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 </tr>
-<tr>
+<tr> 
 	<td class="row1" width="50%"><b class="genmed">{L_ALLOW_PM}:</b><br /><span class="gensmall">{L_ALLOW_PM_EXPLAIN}</span></td>
 	<td class="row2"><input type="radio" class="radio" name="allowpm" value="1"<!-- IF S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="allowpm" value="0"<!-- IF not S_ALLOW_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 </tr>
 <!-- IF S_CAN_HIDE_ONLINE -->
-	<tr>
+	<tr> 
 		<td class="row1" width="50%"><b class="genmed">{L_HIDE_ONLINE}:</b><br /><span class="gensmall">{L_HIDE_ONLINE_EXPLAIN}</span></td>
 		<td class="row2"><input type="radio" class="radio" name="hideonline" value="1"<!-- IF S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="hideonline" value="0"<!-- IF not S_HIDE_ONLINE --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 	</tr>
 <!-- ENDIF -->
 <!-- IF S_SELECT_NOTIFY -->
-	<tr>
+	<tr> 
 		<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_METHOD}:</b><br /><span class="gensmall">{L_NOTIFY_METHOD_EXPLAIN}</span></td>
 		<td class="row2"><input type="radio" class="radio" name="notifymethod" value="0"<!-- IF S_NOTIFY_EMAIL --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_EMAIL}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifymethod" value="1"<!-- IF S_NOTIFY_IM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_IM}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifymethod" value="2"<!-- IF S_NOTIFY_BOTH --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NOTIFY_METHOD_BOTH}</span></td>
 	</tr>
 <!-- ENDIF -->
-<tr>
+<tr> 
 	<td class="row1" width="50%"><b class="genmed">{L_NOTIFY_ON_PM}:</b></td>
 	<td class="row2"><input type="radio" class="radio" name="notifypm" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="notifypm" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 </tr>
-<tr>
+<tr> 
 	<td class="row1" width="50%"><b class="genmed">{L_POPUP_ON_PM}:</b></td>
 	<td class="row2"><input type="radio" class="radio" name="popuppm" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" class="radio" name="popuppm" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /><span class="genmed">{L_NO}</span></td>
 </tr>
-- 
cgit v1.2.1


From a8e74f5292aaa74e2035dd5f3ab972f0201a1fe7 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 5 Dec 2012 12:02:30 -0500
Subject: [ticket/10841] Revert more whitespace changes.

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index 01e0c9ba28..600319fc72 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -52,14 +52,14 @@
 	<dl>
 		<dt><label for="notifypm1">{L_NOTIFY_ON_PM}:</label></dt>
 		<dd>
-			<label for="notifypm1"><input type="radio" name="notifypm" id="notifypm1" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label for="notifypm1"><input type="radio" name="notifypm" id="notifypm1" value="1"<!-- IF S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="notifypm0"><input type="radio" name="notifypm" id="notifypm0" value="0"<!-- IF not S_NOTIFY_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
 	<dl>
 		<dt><label for="popuppm0">{L_POPUP_ON_PM}:</label></dt>
 		<dd>
-			<label for="popuppm1"><input type="radio" name="popuppm" id="popuppm1" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label for="popuppm1"><input type="radio" name="popuppm" id="popuppm1" value="1"<!-- IF S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_YES}</label> 
 			<label for="popuppm0"><input type="radio" name="popuppm" id="popuppm0" value="0"<!-- IF not S_POPUP_PM --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
 		</dd>
 	</dl>
-- 
cgit v1.2.1


From 7ce009f2e29045b2bd29dd670c900b79f7f3bd70 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 12 Dec 2012 12:46:20 +0100
Subject: [ticket/10954] Mark forums read without popup or page refresh

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js             | 16 ++++++++++++++++
 phpBB/styles/prosilver/template/index_body.html     |  2 +-
 phpBB/styles/prosilver/template/viewforum_body.html |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index fa31d3268f..4ae4f91d8d 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -2,6 +2,22 @@
 
 "use strict";
 
+// This callback will mark all forum icons read
+phpbb.add_ajax_callback('mark_forums_read', function(res) {
+	var read_title = res.NO_UNREAD_POSTS;
+	var unread_title = res.UNREAD_POSTS;
+
+	$('li.row dl.forum_unread').each(function(e) {
+		$(this).removeClass('forum_unread').addClass('forum_read');
+		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+	});
+
+	$('li.row dl.forum_unread_subforum').each(function(e) {
+		$(this).removeClass('forum_unread_subforum').addClass('forum_read_subforum');
+		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+	});
+});
+
 // This callback finds the post from the delete link, and removes it.
 phpbb.add_ajax_callback('post_delete', function() {
 	var el = $(this),
diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index 6babbf5997..0682abffed 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -8,7 +8,7 @@
 	<!-- IF S_DISPLAY_SEARCH -->
 		<li><a href="{U_SEARCH_UNANSWERED}">{L_SEARCH_UNANSWERED}</a><!-- IF S_LOAD_UNREADS --> &bull; <a href="{U_SEARCH_UNREAD}">{L_SEARCH_UNREAD}</a><!-- ENDIF --><!-- IF S_USER_LOGGED_IN --> &bull; <a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a><!-- ENDIF --> &bull; <a href="{U_SEARCH_ACTIVE_TOPICS}">{L_SEARCH_ACTIVE_TOPICS}</a></li>
 	<!-- ENDIF -->
-	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m" data-ajax="true">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
+	<!-- IF not S_IS_BOT and U_MARK_FORUMS --><li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m" data-ajax="mark_forums_read" data-overlay="false">{L_MARK_FORUMS_READ}</a></li><!-- ENDIF -->
 </ul>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index a3239602ae..0f2c1a30ec 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -28,7 +28,7 @@
 <!-- IF S_HAS_SUBFORUM -->
 <!-- IF not S_IS_BOT and U_MARK_FORUMS -->
 <ul class="linklist">
-	<li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_SUBFORUMS_READ}</a></li>
+	<li class="rightside"><a href="{U_MARK_FORUMS}" data-ajax="mark_forums_read" data-overlay="false">{L_MARK_SUBFORUMS_READ}</a></li>
 </ul>
 <!-- ENDIF -->
 	<!-- INCLUDE forumlist_body.html -->
-- 
cgit v1.2.1


From a57c81481d21433bdb185accfd7f2b82858ba461 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 12 Dec 2012 18:38:17 +0100
Subject: [ticket/10954] Mark topics read without popup

Also added missing handling of locked forums.

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js            | 37 ++++++++++++++++++++++
 .../styles/prosilver/template/viewforum_body.html  |  4 +--
 2 files changed, 39 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 4ae4f91d8d..7752c00367 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -16,6 +16,43 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 		$(this).removeClass('forum_unread_subforum').addClass('forum_read_subforum');
 		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
+
+	$('li.row dl.forum_unread_locked').each(function(e) {
+		$(this).removeClass('forum_unread_locked').addClass('forum_read_locked');
+		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+	});
+});
+
+// This callback will mark all topic icons read
+phpbb.add_ajax_callback('mark_topics_read', function(res) {
+	var i,j;
+	var read_title = res.NO_UNREAD_POSTS;
+	var unread_title = res.UNREAD_POSTS;
+	var icons_array = [
+		['global_unread', 'global_read'],
+		['announce_unread', 'announce_read'],
+		['sticky_unread', 'sticky_read'],
+		['topic_unread', 'topic_read']
+	];
+
+	var icons_state = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
+
+	// Make sure all icons are marked as read
+	for (i = 0; i < icons_array.length; i++)
+	{
+		for (j = 0; j < icons_state.length; j++)
+		{
+			$('li.row dl.' + icons_array[i][0] + icons_state[j]).each(function(e) {
+				$(this).removeClass(icons_array[i][0] + icons_state[j]).addClass(icons_array[i][1] + icons_state[j]);
+				$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+			});
+		}
+	}
+
+	// Remove link to first unread post
+	$('span.icon_topic_newest').each(function(e) {
+		$(this).remove();
+	});
 });
 
 // This callback finds the post from the delete link, and removes it.
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 0f2c1a30ec..b47c13d573 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -57,7 +57,7 @@
 
 	<!-- 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="true">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
+			<!-- 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 -->
@@ -211,7 +211,7 @@
 
 		<!-- 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}">{L_MARK_TOPICS_READ}</a> &bull;  <!-- ENDIF -->
+			<!-- 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 .pagination -->
-- 
cgit v1.2.1


From a3f18caacc5f7c0392097099fff5189a7dfe63ce Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 13 Dec 2012 17:46:48 +0100
Subject: [ticket/10954] Only call $(this) once and reduce number of DOM
 traversals

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 7752c00367..97b77f6217 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -6,26 +6,30 @@
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
+	var current_object;
 
 	$('li.row dl.forum_unread').each(function(e) {
-		$(this).removeClass('forum_unread').addClass('forum_read');
-		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+		current_object = $(this);
+		current_object.removeClass('forum_unread').addClass('forum_read');
+		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 
 	$('li.row dl.forum_unread_subforum').each(function(e) {
-		$(this).removeClass('forum_unread_subforum').addClass('forum_read_subforum');
-		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+		current_object = $(this);
+		current_object.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
+		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 
 	$('li.row dl.forum_unread_locked').each(function(e) {
-		$(this).removeClass('forum_unread_locked').addClass('forum_read_locked');
-		$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+		current_object = $(this);
+		current_object.removeClass('forum_unread_locked').addClass('forum_read_locked');
+		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 });
 
 // This callback will mark all topic icons read
 phpbb.add_ajax_callback('mark_topics_read', function(res) {
-	var i,j;
+	var i,j, current_object;
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
 	var icons_array = [
@@ -42,9 +46,16 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	{
 		for (j = 0; j < icons_state.length; j++)
 		{
+			// Only topics can be hot
+			if ((icons_state[j] == '_hot' || icons_state[j] == '_hot_mine') && icons_array[i][0] != 'topic_unread')
+			{
+				continue;
+			}
+
 			$('li.row dl.' + icons_array[i][0] + icons_state[j]).each(function(e) {
-				$(this).removeClass(icons_array[i][0] + icons_state[j]).addClass(icons_array[i][1] + icons_state[j]);
-				$(this).children('dt[title=' + unread_title + ']').attr('title', read_title);
+				current_object = $(this);
+				current_object.removeClass(icons_array[i][0] + icons_state[j]).addClass(icons_array[i][1] + icons_state[j]);
+				current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 			});
 		}
 	}
-- 
cgit v1.2.1


From 5919407a1d183412ce02f6ceee62435f6effd499 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 13 Dec 2012 20:43:38 +0100
Subject: [ticket/10954] Fix scope of current_object

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 97b77f6217..b406d7518d 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -6,22 +6,21 @@
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
-	var current_object;
 
 	$('li.row dl.forum_unread').each(function(e) {
-		current_object = $(this);
+		var current_object = $(this);
 		current_object.removeClass('forum_unread').addClass('forum_read');
 		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 
 	$('li.row dl.forum_unread_subforum').each(function(e) {
-		current_object = $(this);
+		var current_object = $(this);
 		current_object.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
 		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 
 	$('li.row dl.forum_unread_locked').each(function(e) {
-		current_object = $(this);
+		var current_object = $(this);
 		current_object.removeClass('forum_unread_locked').addClass('forum_read_locked');
 		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
@@ -29,7 +28,7 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 
 // This callback will mark all topic icons read
 phpbb.add_ajax_callback('mark_topics_read', function(res) {
-	var i,j, current_object;
+	var i,j;
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
 	var icons_array = [
@@ -53,7 +52,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 			}
 
 			$('li.row dl.' + icons_array[i][0] + icons_state[j]).each(function(e) {
-				current_object = $(this);
+				var current_object = $(this);
 				current_object.removeClass(icons_array[i][0] + icons_state[j]).addClass(icons_array[i][1] + icons_state[j]);
 				current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 			});
-- 
cgit v1.2.1


From 16c021e98667fe353e6b3a6cb0bbf3b8f2319f98 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 14 Dec 2012 15:46:45 +0100
Subject: [ticket/10954] Change behavior of marking topics/forums

It will now display a popup message for 3 seconds which will confirm the
taken action. The amount of DOM traversals have been significantly reduced
and jQuery.each is now used instead of for loops. Additionally, it is now
possible to click on the mark topics/forums read links without triggering
an AJAX error.

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 98 +++++++++++++++++++++------------
 1 file changed, 64 insertions(+), 34 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index b406d7518d..6d700f1b91 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -7,62 +7,92 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
 
-	$('li.row dl.forum_unread').each(function(e) {
+	$('li.row').find('dl.forum_unread, dl.forum_unread_subforum, dl.forum_unread_locked').each(function() {
 		var current_object = $(this);
-		current_object.removeClass('forum_unread').addClass('forum_read');
-		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
-	});
 
-	$('li.row dl.forum_unread_subforum').each(function(e) {
-		var current_object = $(this);
-		current_object.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
+		if (current_object.hasClass('forum_unread'))
+		{
+			current_object.removeClass('forum_unread').addClass('forum_read');
+		}
+		else if (current_object.hasClass('forum_unread_subforum'))
+		{
+			current_object.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
+		}
+		else
+		{
+			current_object.removeClass('forum_unread_locked').addClass('forum_read_locked');
+		}
 		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
 	});
 
-	$('li.row dl.forum_unread_locked').each(function(e) {
-		var current_object = $(this);
-		current_object.removeClass('forum_unread_locked').addClass('forum_read_locked');
-		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
+	// Update mark forums read links
+	$('[data-ajax=mark_forums_read]').each(function() {
+		$(this).attr('href', res.U_MARK_FORUMS);
 	});
+
+	// Hide alert after 3 seconds
+	setTimeout(function () {
+		$('#darkenwrapper').trigger('click');
+	}, 3000);
 });
 
 // This callback will mark all topic icons read
 phpbb.add_ajax_callback('mark_topics_read', function(res) {
-	var i,j;
 	var read_title = res.NO_UNREAD_POSTS;
 	var unread_title = res.UNREAD_POSTS;
-	var icons_array = [
-		['global_unread', 'global_read'],
-		['announce_unread', 'announce_read'],
-		['sticky_unread', 'sticky_read'],
-		['topic_unread', 'topic_read']
-	];
-
+	var icons_array = {
+		'global_unread': 'global_read',
+		'announce_unread': 'announce_read',
+		'sticky_unread': 'sticky_read',
+		'topic_unread': 'topic_read'
+	};
 	var icons_state = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
+	var unread_class_selectors = '';
+	var class_array = {};
 
-	// Make sure all icons are marked as read
-	for (i = 0; i < icons_array.length; i++)
-	{
-		for (j = 0; j < icons_state.length; j++)
-		{
+	$.each(icons_array, function(unread_class, read_class) {
+		$.each(icons_state, function(key, value) {
 			// Only topics can be hot
-			if ((icons_state[j] == '_hot' || icons_state[j] == '_hot_mine') && icons_array[i][0] != 'topic_unread')
+			if ((value == '_hot' || value == '_hot_mine') && unread_class != 'topic_unread')
 			{
-				continue;
+				return true;
 			}
+			var current_class = {};
+			current_class[unread_class + value] = read_class + value;
+			$.extend(class_array, current_class);
 
-			$('li.row dl.' + icons_array[i][0] + icons_state[j]).each(function(e) {
-				var current_object = $(this);
-				current_object.removeClass(icons_array[i][0] + icons_state[j]).addClass(icons_array[i][1] + icons_state[j]);
-				current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
-			});
-		}
-	}
+			unread_class_selectors += '.' + unread_class + value + ',';
+		});
+	});
+
+	// Remove trailing comma
+	unread_class_selectors = unread_class_selectors.substring(0, unread_class_selectors.length - 1);
+
+	$('li.row').find(unread_class_selectors).each(function() {
+		var current_object = $(this);
+		$.each(class_array, function(unread_class, read_class) {
+			if (current_object.hasClass(unread_class))
+			{
+				current_object.removeClass(unread_class).addClass(read_class);
+			}
+		});
+		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
+	});
 
 	// Remove link to first unread post
-	$('span.icon_topic_newest').each(function(e) {
+	$('span.icon_topic_newest').each(function() {
 		$(this).remove();
 	});
+
+	// Update mark topics read links
+	$('[data-ajax=mark_topics_read]').each(function() {
+		$(this).attr('href', res.U_MARK_TOPICS);
+	});
+
+	// Hide alert after 3 seconds
+	setTimeout(function () {
+		$('#darkenwrapper').trigger('click');
+	}, 3000);
 });
 
 // This callback finds the post from the delete link, and removes it.
-- 
cgit v1.2.1


From 61ef870fd50171c9234e3621e3bfae53834ae85b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 15 Dec 2012 21:12:52 +0100
Subject: [ticket/10954] Fix coding guidelines infractions

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 67 +++++++++++++++------------------
 1 file changed, 31 insertions(+), 36 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 6d700f1b91..f1859484f3 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -4,25 +4,22 @@
 
 // This callback will mark all forum icons read
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
-	var read_title = res.NO_UNREAD_POSTS;
-	var unread_title = res.UNREAD_POSTS;
+	var readTitle = res.NO_UNREAD_POSTS;
+	var unreadTitle = res.UNREAD_POSTS;
 
 	$('li.row').find('dl.forum_unread, dl.forum_unread_subforum, dl.forum_unread_locked').each(function() {
-		var current_object = $(this);
+		var currentObject = $(this);
 
-		if (current_object.hasClass('forum_unread'))
-		{
-			current_object.removeClass('forum_unread').addClass('forum_read');
+		if (currentObject.hasClass('forum_unread')) {
+			currentObject.removeClass('forum_unread').addClass('forum_read');
 		}
-		else if (current_object.hasClass('forum_unread_subforum'))
-		{
-			current_object.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
+		else if (currentObject.hasClass('forum_unread_subforum')) {
+			currentObject.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
 		}
-		else
-		{
-			current_object.removeClass('forum_unread_locked').addClass('forum_read_locked');
+		else {
+			currentObject.removeClass('forum_unread_locked').addClass('forum_read_locked');
 		}
-		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
+		currentObject.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
 	});
 
 	// Update mark forums read links
@@ -38,45 +35,43 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 
 // This callback will mark all topic icons read
 phpbb.add_ajax_callback('mark_topics_read', function(res) {
-	var read_title = res.NO_UNREAD_POSTS;
-	var unread_title = res.UNREAD_POSTS;
-	var icons_array = {
+	var readTitle = res.NO_UNREAD_POSTS;
+	var unreadTitle = res.UNREAD_POSTS;
+	var iconsArray = {
 		'global_unread': 'global_read',
 		'announce_unread': 'announce_read',
 		'sticky_unread': 'sticky_read',
 		'topic_unread': 'topic_read'
 	};
-	var icons_state = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
-	var unread_class_selectors = '';
-	var class_array = {};
+	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
+	var unreadClassSelectors = '';
+	var classArray = {};
 
-	$.each(icons_array, function(unread_class, read_class) {
-		$.each(icons_state, function(key, value) {
+	$.each(iconsArray, function(unreadClass, readClass) {
+		$.each(iconsState, function(key, value) {
 			// Only topics can be hot
-			if ((value == '_hot' || value == '_hot_mine') && unread_class != 'topic_unread')
-			{
+			if ((value == '_hot' || value == '_hot_mine') && unreadClass != 'topic_unread') {
 				return true;
 			}
-			var current_class = {};
-			current_class[unread_class + value] = read_class + value;
-			$.extend(class_array, current_class);
+			var currentClass = {};
+			currentClass[unreadClass + value] = readClass + value;
+			$.extend(classArray, currentClass);
 
-			unread_class_selectors += '.' + unread_class + value + ',';
+			unreadClassSelectors += '.' + unreadClass + value + ',';
 		});
 	});
 
 	// Remove trailing comma
-	unread_class_selectors = unread_class_selectors.substring(0, unread_class_selectors.length - 1);
-
-	$('li.row').find(unread_class_selectors).each(function() {
-		var current_object = $(this);
-		$.each(class_array, function(unread_class, read_class) {
-			if (current_object.hasClass(unread_class))
-			{
-				current_object.removeClass(unread_class).addClass(read_class);
+	unreadClassSelectors = unreadClassSelectors.substring(0, unreadClassSelectors.length - 1);
+
+	$('li.row').find(unreadClassSelectors).each(function() {
+		var currentObject = $(this);
+		$.each(classArray, function(unreadClass, readClass) {
+			if (currentObject.hasClass(unreadClass)) {
+				currentObject.removeClass(unreadClass).addClass(readClass);
 			}
 		});
-		current_object.children('dt[title=' + unread_title + ']').attr('title', read_title);
+		currentObject.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
 	});
 
 	// Remove link to first unread post
-- 
cgit v1.2.1


From b90a56a4093fd2a13c486fa92fc808c020a35a52 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 15 Dec 2012 23:23:32 +0100
Subject: [ticket/10954] Join array of class names instead of creating a string

Previously the string for selecting the correct classes was created
directly. Due to that a subsequent comma had to be removed. By joining the
array of class names with a separator this can be omitted.

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index f1859484f3..78e82f6f4e 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -46,6 +46,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
 	var unreadClassSelectors = '';
 	var classArray = {};
+	var classNames = [];
 
 	$.each(iconsArray, function(unreadClass, readClass) {
 		$.each(iconsState, function(key, value) {
@@ -57,12 +58,11 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 			currentClass[unreadClass + value] = readClass + value;
 			$.extend(classArray, currentClass);
 
-			unreadClassSelectors += '.' + unreadClass + value + ',';
+			classNames[classNames.length] = unreadClass;
 		});
 	});
 
-	// Remove trailing comma
-	unreadClassSelectors = unreadClassSelectors.substring(0, unreadClassSelectors.length - 1);
+	unreadClassSelectors = '.' + classNames.join(',.');
 
 	$('li.row').find(unreadClassSelectors).each(function() {
 		var currentObject = $(this);
-- 
cgit v1.2.1


From f4ff33536901d6019bfa4fc5e21b4bdafa66ac42 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 15 Dec 2012 23:48:33 +0100
Subject: [ticket/10954] Simplify marking forums read and fix topic marking

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 78e82f6f4e..bbdb327e21 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -6,19 +6,20 @@
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var readTitle = res.NO_UNREAD_POSTS;
 	var unreadTitle = res.UNREAD_POSTS;
+	var iconsArray = {
+		'forum_unread': 'forum_read',
+		'forum_unread_subforum': 'forum_read_subforum',
+		'forum_unread_locked': 'forum_read_locked'
+	};
 
 	$('li.row').find('dl.forum_unread, dl.forum_unread_subforum, dl.forum_unread_locked').each(function() {
 		var currentObject = $(this);
 
-		if (currentObject.hasClass('forum_unread')) {
-			currentObject.removeClass('forum_unread').addClass('forum_read');
-		}
-		else if (currentObject.hasClass('forum_unread_subforum')) {
-			currentObject.removeClass('forum_unread_subforum').addClass('forum_read_subforum');
-		}
-		else {
-			currentObject.removeClass('forum_unread_locked').addClass('forum_read_locked');
-		}
+		$.each(iconsArray, function(unreadClass, readClass) {
+			if (currentObject.hasClass(unreadClass)) {
+				currentObject.removeClass(unreadClass).addClass(readClass);
+			}
+		});
 		currentObject.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
 	});
 
@@ -58,7 +59,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 			currentClass[unreadClass + value] = readClass + value;
 			$.extend(classArray, currentClass);
 
-			classNames[classNames.length] = unreadClass;
+			classNames[classNames.length] = unreadClass + value;
 		});
 	});
 
-- 
cgit v1.2.1


From 46cc20452350a6ec8c02459216ff67e80be193d6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 16 Dec 2012 00:57:53 +0100
Subject: [ticket/10954] Use function for closing alert popup

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index bbdb327e21..faf3e59998 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -2,6 +2,15 @@
 
 "use strict";
 
+/**
+* Close popup alert after a small delay
+*/
+phpbb.closeDarkenWrapper = function() {
+	setTimeout(function() {
+		$('#darkenwrapper').trigger('click');
+	}, 3000);
+}
+
 // This callback will mark all forum icons read
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var readTitle = res.NO_UNREAD_POSTS;
@@ -28,10 +37,7 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 		$(this).attr('href', res.U_MARK_FORUMS);
 	});
 
-	// Hide alert after 3 seconds
-	setTimeout(function () {
-		$('#darkenwrapper').trigger('click');
-	}, 3000);
+	phpbb.closeDarkenWrapper();
 });
 
 // This callback will mark all topic icons read
@@ -85,10 +91,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 		$(this).attr('href', res.U_MARK_TOPICS);
 	});
 
-	// Hide alert after 3 seconds
-	setTimeout(function () {
-		$('#darkenwrapper').trigger('click');
-	}, 3000);
+	phpbb.closeDarkenWrapper();
 });
 
 // This callback finds the post from the delete link, and removes it.
-- 
cgit v1.2.1


From ec0241d2ef178115a2ffdea7fedebbea0a9cf610 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 16 Dec 2012 00:59:12 +0100
Subject: [ticket/10954] Change currentObject to $this for consistency

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index faf3e59998..4e52884a29 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -22,14 +22,14 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	};
 
 	$('li.row').find('dl.forum_unread, dl.forum_unread_subforum, dl.forum_unread_locked').each(function() {
-		var currentObject = $(this);
+		var $this = $(this);
 
 		$.each(iconsArray, function(unreadClass, readClass) {
-			if (currentObject.hasClass(unreadClass)) {
-				currentObject.removeClass(unreadClass).addClass(readClass);
+			if ($this.hasClass(unreadClass)) {
+				$this.removeClass(unreadClass).addClass(readClass);
 			}
 		});
-		currentObject.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
+		$this.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
 	});
 
 	// Update mark forums read links
@@ -72,13 +72,13 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	unreadClassSelectors = '.' + classNames.join(',.');
 
 	$('li.row').find(unreadClassSelectors).each(function() {
-		var currentObject = $(this);
+		var $this = $(this);
 		$.each(classArray, function(unreadClass, readClass) {
-			if (currentObject.hasClass(unreadClass)) {
-				currentObject.removeClass(unreadClass).addClass(readClass);
+			if ($this.hasClass(unreadClass)) {
+				$this.removeClass(unreadClass).addClass(readClass);
 			}
 		});
-		currentObject.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
+		$this.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
 	});
 
 	// Remove link to first unread post
-- 
cgit v1.2.1


From 703b77cb77fa5a99b91cf95220d779bba9ac96d6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 16 Dec 2012 01:06:32 +0100
Subject: [ticket/10954] Use quotes in attribute selectors and reduce use of
 each

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 4e52884a29..41764d5d72 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -29,13 +29,11 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 				$this.removeClass(unreadClass).addClass(readClass);
 			}
 		});
-		$this.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
+		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle);
 	});
 
 	// Update mark forums read links
-	$('[data-ajax=mark_forums_read]').each(function() {
-		$(this).attr('href', res.U_MARK_FORUMS);
-	});
+	$('[data-ajax="mark_forums_read"]').attr('href', res.U_MARK_FORUMS);
 
 	phpbb.closeDarkenWrapper();
 });
@@ -78,18 +76,14 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 				$this.removeClass(unreadClass).addClass(readClass);
 			}
 		});
-		$this.children('dt[title=' + unreadTitle + ']').attr('title', readTitle);
+		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle);
 	});
 
 	// Remove link to first unread post
-	$('span.icon_topic_newest').each(function() {
-		$(this).remove();
-	});
+	$('span.icon_topic_newest').remove();
 
 	// Update mark topics read links
-	$('[data-ajax=mark_topics_read]').each(function() {
-		$(this).attr('href', res.U_MARK_TOPICS);
-	});
+	$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
 
 	phpbb.closeDarkenWrapper();
 });
-- 
cgit v1.2.1


From 38e146c8bd3d3822a8c3e6c25bbf808ba4b6545b Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 23 Apr 2011 19:27:07 -0400
Subject: [feature/events] Added overall_header_head ledge.

This will be used by the trivial-css mod.

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_header.html  | 2 ++
 phpBB/styles/subsilver2/template/overall_header.html | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 3e00827235..c7aac764a5 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -84,6 +84,8 @@
 	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
 <![endif]-->
 
+<!-- RUNHOOKS overall_header_head -->
+
 </head>
 
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 4ed69c56aa..a19e2c95bc 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -129,6 +129,9 @@ function marklist(id, name, state)
 
 // ]]>
 </script>
+
+<!-- RUNHOOKS overall_header_head -->
+
 </head>
 <body class="{S_CONTENT_DIRECTION}">
 
-- 
cgit v1.2.1


From c83c5c7f473b8b7211560a826b84800831167f0b Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 13 Mar 2012 13:22:58 +0000
Subject: [feature/events] Add overall_header_nav template ledge

Adds a ledge next to the FAQ button for extensions to put links on the navigation bar

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_header.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index c7aac764a5..aa931293d6 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -147,6 +147,7 @@
 			<!-- ENDIF -->
 
 			<ul class="linklist rightside">
+				<!-- RUNHOOKS overall_header_nav -->
 				<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 -->
-- 
cgit v1.2.1


From fc2ebc34dfb940bece3c89b8c3ffb5f0d81bca39 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 13 Mar 2012 13:26:24 +0000
Subject: [feature/events] Adds overall_footer_copyright template ledge

This allows people to add copyright information to the footer

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_footer.html  | 3 ++-
 phpBB/styles/subsilver2/template/overall_footer.html | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 7e43ff2d0a..6deb19ed9a 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -19,7 +19,8 @@
 		</div>
 	</div>
 
-	<div class="copyright">{CREDIT_LINE}
+	<div class="copyright"><!-- RUNHOOKS overall_footer_copyright -->
+		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 24c6f8105c..7a23596cab 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -3,7 +3,8 @@
 
 <div id="wrapfooter">
 	<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
-	<span class="copyright">{CREDIT_LINE}
+	<span class="copyright"><!-- RUNHOOKS overall_footer_copyright -->
+		{CREDIT_LINE}
 	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
 </div>
-- 
cgit v1.2.1


From f2ee104291641302434d6e2ce142ec14bb025932 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 13 Mar 2012 13:41:49 +0000
Subject: [feature/events] Add posting_editor_options template ledge

This is needed for options for posts and is used by topic as link MOD

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index be45993cef..776997eb91 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -213,6 +213,7 @@
 		<div class="inner">
 
 		<fieldset class="fields1">
+			<!-- RUNHOOKS posting_editor_options -->
 			<!-- IF S_BBCODE_ALLOWED -->
 				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
 			<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 4c9df6f060..88d001946f 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -257,6 +257,7 @@
 	</td>
 	<td class="row2">
 		<table cellpadding="1">
+		<!-- RUNHOOKS posting_editor_options -->
 		<!-- IF S_BBCODE_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
-- 
cgit v1.2.1


From bdd3e692fb48a8b951f9c82e410c0ef494cd89ec Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 14 Mar 2012 17:58:16 +0000
Subject: [feature/events] Adding overall_header_index_link template ledge

Used by board3portal

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index aa931293d6..ff32338a98 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -123,7 +123,9 @@
 
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
-				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
+				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
+					<!-- RUNHOOKS overall_header_index_link -->
+					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
 
 				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
 				<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
-- 
cgit v1.2.1


From 8534cbcc8470f5d9b916a58dcdcfcf408c3e516e Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 14 Mar 2012 17:58:57 +0000
Subject: [feature/events] Adding overall_footer_index_link template ledge

Used by board3portal

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_footer.html | 3 ++-
 1 file changed, 2 insertions(+), 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 6deb19ed9a..56dd7ae27a 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -6,7 +6,8 @@
 		<div class="inner">
 
 		<ul class="linklist">
-			<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>
+			<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a>
+				<!-- RUNHOOKS overall_footer_index_link --></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 -->
-- 
cgit v1.2.1


From 9e4043ff640cabd3ad187022bb6b8a1e92a3efae Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Wed, 14 Mar 2012 18:10:10 +0000
Subject: [feature/events] Adding forumlist_body_last_post template ledge

Used by NV Advanced Last Topic Titles

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 8762cb0c2e..3315aad718 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -49,7 +49,9 @@
 					<dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd>
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
-						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
+						<!-- IF forumrow.LAST_POST_TIME --><dfn>
+						<!-- RUNHOOKS forumlist_body_last_post -->
+						{L_LAST_POST}</dfn>
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
 						<!-- ENDIF --> 
-- 
cgit v1.2.1


From 18af6dd664ebb272e4c68b3a9d70359eb0eaa00e Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 11:34:36 +0000
Subject: [feature/events] Adding index_body_info_blocks template ledge

PHPBB3-9550
---
 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 6babbf5997..adfdfdaf56 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -29,6 +29,8 @@
 	</form>
 <!-- ENDIF -->
 
+<!-- RUNHOOKS index_body_info_blocks -->
+
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
 	<p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index af2cefef7a..6861ae799a 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -18,6 +18,8 @@
 
 <!-- INCLUDE breadcrumbs.html -->
 
+<!-- RUNHOOKS index_body_info_blocks -->
+
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<br clear="all" />
 
-- 
cgit v1.2.1


From 244978cdb4d089fe431341b898eb45590035f2c0 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 11:54:34 +0000
Subject: [feature/events] Adding overall_footer_end template ledge

Helpful for JS scripts that need to work with the DOM.

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_footer.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_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 56dd7ae27a..c78094ec79 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -57,5 +57,6 @@
 <!-- INCLUDEJS template/ajax.js -->
 {SCRIPTS}
 
+<!-- RUNHOOKS overall_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 7a23596cab..781cdd6b0b 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -13,5 +13,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
+<!-- RUNHOOKS overall_footer_end -->
 </body>
 </html>
-- 
cgit v1.2.1


From bc2f777b2719e0054350768ca958581f53f1d0c8 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 11:57:16 +0000
Subject: [feature/events] Adding simple_footer_end template ledge

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index 897e50ced7..e86db12d54 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -10,5 +10,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
+<!-- RUNHOOKS simple_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index 38a86c5001..3ef060fad7 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -9,5 +9,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
+<!-- RUNHOOKS simple_footer_end -->
 </body>
 </html>
-- 
cgit v1.2.1


From e865ee1bef70ecc711ba4b7b4b9a818befbf0e23 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 18:44:50 +0000
Subject: [feature/events] Adding overall_head_head_body template ledge

Required by ReIMG Resizer

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index ff32338a98..fc0c391d9d 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -87,7 +87,7 @@
 <!-- RUNHOOKS overall_header_head -->
 
 </head>
-
+<!-- RUNHOOKS overall_head_head_body -->
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
 
 <div id="wrap">
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index a19e2c95bc..7f60d7012d 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -133,6 +133,7 @@ function marklist(id, name, state)
 <!-- RUNHOOKS overall_header_head -->
 
 </head>
+<!-- RUNHOOKS overall_head_head_body -->
 <body class="{S_CONTENT_DIRECTION}">
 
 <a name="top"></a>
-- 
cgit v1.2.1


From 9b4ea946300815d4cb63181213a5e29cf7714b9d Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 18:48:16 +0000
Subject: [feature/events] Adding ucp_pm_viewmessage_head_body template ledge

Needed by ReIMG Resizer

PHPBB3-9550
---
 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html  | 2 +-
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index a024a170a7..a70e33b619 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -10,7 +10,7 @@
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
-
+<!-- RUNHOOKS ucp_pm_viewmessage_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index fd0244a79d..0ecf36709d 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -55,6 +55,7 @@ hr.sep {
 </style>
 
 </head>
+<!-- RUNHOOKS ucp_pm_viewmessage_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-- 
cgit v1.2.1


From 47c183438223d5cb85a3e4edc6e57da63b788093 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 18:48:46 +0000
Subject: [feature/events] Adding viewtopic_print_head_body template ledge

Needed by ReIMG Resizer

PHPBB3-9550
---
 phpBB/styles/prosilver/template/viewtopic_print.html  | 2 +-
 phpBB/styles/subsilver2/template/viewtopic_print.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index 54676279d2..ff65f6f91e 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -10,7 +10,7 @@
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
-
+<!-- RUNHOOKS viewtopic_print_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 78fab17d02..100157e704 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -67,6 +67,7 @@ hr.sep {
 </style>
 
 </head>
+<!-- RUNHOOKS viewtopic_print_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-- 
cgit v1.2.1


From 6ca65226e3e3b0ccdac1cf2f82aa5aa468e1e0e2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 16 Mar 2012 10:10:05 +0100
Subject: [feature/events] Fix forumlist_body_last_post in prosilver

Used by NV Advanced Last Topic Titles

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 3315aad718..8963da8d1e 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -49,9 +49,8 @@
 					<dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd>
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
-						<!-- IF forumrow.LAST_POST_TIME --><dfn>
-						<!-- RUNHOOKS forumlist_body_last_post -->
-						{L_LAST_POST}</dfn>
+						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
+						<!-- LEDGE forumlist_body_last_post -->
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
 						<!-- ENDIF --> 
-- 
cgit v1.2.1


From c0f900f69565583ff871e4cdefa30083147d2bc9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 16 Mar 2012 10:13:43 +0100
Subject: [feature/events] Add forumlist_body_last_post in subsilver2

Used by NV Advanced Last Topic Titles

PHPBB3-9550
---
 phpBB/styles/subsilver2/template/forumlist_body.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index ad505885f6..972ddeb513 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -63,6 +63,7 @@
 					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
 					<!-- ENDIF -->
+					<!-- LEDGE forumlist_body_last_post -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
-- 
cgit v1.2.1


From 8dcc2cded68efea064ac0ae7dd2a75db2b48651e Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 20 Mar 2012 07:08:59 +0000
Subject: [feature/events] Rename RUNHOOKS to EVENT

Apply change to existing ledges

PHPBB3-9550
---
 phpBB/styles/prosilver/template/index_body.html                | 2 +-
 phpBB/styles/prosilver/template/overall_footer.html            | 6 +++---
 phpBB/styles/prosilver/template/overall_header.html            | 8 ++++----
 phpBB/styles/prosilver/template/posting_editor.html            | 2 +-
 phpBB/styles/prosilver/template/simple_footer.html             | 2 +-
 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html  | 2 +-
 phpBB/styles/prosilver/template/viewtopic_print.html           | 2 +-
 phpBB/styles/subsilver2/template/index_body.html               | 2 +-
 phpBB/styles/subsilver2/template/overall_footer.html           | 4 ++--
 phpBB/styles/subsilver2/template/overall_header.html           | 4 ++--
 phpBB/styles/subsilver2/template/posting_body.html             | 2 +-
 phpBB/styles/subsilver2/template/simple_footer.html            | 2 +-
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 2 +-
 phpBB/styles/subsilver2/template/viewtopic_print.html          | 2 +-
 14 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index adfdfdaf56..b44c033a25 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -29,7 +29,7 @@
 	</form>
 <!-- ENDIF -->
 
-<!-- RUNHOOKS index_body_info_blocks -->
+<!-- EVENT index_body_info_blocks -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index c78094ec79..6861b90381 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -7,7 +7,7 @@
 
 		<ul class="linklist">
 			<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a>
-				<!-- RUNHOOKS overall_footer_index_link --></li>
+				<!-- EVENT overall_footer_index_link --></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 -->
@@ -20,7 +20,7 @@
 		</div>
 	</div>
 
-	<div class="copyright"><!-- RUNHOOKS overall_footer_copyright -->
+	<div class="copyright"><!-- EVENT overall_footer_copyright -->
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
@@ -57,6 +57,6 @@
 <!-- INCLUDEJS template/ajax.js -->
 {SCRIPTS}
 
-<!-- RUNHOOKS overall_footer_end -->
+<!-- EVENT overall_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index fc0c391d9d..2440e7a4e3 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -84,10 +84,10 @@
 	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
 <![endif]-->
 
-<!-- RUNHOOKS overall_header_head -->
+<!-- EVENT overall_header_head -->
 
 </head>
-<!-- RUNHOOKS overall_head_head_body -->
+<!-- EVENT overall_head_head_body -->
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
 
 <div id="wrap">
@@ -124,7 +124,7 @@
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
 				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
-					<!-- RUNHOOKS overall_header_index_link -->
+					<!-- EVENT overall_header_index_link -->
 					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
 
 				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
@@ -149,7 +149,7 @@
 			<!-- ENDIF -->
 
 			<ul class="linklist rightside">
-				<!-- RUNHOOKS overall_header_nav -->
+				<!-- EVENT overall_header_nav -->
 				<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 -->
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 776997eb91..0f3522bb15 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -213,7 +213,7 @@
 		<div class="inner">
 
 		<fieldset class="fields1">
-			<!-- RUNHOOKS posting_editor_options -->
+			<!-- EVENT posting_editor_options -->
 			<!-- IF S_BBCODE_ALLOWED -->
 				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
 			<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index e86db12d54..b7767a3a98 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -10,6 +10,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- RUNHOOKS simple_footer_end -->
+<!-- EVENT simple_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index a70e33b619..a53c0d6e8f 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -10,7 +10,7 @@
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
-<!-- RUNHOOKS ucp_pm_viewmessage_head_body -->
+<!-- EVENT ucp_pm_viewmessage_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index ff65f6f91e..7cf0124626 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -10,7 +10,7 @@
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
 </head>
-<!-- RUNHOOKS viewtopic_print_head_body -->
+<!-- EVENT viewtopic_print_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index 6861ae799a..8ceb2921eb 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -18,7 +18,7 @@
 
 <!-- INCLUDE breadcrumbs.html -->
 
-<!-- RUNHOOKS index_body_info_blocks -->
+<!-- EVENT index_body_info_blocks -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 781cdd6b0b..9dd9681b80 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -3,7 +3,7 @@
 
 <div id="wrapfooter">
 	<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
-	<span class="copyright"><!-- RUNHOOKS overall_footer_copyright -->
+	<span class="copyright"><!-- EVENT overall_footer_copyright -->
 		{CREDIT_LINE}
 	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
@@ -13,6 +13,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- RUNHOOKS overall_footer_end -->
+<!-- EVENT overall_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 7f60d7012d..b64bd773f9 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -130,10 +130,10 @@ function marklist(id, name, state)
 // ]]>
 </script>
 
-<!-- RUNHOOKS overall_header_head -->
+<!-- EVENT overall_header_head -->
 
 </head>
-<!-- RUNHOOKS overall_head_head_body -->
+<!-- EVENT overall_head_head_body -->
 <body class="{S_CONTENT_DIRECTION}">
 
 <a name="top"></a>
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 88d001946f..0352baca87 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -257,7 +257,7 @@
 	</td>
 	<td class="row2">
 		<table cellpadding="1">
-		<!-- RUNHOOKS posting_editor_options -->
+		<!-- EVENT posting_editor_options -->
 		<!-- IF S_BBCODE_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index 3ef060fad7..bbbc0aaff8 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -9,6 +9,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- RUNHOOKS simple_footer_end -->
+<!-- EVENT simple_footer_end -->
 </body>
 </html>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index 0ecf36709d..fe64b4e402 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -55,7 +55,7 @@ hr.sep {
 </style>
 
 </head>
-<!-- RUNHOOKS ucp_pm_viewmessage_head_body -->
+<!-- EVENT ucp_pm_viewmessage_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 100157e704..8fe7d97524 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -67,7 +67,7 @@ hr.sep {
 </style>
 
 </head>
-<!-- RUNHOOKS viewtopic_print_head_body -->
+<!-- EVENT viewtopic_print_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-- 
cgit v1.2.1


From 99cd766de0d49f7736d019dd1ccc2ccda7886b16 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 20 Mar 2012 11:40:04 +0000
Subject: [feature/events] Remove overall_head_head_body template ledge

PHPBB3-9550

Conflicts:

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 2440e7a4e3..3a727b71e4 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -87,7 +87,6 @@
 <!-- EVENT overall_header_head -->
 
 </head>
-<!-- EVENT overall_head_head_body -->
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
 
 <div id="wrap">
-- 
cgit v1.2.1


From 8012cd1d1178724ea4b0b4633156e87420de8b30 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Tue, 20 Mar 2012 11:41:42 +0000
Subject: [feature/events] Move template ledges above </head> tag

PHPBB3-9550

Conflicts:

	phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
	phpBB/styles/prosilver/template/viewtopic_print.html
---
 phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html | 2 +-
 phpBB/styles/prosilver/template/viewtopic_print.html          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index a53c0d6e8f..ea9bbc9741 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -9,8 +9,8 @@
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
+<!-- EVENT ucp_pm_viewmessage_head -->
 </head>
-<!-- EVENT ucp_pm_viewmessage_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index 7cf0124626..6fd54e3b27 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -9,8 +9,8 @@
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
+<!-- EVENT viewtopic_print_head -->
 </head>
-<!-- EVENT viewtopic_print_head_body -->
 <body id="phpbb">
 <div id="wrap">
 	<a id="top" accesskey="t"></a>
-- 
cgit v1.2.1


From 243c984908a40b684322fe0c22f35fdb71cfcc5f Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 10 May 2012 18:58:17 +0100
Subject: [feature/events] Add overall_header_index_link_left event

As a portal is of higher presdence than the board, unlike most extensions
it has a link before the board index link. This event satifies that.

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_header.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 3a727b71e4..47bce7cc36 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -122,7 +122,8 @@
 
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
-				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
+				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><!-- EVENT overall_header_index_link_left -->
+					<a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
 					<!-- EVENT overall_header_index_link -->
 					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
 
-- 
cgit v1.2.1


From 2a37f8b50fc967ad1998d539311b01dfbaae02f1 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sat, 19 May 2012 20:09:22 +0100
Subject: [feature/events] Fix index_link_prepend template event

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 47bce7cc36..a6a6c59b60 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -122,7 +122,7 @@
 
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
-				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><!-- EVENT overall_header_index_link_left -->
+				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><!-- EVENT overall_header_index_link_prepend -->
 					<a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
 					<!-- EVENT overall_header_index_link -->
 					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
-- 
cgit v1.2.1


From ce7d440a6e81735811ac2f2bdb40c4f17e5d1451 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Sat, 19 May 2012 20:12:21 +0100
Subject: [feature/events] Adding viewtopic_topic_title_prepend template event

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 1b7d78e063..7688898f5c 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE overall_header.html -->
 <!-- IF U_MCP --><p>[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ENDIF -->
-<h2><a href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</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/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html
index e2834ffa0b..9e6377022a 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_body.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_body.html
@@ -15,7 +15,7 @@
 <!-- ENDIF -->
 
 <div id="pageheader">
-	<h2><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
+	<h2><!-- EVENT viewtopic_topic_title_prepend --><a class="titles" href="{U_VIEW_TOPIC}">{TOPIC_TITLE}</a></h2>
 
 <!-- IF MODERATORS -->
 	<p class="moderators"><!-- IF S_SINGLE_MODERATOR -->{L_MODERATOR}<!-- ELSE -->{L_MODERATORS}<!-- ENDIF -->{L_COLON} {MODERATORS}</p>
-- 
cgit v1.2.1


From b95549a7a7c9bcac72764f03ab453749b9ba3ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Fr=C3=A8rejean?= <erikfrerejean@phpbb.com>
Date: Wed, 6 Jun 2012 12:46:50 +0200
Subject: [feature/events] Correct template calls

There where two `<!-- LEDGE ... -->` calls in the templates left.
Replace those two calls with the proper `<!-- EVENT ... -->`
call

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 8963da8d1e..7e893e012b 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -50,7 +50,7 @@
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
 						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
-						<!-- LEDGE forumlist_body_last_post -->
+						<!-- EVENT forumlist_body_last_post -->
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
 						<!-- ENDIF --> 
diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index 972ddeb513..b44b307f64 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -63,7 +63,7 @@
 					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
 					<!-- ENDIF -->
-					<!-- LEDGE forumlist_body_last_post -->
+					<!-- EVENT forumlist_body_last_post -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
-- 
cgit v1.2.1


From c81d49c9692ac9d53fceaaf6851b172d91cfc073 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 26 Jul 2012 14:08:54 +0100
Subject: [feature/events] Add append to event name

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 7e893e012b..6d9bb00fa2 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -50,7 +50,7 @@
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
 						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
-						<!-- EVENT forumlist_body_last_post -->
+						<!-- EVENT forumlist_body_last_post_append -->
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
 						<!-- ENDIF --> 
-- 
cgit v1.2.1


From 336f0c5641c3db0524c5a8ec45e1fbde12bd7654 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 26 Jul 2012 14:10:28 +0100
Subject: [feature/events] Rename event to show location around copyright

PHPBB3-9550
---
 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 6861b90381..40c7f11c67 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -20,7 +20,7 @@
 		</div>
 	</div>
 
-	<div class="copyright"><!-- EVENT overall_footer_copyright -->
+	<div class="copyright"><!-- EVENT overall_footer_copyright_before -->
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
-- 
cgit v1.2.1


From 0b351368941e8c23a289263ce7f28446b44bee29 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 26 Jul 2012 14:13:31 +0100
Subject: [feature/events] Add overall_footer_copyright_after template event

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 40c7f11c67..998910033f 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -23,6 +23,7 @@
 	<div class="copyright"><!-- EVENT overall_footer_copyright_before -->
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+		<!-- EVENT overall_footer_copyright_after -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
 	</div>
-- 
cgit v1.2.1


From a6122228ebae0042e8960349cdeb7b9679517bb0 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 26 Jul 2012 14:15:34 +0100
Subject: [feature/events] Adjust to use prepend, not before

PHPBB3-9550
---
 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 998910033f..cc2f1cbfd6 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -20,7 +20,7 @@
 		</div>
 	</div>
 
-	<div class="copyright"><!-- EVENT overall_footer_copyright_before -->
+	<div class="copyright"><!-- EVENT overall_footer_copyright_prepend -->
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
 		<!-- EVENT overall_footer_copyright_after -->
-- 
cgit v1.2.1


From c527403ef7464d3c322d0ecab57c63311b6a6293 Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Thu, 26 Jul 2012 14:16:40 +0100
Subject: [feature/events] Add location (prepend) to event name

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index a6a6c59b60..9ea654b043 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -149,7 +149,7 @@
 			<!-- ENDIF -->
 
 			<ul class="linklist rightside">
-				<!-- EVENT overall_header_nav -->
+				<!-- EVENT overall_header_nav_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 -->
-- 
cgit v1.2.1


From de54bccc58dc34366ea52ada1c58914b882c8be0 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 10 Dec 2012 16:00:13 -0500
Subject: [feature/events] There is nothing between head and body.

PHPBB3-9550
---
 phpBB/styles/subsilver2/template/overall_header.html           | 1 -
 phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 1 -
 phpBB/styles/subsilver2/template/viewtopic_print.html          | 1 -
 3 files changed, 3 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index b64bd773f9..c637908c26 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -133,7 +133,6 @@ function marklist(id, name, state)
 <!-- EVENT overall_header_head -->
 
 </head>
-<!-- EVENT overall_head_head_body -->
 <body class="{S_CONTENT_DIRECTION}">
 
 <a name="top"></a>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
index fe64b4e402..fd0244a79d 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
@@ -55,7 +55,6 @@ hr.sep {
 </style>
 
 </head>
-<!-- EVENT ucp_pm_viewmessage_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html
index 8fe7d97524..78fab17d02 100644
--- a/phpBB/styles/subsilver2/template/viewtopic_print.html
+++ b/phpBB/styles/subsilver2/template/viewtopic_print.html
@@ -67,7 +67,6 @@ hr.sep {
 </style>
 
 </head>
-<!-- EVENT viewtopic_print_head_body -->
 <body>
 
 <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
-- 
cgit v1.2.1


From 37ac2c9aaedaa3786457192d3397db7bc3cb2543 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:28:04 -0500
Subject: [feature/events] Rename index_body_info_blocks:
 index_body_stat_blocks_before

---
 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 b44c033a25..502975ebb6 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -29,7 +29,7 @@
 	</form>
 <!-- ENDIF -->
 
-<!-- EVENT index_body_info_blocks -->
+<!-- EVENT index_body_stat_blocks_before -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
-- 
cgit v1.2.1


From 9015a76cf6fd7148534817550c873ff912b67f42 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:31:49 -0500
Subject: [feature/events] Fix events in prosilver overall_footer.html

PHPBB3-9550
---
 phpBB/styles/prosilver/template/overall_footer.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index cc2f1cbfd6..322d745501 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -7,7 +7,7 @@
 
 		<ul class="linklist">
 			<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a>
-				<!-- EVENT overall_footer_index_link --></li>
+				<!-- 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 -->
@@ -20,10 +20,11 @@
 		</div>
 	</div>
 
-	<div class="copyright"><!-- EVENT overall_footer_copyright_prepend -->
+	<div class="copyright">
+		<!-- EVENT overall_footer_copyright_prepend -->
 		{CREDIT_LINE}
 		<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
-		<!-- EVENT overall_footer_copyright_after -->
+		<!-- EVENT overall_footer_copyright_append -->
 		<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
 		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
 	</div>
@@ -58,6 +59,6 @@
 <!-- INCLUDEJS template/ajax.js -->
 {SCRIPTS}
 
-<!-- EVENT overall_footer_end -->
+<!-- EVENT overall_footer_after -->
 </body>
 </html>
-- 
cgit v1.2.1


From c6f9e4522bb53f4a6dc943f249fd6a543ad6a6c5 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:34:31 -0500
Subject: [feature/events] Fix events in prosilver overall_header.html

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 9ea654b043..97dbc76e43 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -84,7 +84,7 @@
 	<link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" />
 <![endif]-->
 
-<!-- EVENT overall_header_head -->
+<!-- EVENT overall_header_head_append -->
 
 </head>
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
@@ -122,10 +122,11 @@
 
 			<ul class="linklist navlinks">
 				<!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' -->
-				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF --><!-- EVENT overall_header_index_link_prepend -->
+				<li class="icon-home"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#8249;</strong> <!-- ENDIF -->
 					<a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a> 
-					<!-- EVENT overall_header_index_link -->
-					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></li>
+					<!-- BEGIN navlinks --> <strong>&#8249;</strong> <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks -->
+					<!-- EVENT overall_header_breadcrumb_append -->
+				</li>
 
 				<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
 				<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
@@ -149,13 +150,14 @@
 			<!-- ENDIF -->
 
 			<ul class="linklist rightside">
-				<!-- EVENT overall_header_nav_prepend -->
+				<!-- 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>
 				<!-- ENDIF -->
+				<!-- EVENT overall_header_navigation_append -->
 			</ul>
 
 			</div>
-- 
cgit v1.2.1


From d22f171ad0af20bbc02c44a674509371398798b7 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:36:07 -0500
Subject: [feature/events] Append "_prepend" to posting_editor_options

PHPBB3-9550
---
 phpBB/styles/prosilver/template/posting_editor.html | 2 +-
 1 file changed, 1 insertion(+), 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 0f3522bb15..8156968098 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -213,7 +213,7 @@
 		<div class="inner">
 
 		<fieldset class="fields1">
-			<!-- EVENT posting_editor_options -->
+			<!-- EVENT posting_editor_options_prepend -->
 			<!-- IF S_BBCODE_ALLOWED -->
 				<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div>
 			<!-- ENDIF -->
-- 
cgit v1.2.1


From d3db491e09028904dbdad95552a52c1266d0c271 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:40:42 -0500
Subject: [feature/events] simple_footer_end -> simple_footer_after

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index b7767a3a98..ec189304fc 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -10,6 +10,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- EVENT simple_footer_end -->
+<!-- EVENT simple_footer_after -->
 </body>
 </html>
-- 
cgit v1.2.1


From cb3db020f007e77d5a0bf01dd8cc279cf3634586 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:51:07 -0500
Subject: [feature/events] ucp_pm_viewmessage_print_head_append

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index ea9bbc9741..4a8d3da08a 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -9,7 +9,7 @@
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
-<!-- EVENT ucp_pm_viewmessage_head -->
+<!-- EVENT ucp_pm_viewmessage_print_head_append -->
 </head>
 <body id="phpbb">
 <div id="wrap">
-- 
cgit v1.2.1


From 8526dc14f0e734d9cbf6f0b1f652064caee710f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:52:37 -0500
Subject: [feature/events] Append "_append" to viewtopic_print_head

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index 6fd54e3b27..fd0b2dc3e6 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -9,7 +9,7 @@
 <title>{SITENAME} &bull; {PAGE_TITLE}</title>
 
 <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" />
-<!-- EVENT viewtopic_print_head -->
+<!-- EVENT viewtopic_print_head_append -->
 </head>
 <body id="phpbb">
 <div id="wrap">
-- 
cgit v1.2.1


From d25dffbb2def5da74bf41cf8c67fe69eae3bd9df Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:57:18 -0500
Subject: [feature/events] Fix some subsilver2 events

PHPBB3-9550
---
 phpBB/styles/subsilver2/template/breadcrumbs.html    | 3 ++-
 phpBB/styles/subsilver2/template/forumlist_body.html | 2 +-
 phpBB/styles/subsilver2/template/index_body.html     | 2 +-
 phpBB/styles/subsilver2/template/overall_footer.html | 6 ++++--
 phpBB/styles/subsilver2/template/overall_header.html | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html
index 49e31c0749..09ee9a8606 100644
--- a/phpBB/styles/subsilver2/template/breadcrumbs.html
+++ b/phpBB/styles/subsilver2/template/breadcrumbs.html
@@ -2,7 +2,8 @@
 	<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" style="margin-top: 5px;">
 	<tr>
 		<td class="row1">
-			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA}>{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --></p>
+			<p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>&#187;</strong> <!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA}>{L_INDEX}</a><!-- BEGIN navlinks --> &#187; <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks -->
+			<!-- EVENT overall_header_breadcrumb_append --></p>
 			<p class="datetime">{S_TIMEZONE}</p>
 		</td>
 	</tr>
diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index b44b307f64..36c4b47381 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -63,7 +63,7 @@
 					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
 						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
 					<!-- ENDIF -->
-					<!-- EVENT forumlist_body_last_post -->
+					<!-- EVENT forumlist_body_last_post_title_after -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index 8ceb2921eb..e07cfda8b3 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -18,7 +18,7 @@
 
 <!-- INCLUDE breadcrumbs.html -->
 
-<!-- EVENT index_body_info_blocks -->
+<!-- EVENT index_body_stat_blocks_before -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->
 	<br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 9dd9681b80..1108d69467 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -3,9 +3,11 @@
 
 <div id="wrapfooter">
 	<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
-	<span class="copyright"><!-- EVENT overall_footer_copyright -->
-		{CREDIT_LINE}
+	<span class="copyright">
+	<!-- EVENT overall_footer_copyright_prepend -->
+	{CREDIT_LINE}
 	<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
+	<!-- EVENT overall_footer_copyright_append -->
 	<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
 </div>
 
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index c637908c26..d5fd20f0fe 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -130,7 +130,7 @@ function marklist(id, name, state)
 // ]]>
 </script>
 
-<!-- EVENT overall_header_head -->
+<!-- EVENT overall_header_head_append -->
 
 </head>
 <body class="{S_CONTENT_DIRECTION}">
-- 
cgit v1.2.1


From 4ad2747ccf9f7ebbafcb406c19a28592c2efc26c Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 11:59:23 -0500
Subject: [feature/events] Fix more subsilver2 events

PHPBB3-9550
---
 phpBB/styles/subsilver2/template/posting_body.html  | 2 +-
 phpBB/styles/subsilver2/template/simple_footer.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index 0352baca87..39f8f876ba 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -257,7 +257,7 @@
 	</td>
 	<td class="row2">
 		<table cellpadding="1">
-		<!-- EVENT posting_editor_options -->
+		<!-- EVENT posting_editor_options_prepend -->
 		<!-- IF S_BBCODE_ALLOWED -->
 			<tr>
 				<td><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /></td>
diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index bbbc0aaff8..c847bfedcc 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -9,6 +9,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- EVENT simple_footer_end -->
+<!-- EVENT simple_footer_after -->
 </body>
 </html>
-- 
cgit v1.2.1


From 3667ba7a09e725072fd884ae7e85b41962e4dc74 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 17:38:13 -0500
Subject: [feature/events] Fix typo in event name

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 6d9bb00fa2..539ed047c9 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -50,8 +50,8 @@
 					<dd class="lastpost"><span>
 						<!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}">{UNAPPROVED_IMG}</a><!-- ENDIF -->
 						<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
-						<!-- EVENT forumlist_body_last_post_append -->
 						<!-- IF forumrow.S_DISPLAY_SUBJECT -->
+							<!-- EVENT forumlist_body_last_post_title_prepend -->
 							<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
 						<!-- ENDIF --> 
 						{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
-- 
cgit v1.2.1


From 8d6a4559bacd8458e241993a195385f83cb7b3c1 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 17:48:15 -0500
Subject: [feature/events] Fix overall_footer_end -> overall_footer_after
 (subsilver2)

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 1108d69467..64e7587023 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -15,6 +15,6 @@
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
 {SCRIPTS}
 
-<!-- EVENT overall_footer_end -->
+<!-- EVENT overall_footer_after -->
 </body>
 </html>
-- 
cgit v1.2.1


From 636227491d6f6c8e2c2bfef22773de80ac9f71c3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 17 Dec 2012 17:59:41 -0500
Subject: [feature/events] forumlist_body_last_post_title_after -> _prepend
 (subsilver2)

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html
index 36c4b47381..3e30561f3a 100644
--- a/phpBB/styles/subsilver2/template/forumlist_body.html
+++ b/phpBB/styles/subsilver2/template/forumlist_body.html
@@ -61,9 +61,9 @@
 			<td class="row2" align="center" nowrap="nowrap">
 				<!-- IF forumrow.LAST_POST_TIME -->
 					<!-- IF forumrow.S_DISPLAY_SUBJECT -->
+						<!-- EVENT forumlist_body_last_post_title_prepend -->
 						<p class="topicdetails"><a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></p>
 					<!-- ENDIF -->
-					<!-- EVENT forumlist_body_last_post_title_after -->
 					<p class="topicdetails"><!-- IF forumrow.U_UNAPPROVED_TOPICS --><a href="{forumrow.U_UNAPPROVED_TOPICS}" class="imageset">{UNAPPROVED_IMG}</a>&nbsp;<!-- ENDIF -->{forumrow.LAST_POST_TIME}</p>
 					<p class="topicdetails">{forumrow.LAST_POSTER_FULL}
 						<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}" class="imageset">{LAST_POST_IMG}</a><!-- ENDIF -->
-- 
cgit v1.2.1


From fb60f603ba5ac26004747e976a194ea9d15bcf4b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 18 Dec 2012 00:48:50 +0100
Subject: [ticket/10954] Miscellaneous coding fixes

Remove obsolete or unneeded code. Also fix the behavior of removing
icon_topic_newest by actually removing the link to the first unread post
instead of just removing the icon.

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 41764d5d72..0357b7c59e 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -50,7 +50,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	};
 	var iconsState = ['', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine'];
 	var unreadClassSelectors = '';
-	var classArray = {};
+	var classMap = {};
 	var classNames = [];
 
 	$.each(iconsArray, function(unreadClass, readClass) {
@@ -59,11 +59,8 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 			if ((value == '_hot' || value == '_hot_mine') && unreadClass != 'topic_unread') {
 				return true;
 			}
-			var currentClass = {};
-			currentClass[unreadClass + value] = readClass + value;
-			$.extend(classArray, currentClass);
-
-			classNames[classNames.length] = unreadClass + value;
+			classMap[unreadClass + value] = readClass + value;
+			classNames.push(unreadClass + value);
 		});
 	});
 
@@ -71,7 +68,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 
 	$('li.row').find(unreadClassSelectors).each(function() {
 		var $this = $(this);
-		$.each(classArray, function(unreadClass, readClass) {
+		$.each(classMap, function(unreadClass, readClass) {
 			if ($this.hasClass(unreadClass)) {
 				$this.removeClass(unreadClass).addClass(readClass);
 			}
@@ -80,7 +77,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	});
 
 	// Remove link to first unread post
-	$('span.icon_topic_newest').remove();
+	$('a').has('span.icon_topic_newest').remove();
 
 	// Update mark topics read links
 	$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
-- 
cgit v1.2.1


From 55b5336b022e4bd8f46d7cb2fc56bdc5e4e16974 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 18 Dec 2012 09:55:22 +0100
Subject: [ticket/10954] Make sure to mark subforums unread and add small fixes

PHPBB3-10954
---
 phpBB/styles/prosilver/template/ajax.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 0357b7c59e..bde7fc2c8f 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -3,12 +3,14 @@
 "use strict";
 
 /**
-* Close popup alert after a small delay
+* Close popup alert after a specified delay
+*
+* @param int Delay in ms until darkenwrapper's click event is triggered
 */
-phpbb.closeDarkenWrapper = function() {
+phpbb.closeDarkenWrapper = function(delay) {
 	setTimeout(function() {
 		$('#darkenwrapper').trigger('click');
-	}, 3000);
+	}, delay);
 }
 
 // This callback will mark all forum icons read
@@ -18,10 +20,10 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 	var iconsArray = {
 		'forum_unread': 'forum_read',
 		'forum_unread_subforum': 'forum_read_subforum',
-		'forum_unread_locked': 'forum_read_locked'
+		'forum_unread_locked': 'forum_read_locked',
 	};
 
-	$('li.row').find('dl.forum_unread, dl.forum_unread_subforum, dl.forum_unread_locked').each(function() {
+	$('li.row').find('dl[class*="forum_unread"]').each(function() {
 		var $this = $(this);
 
 		$.each(iconsArray, function(unreadClass, readClass) {
@@ -32,10 +34,13 @@ phpbb.add_ajax_callback('mark_forums_read', function(res) {
 		$this.children('dt[title="' + unreadTitle + '"]').attr('title', readTitle);
 	});
 
+	// Mark subforums read
+	$('a.subforum[class*="unread"]').removeClass('unread').addClass('read');
+
 	// Update mark forums read links
 	$('[data-ajax="mark_forums_read"]').attr('href', res.U_MARK_FORUMS);
 
-	phpbb.closeDarkenWrapper();
+	phpbb.closeDarkenWrapper(3000);
 });
 
 // This callback will mark all topic icons read
@@ -82,7 +87,7 @@ phpbb.add_ajax_callback('mark_topics_read', function(res) {
 	// Update mark topics read links
 	$('[data-ajax="mark_topics_read"]').attr('href', res.U_MARK_TOPICS);
 
-	phpbb.closeDarkenWrapper();
+	phpbb.closeDarkenWrapper(3000);
 });
 
 // This callback finds the post from the delete link, and removes it.
-- 
cgit v1.2.1


From daf9de689a41dddae97152a21cc9bc894b48666f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 18 Dec 2012 16:24:58 +0100
Subject: [ticket/10954] Add missing semi-colon

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

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index bde7fc2c8f..6637df4c3d 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -11,7 +11,7 @@ phpbb.closeDarkenWrapper = function(delay) {
 	setTimeout(function() {
 		$('#darkenwrapper').trigger('click');
 	}, delay);
-}
+};
 
 // This callback will mark all forum icons read
 phpbb.add_ajax_callback('mark_forums_read', function(res) {
-- 
cgit v1.2.1