diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-05-12 13:10:23 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-05-12 13:10:23 +0200 |
| commit | ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5 (patch) | |
| tree | 035bd0c49360f900f2c26693c17ff13bab389ac0 | |
| parent | 4f8b33cc14fb8337202794813c0ca29dc8262677 (diff) | |
| parent | b62c39c36e39d4b2fad1225106407a4083808ca0 (diff) | |
| download | forums-ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5.tar forums-ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5.tar.gz forums-ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5.tar.bz2 forums-ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5.tar.xz forums-ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12534] Fix filter for functional tests
[ticket/12534] Do not use errorbox for multi steps
[ticket/12534] Do not abuse errorbox for en/disable confirmation of extensions
| -rw-r--r-- | phpBB/adm/style/acp_ext_disable.html | 8 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_ext_enable.html | 8 | ||||
| -rw-r--r-- | phpBB/adm/style/admin.css | 4 | ||||
| -rw-r--r-- | tests/functional/extension_acp_test.php | 4 |
4 files changed, 14 insertions, 10 deletions
diff --git a/phpBB/adm/style/acp_ext_disable.html b/phpBB/adm/style/acp_ext_disable.html index d650544ff7..d2b5c46fe8 100644 --- a/phpBB/adm/style/acp_ext_disable.html +++ b/phpBB/adm/style/acp_ext_disable.html @@ -8,19 +8,19 @@ <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> </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 42523f1f58..8a4a35359e 100644 --- a/phpBB/adm/style/acp_ext_enable.html +++ b/phpBB/adm/style/acp_ext_enable.html @@ -14,19 +14,19 @@ <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> </form> <!-- ELSEIF S_NEXT_STEP --> - <div class="errorbox"> + <div class="successbox notice"> <p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p> </div> <!-- ELSE --> 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; 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() |