From 1d4c20b3d2222502ed495212668f6fca8d67e52d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 12 May 2014 10:49:52 +0200
Subject: [PATCH 1/3] [ticket/12534] Do not abuse errorbox for en/disable
 confirmation of extensions

PHPBB3-12534
---
 phpBB/adm/style/acp_ext_disable.html | 6 +++---
 phpBB/adm/style/acp_ext_enable.html  | 6 +++---
 phpBB/adm/style/admin.css            | 4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index d650544ff7..3b09177a76 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -8,13 +8,13 @@
 	<p>{L_EXTENSION_DISABLE_EXPLAIN}</p>
 
 	<!-- IF PRE -->
-	<div class="errorbox">
+	<fieldset>
+		<h2>{L_CONFIRM}</h2>
 		<p>{L_CONFIRM_MESSAGE}</p>
-	</div>
+	</fieldset>
 
 	<form id="acp_extensions" method="post" action="{U_DISABLE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_EXTENSION_DISABLE}</legend>
 		<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" />
 		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 42523f1f58..6bbd8c245b 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -14,13 +14,13 @@
 		<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
 	</div>
 	<!-- ELSEIF PRE -->
-	<div class="errorbox">
+	<fieldset>
+		<h2>{L_CONFIRM}</h2>
 		<p>{L_CONFIRM_MESSAGE}</p>
-	</div>
+	</fieldset>
 
 	<form id="acp_extensions" method="post" action="{U_ENABLE}">
 	<fieldset class="submit-buttons">
-		<legend>{L_EXTENSION_ENABLE}</legend>
 		<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" />
 		<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
 	</fieldset>
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 60a5cd9472..a61890bc75 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1076,6 +1076,10 @@ fieldset {
 	border-radius: 3px;
 }
 
+fieldset h2 {
+	margin-top: 0;
+}
+
 .rtl fieldset {
 	border-top: 1px solid #D7D7D7;
 	border-right: 1px solid #D7D7D7;

From 0c6ef9aabfb45f6fbf106da9a194c561f2bd2ecc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 12 May 2014 11:35:59 +0200
Subject: [PATCH 2/3] [ticket/12534] Do not use errorbox for multi steps

PHPBB3-12534
---
 phpBB/adm/style/acp_ext_disable.html | 2 +-
 phpBB/adm/style/acp_ext_enable.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html
index 3b09177a76..d2b5c46fe8 100644
--- a/phpBB/adm/style/acp_ext_disable.html
+++ b/phpBB/adm/style/acp_ext_disable.html
@@ -20,7 +20,7 @@
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="errorbox">
+		<div class="successbox notice">
 			<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p>
 		</div>
 	<!-- ELSE -->
diff --git a/phpBB/adm/style/acp_ext_enable.html b/phpBB/adm/style/acp_ext_enable.html
index 6bbd8c245b..8a4a35359e 100644
--- a/phpBB/adm/style/acp_ext_enable.html
+++ b/phpBB/adm/style/acp_ext_enable.html
@@ -26,7 +26,7 @@
 	</fieldset>
 	</form>
 	<!-- ELSEIF S_NEXT_STEP -->
-		<div class="errorbox">
+		<div class="successbox notice">
 			<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p>
 		</div>
 	<!-- ELSE -->

From b3eb38ecaf0e3b5d33788bc70c152a9544974b13 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 12 May 2014 11:38:14 +0200
Subject: [PATCH 3/3] [ticket/12534] Fix filter for functional tests

PHPBB3-12534
---
 tests/functional/extension_acp_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 5f02158e20..8a724f2133 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -157,7 +157,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 		$this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('div.main thead')->text());
 
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
-		$this->assertContains($this->lang('EXTENSION_ENABLE_CONFIRM', 'phpBB Moo Extension'), $crawler->filter('.errorbox')->text());
+		$this->assertContains($this->lang('EXTENSION_ENABLE_CONFIRM', 'phpBB Moo Extension'), $crawler->filter('#main')->text());
 	}
 
 	public function test_disable_pre()
@@ -169,7 +169,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 		$this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('div.main thead')->text());
 
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=vendor2%2Ffoo&sid=' . $this->sid);
-		$this->assertContains($this->lang('EXTENSION_DISABLE_CONFIRM', 'phpBB Foo Extension'), $crawler->filter('.errorbox')->text());
+		$this->assertContains($this->lang('EXTENSION_DISABLE_CONFIRM', 'phpBB Foo Extension'), $crawler->filter('#main')->text());
 	}
 
 	public function test_delete_data_pre()