diff options
| author | Jakub Senko <jakubsenko@gmail.com> | 2018-01-21 11:04:07 +0100 |
|---|---|---|
| committer | Jakub Senko <jakubsenko@gmail.com> | 2018-01-21 11:04:07 +0100 |
| commit | 875dc63c6f2e98ccedad153ad3761f11bf24ff5d (patch) | |
| tree | 59bd6577172b1de79285f1311eed5663093ba17b | |
| parent | d0143bec8830e709047443f73f79c0dce438e3fc (diff) | |
| download | forums-875dc63c6f2e98ccedad153ad3761f11bf24ff5d.tar forums-875dc63c6f2e98ccedad153ad3761f11bf24ff5d.tar.gz forums-875dc63c6f2e98ccedad153ad3761f11bf24ff5d.tar.bz2 forums-875dc63c6f2e98ccedad153ad3761f11bf24ff5d.tar.xz forums-875dc63c6f2e98ccedad153ad3761f11bf24ff5d.zip | |
[ticket/15529] Color groups in ACP
PHPBB3-15529
| -rw-r--r-- | phpBB/adm/style/acp_groups.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 26d7030531..d0096370d9 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -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> diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 70ae9876f4..0e058213e0 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -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'] )); |