makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10563] Show deactivated styles below active styles in acp
This commit is contained in:
Oleg Pudeyev 2012-01-06 02:46:52 -05:00
commit 466acfdd94
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/adm/style/acp_styles.html
View file

@ -272,6 +272,12 @@
<td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td> <td class="row3" colspan="{$COLSPAN}"><strong>{L_INSTALLED}</strong></td>
</tr> </tr>
<!-- BEGIN installed --> <!-- 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> <tr>
<td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td> <td><strong>{installed.NAME}</strong><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
<!-- IF S_STYLE --> <!-- IF S_STYLE -->

3
phpBB/includes/acp/acp_styles.php
View file

@ -264,6 +264,7 @@ version = {VERSION}
{ {
case 'style': case 'style':
$sql_from = STYLES_TABLE; $sql_from = STYLES_TABLE;
$sql_sort = 'style_active DESC, ' . $sql_sort;
$sql = 'SELECT user_style, COUNT(user_style) AS style_count $sql = 'SELECT user_style, COUNT(user_style) AS style_count
FROM ' . USERS_TABLE . ' FROM ' . USERS_TABLE . '
@ -348,6 +349,8 @@ version = {VERSION}
'NAME' => $row[$mode . '_name'], 'NAME' => $row[$mode . '_name'],
'STYLE_COUNT' => ($mode == 'style' && isset($style_count[$row['style_id']])) ? $style_count[$row['style_id']] : 0, '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,
) )
); );
} }

1
phpBB/language/en/acp/styles.php
View file

@ -233,6 +233,7 @@ $lang = array_merge($lang, array(
'IMG_USER_ICON9' => 'User defined image 9', 'IMG_USER_ICON9' => 'User defined image 9',
'IMG_USER_ICON10' => 'User defined image 10', 'IMG_USER_ICON10' => 'User defined image 10',
'INACTIVE_STYLES' => 'Inactive styles',
'INCLUDE_DIMENSIONS' => 'Include dimensions', 'INCLUDE_DIMENSIONS' => 'Include dimensions',
'INCLUDE_TEMPLATE' => 'Include template', 'INCLUDE_TEMPLATE' => 'Include template',
'INCLUDE_THEME' => 'Include theme', 'INCLUDE_THEME' => 'Include theme',