diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-01-06 02:46:52 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-01-06 02:46:52 -0500 |
| commit | 466acfdd943e37a3e1d98b12143894274fea9143 (patch) | |
| tree | f1a441e20933cbfad407fb6c7dbda8d8c60eaa20 | |
| parent | 2f010fe96e878540209f2923d7de807b77fd3420 (diff) | |
| parent | 95a74c7472ffa56d5fdcbbc2ec883d9f24db1037 (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/adm/style/acp_styles.html | 6 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/acp/styles.php | 1 |
3 files changed, 10 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 --> diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index f8a3b8e47e..c8fe748c02 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -264,6 +264,7 @@ version = {VERSION} { case 'style': $sql_from = STYLES_TABLE; + $sql_sort = 'style_active DESC, ' . $sql_sort; $sql = 'SELECT user_style, COUNT(user_style) AS style_count FROM ' . USERS_TABLE . ' @@ -348,6 +349,8 @@ version = {VERSION} 'NAME' => $row[$mode . '_name'], 'STYLE_COUNT' => ($mode == 'style' && isset($style_count[$row['style_id']])) ? $style_count[$row['style_id']] : 0, + + 'S_INACTIVE' => ($mode == 'style' && !$row['style_active']) ? true : false, ) ); } diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index ed69e96ea0..59df82477e 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -233,6 +233,7 @@ $lang = array_merge($lang, array( 'IMG_USER_ICON9' => 'User defined image 9', 'IMG_USER_ICON10' => 'User defined image 10', + 'INACTIVE_STYLES' => 'Inactive styles', 'INCLUDE_DIMENSIONS' => 'Include dimensions', 'INCLUDE_TEMPLATE' => 'Include template', 'INCLUDE_THEME' => 'Include theme', |