makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 01:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* 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
This commit is contained in:
Marc Alexander 2014-05-12 13:10:23 +02:00
commit ddced2ac4d
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/adm/style/acp_ext_disable.html
View file

@ -8,19 +8,19 @@
<p>{L_EXTENSION_DISABLE_EXPLAIN}</p> <p>{L_EXTENSION_DISABLE_EXPLAIN}</p>
<!-- IF PRE --> <!-- IF PRE -->
<div class="errorbox"> <fieldset>
<h2>{L_CONFIRM}</h2>
<p>{L_CONFIRM_MESSAGE}</p> <p>{L_CONFIRM_MESSAGE}</p>
</div> </fieldset>
<form id="acp_extensions" method="post" action="{U_DISABLE}"> <form id="acp_extensions" method="post" action="{U_DISABLE}">
<fieldset class="submit-buttons"> <fieldset class="submit-buttons">
<legend>{L_EXTENSION_DISABLE}</legend>
<input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" /> <input class="button1" type="submit" name="disable" value="{L_EXTENSION_DISABLE}" />
<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /> <input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
</fieldset> </fieldset>
</form> </form>
<!-- ELSEIF S_NEXT_STEP --> <!-- ELSEIF S_NEXT_STEP -->
<div class="errorbox"> <div class="successbox notice">
<p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p> <p>{L_EXTENSION_DISABLE_IN_PROGRESS}</p>
</div> </div>
<!-- ELSE --> <!-- ELSE -->

8
phpBB/adm/style/acp_ext_enable.html
View file

@ -14,19 +14,19 @@
<p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p> <p><a href="{U_RETURN}">{L_RETURN_TO_EXTENSION_LIST}</a></p>
</div> </div>
<!-- ELSEIF PRE --> <!-- ELSEIF PRE -->
<div class="errorbox"> <fieldset>
<h2>{L_CONFIRM}</h2>
<p>{L_CONFIRM_MESSAGE}</p> <p>{L_CONFIRM_MESSAGE}</p>
</div> </fieldset>
<form id="acp_extensions" method="post" action="{U_ENABLE}"> <form id="acp_extensions" method="post" action="{U_ENABLE}">
<fieldset class="submit-buttons"> <fieldset class="submit-buttons">
<legend>{L_EXTENSION_ENABLE}</legend>
<input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" /> <input class="button1" type="submit" name="enable" value="{L_EXTENSION_ENABLE}" />
<input class="button2" type="submit" name="cancel" value="{L_CANCEL}" /> <input class="button2" type="submit" name="cancel" value="{L_CANCEL}" />
</fieldset> </fieldset>
</form> </form>
<!-- ELSEIF S_NEXT_STEP --> <!-- ELSEIF S_NEXT_STEP -->
<div class="errorbox"> <div class="successbox notice">
<p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p> <p>{L_EXTENSION_ENABLE_IN_PROGRESS}</p>
</div> </div>
<!-- ELSE --> <!-- ELSE -->

4
phpBB/adm/style/admin.css
View file

@ -1076,6 +1076,10 @@ fieldset {
border-radius: 3px; border-radius: 3px;
} }
fieldset h2 {
margin-top: 0;
}
.rtl fieldset { .rtl fieldset {
border-top: 1px solid #D7D7D7; border-top: 1px solid #D7D7D7;
border-right: 1px solid #D7D7D7; border-right: 1px solid #D7D7D7;

4
tests/functional/extension_acp_test.php
View file

@ -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()); $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); $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() 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()); $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); $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() public function test_delete_data_pre()