diff --git a/phpBB/templates/Default/viewonline_body.tpl b/phpBB/templates/Default/viewonline_body.tpl index 08bca63aed..c9e2ca6f9f 100644 --- a/phpBB/templates/Default/viewonline_body.tpl +++ b/phpBB/templates/Default/viewonline_body.tpl @@ -12,9 +12,9 @@ -  {userrow.USERNAME}  +  {userrow.USERNAME}   {userrow.LASTUPDATE}  -   {userrow.LOCATION}  +   {userrow.LOCATION}  diff --git a/phpBB/templates/PSO/overall_header.tpl b/phpBB/templates/PSO/overall_header.tpl index fdadda147c..99a3c8b490 100644 --- a/phpBB/templates/PSO/overall_header.tpl +++ b/phpBB/templates/PSO/overall_header.tpl @@ -17,7 +17,7 @@ - +
PSO Online ForumsphpBB2 development forums Back To {SITENAME}
diff --git a/phpBB/templates/PSO/viewforum_body.tpl b/phpBB/templates/PSO/viewforum_body.tpl index 4888fe4f8b..75429f667e 100644 --- a/phpBB/templates/PSO/viewforum_body.tpl +++ b/phpBB/templates/PSO/viewforum_body.tpl @@ -4,7 +4,7 @@ - +
{FORUM_NAME}
{L_MODERATOR} : {MODERATORS}		{FORUM_NAME}
{L_MODERATOR} : {MODERATORS}
diff --git a/phpBB/templates/PSO/viewonline_body.tpl b/phpBB/templates/PSO/viewonline_body.tpl index 08bca63aed..ad12fa97c9 100644 --- a/phpBB/templates/PSO/viewonline_body.tpl +++ b/phpBB/templates/PSO/viewonline_body.tpl @@ -1,23 +1,21 @@ - - - - - -
- - - - - - - - - - - - - - - -
There are {ACTIVE_USERS} logged in users and {GUEST_USERS} guest users browsing this board.
This data is based on users active over the past five minutes.
 {L_USERNAME}  {L_LAST_UPDATE}  {L_LOCATION} 
 {userrow.USERNAME}  {userrow.LASTUPDATE}   {userrow.LOCATION} 
- \ No newline at end of file +
+ + + +
+ + + + + + + + + + + + + + + +
There are {ACTIVE_USERS} logged in users and {GUEST_USERS} guest users browsing this board.
This data is based on users active over the past five minutes.
 {L_USERNAME}  {L_LAST_UPDATE}  {L_LOCATION} 
 {userrow.USERNAME}  {userrow.LASTUPDATE}  {userrow.LOCATION} 
\ No newline at end of file diff --git a/phpBB/templates/PSO/viewonline_footer.tpl b/phpBB/templates/PSO/viewonline_footer.tpl index 93e69a36f5..4b7e940e34 100644 --- a/phpBB/templates/PSO/viewonline_footer.tpl +++ b/phpBB/templates/PSO/viewonline_footer.tpl @@ -1,17 +1,6 @@ - +
- + + +
- - - - -
{S_TIMEZONE} - - - -
- - - -
{JUMPBOX}
{S_TIMEZONE}{JUMPBOX}
\ No newline at end of file diff --git a/phpBB/templates/PSO/viewonline_header.tpl b/phpBB/templates/PSO/viewonline_header.tpl index 98bac32367..8a76c56f8f 100644 --- a/phpBB/templates/PSO/viewonline_header.tpl +++ b/phpBB/templates/PSO/viewonline_header.tpl @@ -1,18 +1,5 @@ - - - - - +
- - - - -
{L_POSTEDTOTAL} -{TOTAL_POSTS}- {L_MESSAGES}.
- {L_WEHAVE} {TOTAL_USERS} {L_REGUSERS}.
- {L_NEWESTUSER} {NEWEST_USER} -
-
+ + -
{SITENAME} {L_INDEX}
- - \ No newline at end of file + \ No newline at end of file diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index f4d2ce99cc..31ae163e05 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -79,13 +79,27 @@ if($online_count) for($i = 0; $i < $online_count; $i++) { - if($row_color == "#DDDDDD") + if(!(ix % 2)) { - $row_color = "#CCCCCC"; + if(isset($theme['td_color1'])) + { + $row_color = "#".$theme['td_color1']; + } + else + { + $row_color = "#DDDDDD"; + } } else { - $row_color = "#DDDDDD"; + if(isset($theme['td_color2'])) + { + $row_color = "#".$theme['td_color2']; + } + else + { + $row_color = "#CCCCCC"; + } } if($onlinerow[$i]['user_id'] != ANONYMOUS && $onlinerow[$i]['user_id'] != DELETED) @@ -174,12 +188,12 @@ if($online_count) $template->assign_block_vars("userrow", array( "ROW_COLOR" => $row_color, - "USER_ID" => $onlinerow[$i]['user_id'], "USERNAME" => $username, "LOGGED_ON" => $logged_on, - "LASTUPDATE" => create_date($date_format, $onlinerow[$i]['session_time'], $sys_timezone), + "LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow[$i]['session_time'], $board_config['default__timezone']), "LOCATION" => $location, - "LOCATION_URL" => $location_url + "U_USER_PROFILE" => "profile.".$phpEx."?mode=viewprofile&".POST_USERS_URL."=".$onlinerow[$i]['user_id'], + "U_FORUM_LOCATION" => $location_url ) ); }