diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-05-12 13:09:44 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-05-12 13:09:44 +0200 |
| commit | b62c39c36e39d4b2fad1225106407a4083808ca0 (patch) | |
| tree | 035bd0c49360f900f2c26693c17ff13bab389ac0 /phpBB | |
| parent | bfacf2d6eb37372f2109a76a34b777e0af560a18 (diff) | |
| parent | b3eb38ecaf0e3b5d33788bc70c152a9544974b13 (diff) | |
| download | forums-b62c39c36e39d4b2fad1225106407a4083808ca0.tar forums-b62c39c36e39d4b2fad1225106407a4083808ca0.tar.gz forums-b62c39c36e39d4b2fad1225106407a4083808ca0.tar.bz2 forums-b62c39c36e39d4b2fad1225106407a4083808ca0.tar.xz forums-b62c39c36e39d4b2fad1225106407a4083808ca0.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/12534' into develop-ascraeus
* nickvergessen/ticket/12534:
[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
Diffstat (limited to 'phpBB')
| -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 |
3 files changed, 12 insertions, 8 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; |