1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-19 23:20:22 +01:00

Merge pull request #5101 from senky/ticket/15529

[ticket/15529] Color groups in ACP
This commit is contained in:
Marc Alexander 2018-01-24 19:09:25 +01:00
commit 128a6e4c8d
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 3 additions and 2 deletions

View File

@ -316,7 +316,7 @@
<tbody>
<!-- ELSE -->
<tr>
<td><strong>{groups.GROUP_NAME}</strong></td>
<td><strong<!-- IF groups.GROUP_COLOR --> style="color: #{groups.GROUP_COLOR}"<!-- ENDIF -->>{groups.GROUP_NAME}</strong></td>
<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
<td style="text-align: center;">{groups.PENDING_MEMBERS}</td>
<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>

View File

@ -926,7 +926,7 @@ class acp_groups
);
// Get us all the groups
$sql = 'SELECT g.group_id, g.group_name, g.group_type
$sql = 'SELECT g.group_id, g.group_name, g.group_type, g.group_colour
FROM ' . GROUPS_TABLE . ' g
ORDER BY g.group_type ASC, g.group_name';
$result = $db->sql_query($sql);
@ -985,6 +985,7 @@ class acp_groups
'S_GROUP_SPECIAL' => ($row['group_type'] == GROUP_SPECIAL) ? true : false,
'GROUP_NAME' => $group_name,
'GROUP_COLOR' => $row['group_colour'],
'TOTAL_MEMBERS' => $row['total_members'],
'PENDING_MEMBERS' => $row['pending_members']
));