aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-01-06 02:46:52 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-01-06 02:46:52 -0500
commit466acfdd943e37a3e1d98b12143894274fea9143 (patch)
treef1a441e20933cbfad407fb6c7dbda8d8c60eaa20 /phpBB/adm/style
parent2f010fe96e878540209f2923d7de807b77fd3420 (diff)
parent95a74c7472ffa56d5fdcbbc2ec883d9f24db1037 (diff)
downloadforums-466acfdd943e37a3e1d98b12143894274fea9143.tar
forums-466acfdd943e37a3e1d98b12143894274fea9143.tar.gz
forums-466acfdd943e37a3e1d98b12143894274fea9143.tar.bz2
forums-466acfdd943e37a3e1d98b12143894274fea9143.tar.xz
forums-466acfdd943e37a3e1d98b12143894274fea9143.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10563] Show deactivated styles below active styles in acp
Diffstat (limited to 'phpBB/adm/style')
-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 fdab2ecf88..dc89aa247a 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -272,6 +272,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 -->