9 files changed, 36 insertions, 22 deletions
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 986aa24b1b..6aff4b29cc 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -21,12 +21,12 @@
 		<!-- IF META_DESCRIPTION -->
 		<dl>
 			<dt><label>{L_DESCRIPTION}{L_COLON}</label></dt>
-			<dd><p id="meta_description">{META_DESCRIPTION}</p></dd>
+			<dd><span id="meta_description">{META_DESCRIPTION}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
 			<dt><label>{L_VERSION}{L_COLON}</label></dt>
-			<dd><p id="meta_version">{META_VERSION}</p></dd>
+			<dd><span id="meta_version">{META_VERSION}</span></dd>
 		</dl>
 		<!-- IF META_HOMEPAGE -->
 		<dl>
@@ -37,12 +37,12 @@
 		<!-- IF META_TIME -->
 		<dl>
 			<dt><label>{L_TIME}{L_COLON}</label></dt>
-			<dd><p id="meta_time">{META_TIME}</p></dd>
+			<dd><span id="meta_time">{META_TIME}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 		<dl>
-			<dt><label>{L_LICENCE}{L_COLON}</label></dt>
-			<dd><p id="meta_license">{META_LICENCE}</p></dd>
+			<dt><label>{L_LICENSE}{L_COLON}</label></dt>
+			<dd><span id="meta_license">{META_LICENSE}</span></dd>
 		</dl>
 	</fieldset>
 
@@ -52,13 +52,13 @@
 		<!-- IF META_REQUIRE_PHPBB -->
 		<dl<!-- IF META_REQUIRE_PHPBB_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label>{L_PHPBB_VERSION}{L_COLON}</label></dt>
-			<dd><p id="require_phpbb">{META_REQUIRE_PHPBB}</p></dd>
+			<dd><span id="require_phpbb">{META_REQUIRE_PHPBB}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 		<!-- IF META_REQUIRE_PHP -->
 		<dl<!-- IF META_REQUIRE_PHP_FAIL --> class="requirements_not_met"<!-- ENDIF -->>
 			<dt><label>{L_PHP_VERSION}{L_COLON}</label></dt>
-			<dd><p id="require_php">{META_REQUIRE_PHP}</p></dd>
+			<dd><span id="require_php">{META_REQUIRE_PHP}</span></dd>
 		</dl>
 		<!-- ENDIF -->
 	</fieldset>
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index b5c691b36b..e0149c2a0f 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -2,6 +2,10 @@
 
 <a id="maincontent"></a>
 
+<!-- IF S_STYLE_DETAILS -->
+	<a href="{U_ACTION}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+<!-- ENDIF -->
+
 <!-- IF S_CONFIRM_ACTION -->
 <form id="confirm" method="post" action="{S_CONFIRM_ACTION}">
 
@@ -72,8 +76,8 @@
 
 	<fieldset class="submit-buttons">
 		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
-		<a href="{U_ACTION}" class="button2">{L_BACK}</a>
+		<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 		{S_FORM_TOKEN}
 	</fieldset>
 <!-- ENDIF -->
@@ -154,14 +158,6 @@
 	</fieldset>
 <!-- ENDIF -->
 
-<!-- IF .extra_links -->
-	<fieldset class="quick">
-		<!-- BEGIN extra_links -->
-			<a class="button2" href="{extra_links.U_ACTION}">{extra_links.L_ACTION}</a>
-		<!-- END extra_links -->
-	</fieldset>
-<!-- ENDIF -->
-
 </form>
 
 <!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 1caa6e5e13..013be80465 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -30,7 +30,20 @@
 </dl>
 <dl>
 	<dt><label>{L_POSTS}{L_COLON}</label></dt>
-	<dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>
+	<dd>
+		<strong>
+			<!-- IF USER_HAS_POSTS and U_SEARCH_USER -->
+				<a href="{U_SEARCH_USER}">{USER_POSTS}</a>
+			<!-- ELSE -->
+				{USER_POSTS}
+			<!-- ENDIF -->
+		</strong>
+		<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE -->
+			(<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)
+		<!-- ELSEIF POSTS_IN_QUEUE -->
+			({L_POSTS_IN_QUEUE})
+		<!-- ENDIF -->
+	</dd>
 </dl>
 <dl>
 	<dt><label>{L_WARNINGS}{L_COLON}</label></dt>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index d6377453d1..22bbf404ea 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1513,7 +1513,7 @@ input.autowidth { width: auto !important;}
 
 /* Form button styles
 ---------------------------------------- */
-a.button1, input.button1, input.button3,
+a.button1, input.button1,
 a.button2, input.button2 {
 	width: auto !important;
 	padding: 1px 3px 0 3px;
@@ -1556,7 +1556,7 @@ input.disabled {
 }
 
 /* Focus states */
-input.button1:focus, input.button2:focus, input.button3:focus {
+input.button1:focus, input.button2:focus {
 	outline-style: none;
 }
 
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html
index c5356e7b9d..822ab76313 100644
--- a/phpBB/adm/style/install_footer.html
+++ b/phpBB/adm/style/install_footer.html
@@ -11,6 +11,7 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
 <!-- INCLUDEJS admin.js -->
 {$SCRIPTS}
 
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 560bf501e9..99b98ef068 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -41,7 +41,7 @@ function dE(n, s, type)
 		<h1>{L_INSTALL_PANEL}</h1>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 		<!-- IF S_LANG_SELECT -->
-		<form method="post" action="">
+		<form method="post" action="#">
 			<fieldset class="nobg">
 				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
 				{S_LANG_SELECT}
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html
index c27304a425..150ef37e0e 100644
--- a/phpBB/adm/style/install_update_diff.html
+++ b/phpBB/adm/style/install_update_diff.html
@@ -223,7 +223,7 @@ table.hrdiff caption span {
 <!-- ENDIF -->
 <!-- IF not S_DIFF_NEW_FILE -->
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
-		<form method="post" action="">
+		<form method="post" action="#">
 		<fieldset class="quick">
 			<label for="diff_mode">{L_SELECT_DIFF_MODE}{L_COLON}</label>
 			<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 1fc1261489..7e7f0cecee 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -112,6 +112,8 @@ function popup(url, width, height, name)
 
 <body class="{S_CONTENT_DIRECTION} nojs">
 
+<!-- EVENT acp_overall_header_body_before -->
+
 <div id="wrap">
 	<div id="page-header">
 		<h1>{L_ADMIN_PANEL}</h1>
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 0ca751cd7e..770b7da8a6 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -106,4 +106,6 @@ function find_username(url)
 
 <body class="{S_CONTENT_DIRECTION}">
 
+<!-- EVENT acp_simple_header_body_before -->
+
 <div id="page-body" class="simple-page-body">