From e4f6d9bc907e4aa00ca8c3582f708b4aa0d0d449 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 20 Mar 2014 18:11:45 -0700
Subject: [PATCH] [ticket/12292] Improve style details page

http://tracker.phpbb.com/browse/PHPBB3-12292
Gave style details page a proper heading and back button.
Also removed a few obsolete code leftovers in the style
and CSS.

PHPBB3-12292
---
 phpBB/adm/style/acp_styles.html   | 16 ++++++----------
 phpBB/adm/style/admin.css         |  4 ++--
 phpBB/includes/acp/acp_styles.php |  3 +++
 3 files changed, 11 insertions(+), 12 deletions(-)

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/admin.css b/phpBB/adm/style/admin.css
index d6377453d1..e29adc988c 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/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index d5492d85a3..3f9d21f56c 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -530,6 +530,9 @@ class acp_styles
 			return;
 		}
 
+		// Show page title
+		$this->welcome_message('ACP_STYLES', null);
+
 		// Show parent styles
 		foreach ($list as $row)
 		{