aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-01-06 02:45:35 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-01-06 02:45:35 -0500
commit95a74c7472ffa56d5fdcbbc2ec883d9f24db1037 (patch)
tree96c79f46985194bef28db7bce02be55ffe459a8d /phpBB/adm
parent3e7a0a37461e95f2c97d90230745f7e273565eec (diff)
parent23363efaaacd2bec39a51c27db51a2777e7a4c21 (diff)
downloadforums-95a74c7472ffa56d5fdcbbc2ec883d9f24db1037.tar
forums-95a74c7472ffa56d5fdcbbc2ec883d9f24db1037.tar.gz
forums-95a74c7472ffa56d5fdcbbc2ec883d9f24db1037.tar.bz2
forums-95a74c7472ffa56d5fdcbbc2ec883d9f24db1037.tar.xz
forums-95a74c7472ffa56d5fdcbbc2ec883d9f24db1037.zip
Merge remote-tracking branch 'cyberalien/ticket/10563' into develop-olympus
* cyberalien/ticket/10563: [ticket/10563] Show deactivated styles below active styles in acp
Diffstat (limited to 'phpBB/adm')
-rw-r--r--phpBB/adm/style/acp_styles.html6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index 098cc723d9..6aa1c0ccc9 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -402,6 +402,12 @@
<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td>
</tr>
<!-- BEGIN installed -->
+ <!-- IF installed.S_INACTIVE and not $INACTIVE_STYLES -->
+ <!-- DEFINE $INACTIVE_STYLES = 1 -->
+ <tr>
+ <td class="row3" colspan="{$COLSPAN}"><strong>{L_INACTIVE_STYLES}</strong></td>
+ </tr>
+ <!-- ENDIF -->
<tr>
<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
<!-- IF S_STYLE -->