Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #453 from marc1706/ticket/452

Browse Source 
[ticket/452] Correctly show groups in leaders module
This commit is contained in:
Marc Alexander
2015-02-01 01:21:16 +01:00
parent d4bd1db22e 44fae8c7cb
commit a1375a4d6b
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/leaders.php
View File

@@ -101,7 +101,7 @@ class leaders extends module_base
{ {
$sql = 'SELECT group_id, group_name, group_colour, group_type $sql = 'SELECT group_id, group_name, group_colour, group_type
FROM ' . GROUPS_TABLE . ' FROM ' . GROUPS_TABLE . '
WHERE group_legend = 1 WHERE group_legend >= 1
ORDER BY group_name ASC'; ORDER BY group_name ASC';
} }
else else
@@ -114,7 +114,7 @@ class leaders extends module_base
AND ug.user_id = ' . $this->user->data['user_id'] . ' AND ug.user_id = ' . $this->user->data['user_id'] . '
AND ug.user_pending = 0 AND ug.user_pending = 0
) )
WHERE g.group_legend = 1 WHERE g.group_legend >= 1
AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $this->user->data['user_id'] . ') AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $this->user->data['user_id'] . ')
ORDER BY g.group_name ASC'; ORDER BY g.group_name ASC';
} }

6
styles/prosilver/template/portal/modules/leaders_side.html
View File

@@ -7,9 +7,9 @@
<!-- END b3p_admins --> <!-- END b3p_admins -->
<br class="portal-clear" /> <br class="portal-clear" />
<strong class="portal-user-span">{L_MODERATORS}</strong><br class="portal-clear" /> <strong class="portal-user-span">{L_MODERATORS}</strong><br class="portal-clear" />
<!-- BEGIN b3p_moderator --> <!-- BEGIN b3p_moderators -->
<span class="portal-user-icon"></span><span class="portal-user-span"><strong>{b3p_moderator.USERNAME_FULL}</strong></span><br class="portal-clear" /> <span class="portal-user-icon"></span><span class="portal-user-span"><strong>{b3p_moderators.USERNAME_FULL}</strong></span><br class="portal-clear" />
<!-- BEGINELSE --> <!-- BEGINELSE -->
{L_NO_MODERATORS_P} {L_NO_MODERATORS_P}
<!-- END b3p_moderator --> <!-- END b3p_moderators -->
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}

8
styles/subsilver2/template/portal/modules/leaders_side.html
View File

@@ -27,13 +27,13 @@
<strong>{L_MODERATORS}</strong> <strong>{L_MODERATORS}</strong>
</td> </td>
</tr> </tr>
<!-- BEGIN b3p_moderator --> <!-- BEGIN b3p_moderators -->
<tr class="row1"> <tr class="row1">
<td> <td>
<!-- IF S_CONTENT_DIRECTION eq 'rtl' --> <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
<span class="portal-user-span" style="float:right;"></span><span style="float:right; padding-right:5px; padding-top:2px;"><strong>{b3p_moderator.USERNAME_FULL}</strong></span><br style="clear:both" /> <span class="portal-user-span" style="float:right;"></span><span style="float:right; padding-right:5px; padding-top:2px;"><strong>{b3p_moderators.USERNAME_FULL}</strong></span><br style="clear:both" />
<!-- ELSE --> <!-- ELSE -->
<span class="portal-user-span" style="float:left;"></span><span style="float:left; padding-left:5px; padding-top:2px;"><strong>{b3p_moderator.USERNAME_FULL}</strong></span><br style="clear:both" /> <span class="portal-user-span" style="float:left;"></span><span style="float:left; padding-left:5px; padding-top:2px;"><strong>{b3p_moderators.USERNAME_FULL}</strong></span><br style="clear:both" />
<!-- ENDIF --> <!-- ENDIF -->
</td> </td>
</tr> </tr>
@@ -43,6 +43,6 @@
{L_NO_MODERATORS_P} {L_NO_MODERATORS_P}
</td> </td>
</tr> </tr>
<!-- END b3p_moderator --> <!-- END b3p_moderators -->
</table> </table>
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}