diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-22 13:22:13 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-22 13:22:13 +0100 |
| commit | 4e58a03c20181b44cc331dcf59d8b4a83e3ed834 (patch) | |
| tree | 1ef9be24734ed191388d054564dc9faa11c98578 /phpBB | |
| parent | 3654ba4a35ce706f969c064c146d19d0e361969d (diff) | |
| parent | e4f6d9bc907e4aa00ca8c3582f708b4aa0d0d449 (diff) | |
| download | forums-4e58a03c20181b44cc331dcf59d8b4a83e3ed834.tar forums-4e58a03c20181b44cc331dcf59d8b4a83e3ed834.tar.gz forums-4e58a03c20181b44cc331dcf59d8b4a83e3ed834.tar.bz2 forums-4e58a03c20181b44cc331dcf59d8b4a83e3ed834.tar.xz forums-4e58a03c20181b44cc331dcf59d8b4a83e3ed834.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/12292' into develop-ascraeus
* vsephpbb/ticket/12292:
[ticket/12292] Improve style details page
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_styles.html | 16 | ||||
| -rw-r--r-- | phpBB/adm/style/admin.css | 4 | ||||
| -rw-r--r-- | 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};">« {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}" /> + <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) { |