diff options
author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-03-17 00:54:10 +0000 |
---|---|---|
committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-03-17 00:54:10 +0000 |
commit | fa7d11ae8e68d071eae358723aec4dc118daeb65 (patch) | |
tree | 4bf404625c3f24a4dbb734ebcfa75d4d5c270eab /phpBB | |
parent | e975227cffd51f6243891f679ee301edf0941907 (diff) | |
download | forums-fa7d11ae8e68d071eae358723aec4dc118daeb65.tar forums-fa7d11ae8e68d071eae358723aec4dc118daeb65.tar.gz forums-fa7d11ae8e68d071eae358723aec4dc118daeb65.tar.bz2 forums-fa7d11ae8e68d071eae358723aec4dc118daeb65.tar.xz forums-fa7d11ae8e68d071eae358723aec4dc118daeb65.zip |
Output group colour legend here too
git-svn-id: file:///svn/phpbb/trunk@3651 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r-- | phpBB/templates/subSilver/memberlist_body.html | 6 | ||||
-rw-r--r-- | phpBB/templates/subSilver/viewonline_body.html | 4 | ||||
-rw-r--r-- | phpBB/viewonline.php | 14 |
3 files changed, 19 insertions, 5 deletions
diff --git a/phpBB/templates/subSilver/memberlist_body.html b/phpBB/templates/subSilver/memberlist_body.html index f8c79d972d..e0acef436a 100644 --- a/phpBB/templates/subSilver/memberlist_body.html +++ b/phpBB/templates/subSilver/memberlist_body.html @@ -67,7 +67,7 @@ function marklist(status) <td class="row2"><select name="joined_select">{S_JOINED_TIME_OPTIONS}</select> <input class="post" type="text" name="joined" value="{JOINED}" /></td> </tr> <tr> - <td class="row1"><span class="gen">{L_ACTIVE}:</span></td> + <td class="row1"><span class="gen">{L_LAST_ACTIVE}:</span></td> <td class="row2"><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="post" type="text" name="active" value="{ACTIVE}" /></td> </tr> <tr> @@ -80,7 +80,7 @@ function marklist(status) </tr> <tr> <td class="row1"><span class="gen">{L_SORT_BY}: </td> - <td class="row2" valign="middle" nowrap="nowrap">{S_SORT_OPTIONS} {S_ORDER_SELECT} </td> + <td class="row2" valign="middle" nowrap="nowrap"><select name="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select> </td> </tr> <tr> <td class="cat" colspan="2" align="center"><input class="liteoption" type="submit" name="submit" value="{L_SEARCH}" /> <input class="liteoption" type="reset" value="{L_RESET}" /></td> @@ -139,7 +139,7 @@ function marklist(status) <table width="100%" cellspacing="2" cellpadding="0" border="0"> <tr> - <td class="nav" valign="top">{PAGE_NUMBER}</td> + <td class="nav" valign="top">{PAGE_NUMBER} :: {TOTAL_USERS}</td> <td align="right"><span class="gensmall"><!-- IF S_SEARCH_USER --><b><a href="javascript:marklist(true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist(false);">{L_UNMARK_ALL}</a></b><br /><br /><!-- ENDIF -->{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span></td> </tr> </table></form> diff --git a/phpBB/templates/subSilver/viewonline_body.html b/phpBB/templates/subSilver/viewonline_body.html index e5b35d170b..fd8ce85052 100644 --- a/phpBB/templates/subSilver/viewonline_body.html +++ b/phpBB/templates/subSilver/viewonline_body.html @@ -26,8 +26,8 @@ <td class="gen" width="40%"> <a href="{reg_user_row.U_FORUM_LOCATION}">{reg_user_row.FORUM_LOCATION}</a> </td> </tr> <!-- END reg_user_row --> - <tr> - <td class="row3" colspan="3" height="1"><img src="images/spacer.gif" width="1" height="1" alt=""></td> + <tr> + <td colspan="3" class="row3"><b class="gensmall">{L_LEGEND} :: {LEGEND}</b></td> </tr> <tr> <td class="cat" colspan="3" height="28"><b class="cattitle">{TOTAL_GUEST_USERS_ONLINE}</b></td> diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 7808f4730b..371646d9bd 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -247,9 +247,23 @@ else $l_g_user_s = $user->lang['Guest_users_online']; } +// Grab group details for legend display +$sql = "SELECT group_name, group_colour, group_type + FROM " . GROUPS_TABLE . " + WHERE group_colour <> '' + AND group_display = 1"; +$result = $db->sql_query($sql); + +$legend = ''; +while ($row = $db->sql_fetchrow($result)) +{ + $legend .= (($legend != '') ? ', ' : '') . '<span style="color:#' . $row['group_colour'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</span>'; +} + $template->assign_vars(array( 'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users), 'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_users), + 'LEGEND' => $legend, 'META' => '<meta http-equiv="refresh" content="60; url=viewonline.' . $phpEx . $SID . '">', |