diff --git a/upload/admin/index.php b/upload/admin/index.php index 59940e83b..8c30bac80 100644 --- a/upload/admin/index.php +++ b/upload/admin/index.php @@ -300,6 +300,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' ) { $template->assign_vars(array( 'USERS_ONLINE_HREF' => "index.php?pane=right&users_online=1&sid={$userdata['session_id']}", + 'SHOW_ONLINE_USERLIST' => $lang['SHOW_ONLINE_USERLIST'], )); } diff --git a/upload/config.php b/upload/config.php index 603826301..bac906f94 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.1 Stable'; -$bb_cfg['tp_release_state'] = 'R257'; -$bb_cfg['tp_release_date'] = '26-08-2011'; +$bb_cfg['tp_release_state'] = 'R260'; +$bb_cfg['tp_release_date'] = '28-08-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут"; diff --git a/upload/language/lang_english/lang_admin.php b/upload/language/lang_english/lang_admin.php index be21e7829..3b409b5af 100644 --- a/upload/language/lang_english/lang_admin.php +++ b/upload/language/lang_english/lang_admin.php @@ -73,6 +73,9 @@ $lang['TOPICS_DATA_SYNCHRONIZED'] = 'Topics data synchronized'; $lang['USER_POSTS_COUNT'] = 'User posts count'; $lang['USER POSTS COUNT SYNCHRONIZED'] = 'User posts count synchronized'; +// Online Userlist +$lang['SHOW_ONLINE_USERLIST'] = 'Show the list of online users'; + // //Welcome page // diff --git a/upload/language/lang_russian/lang_admin.php b/upload/language/lang_russian/lang_admin.php index a704207dd..9543d5802 100644 --- a/upload/language/lang_russian/lang_admin.php +++ b/upload/language/lang_russian/lang_admin.php @@ -91,6 +91,9 @@ $lang['TOPICS_DATA_SYNCHRONIZED'] = 'Темы синхронизированы'; $lang['USER_POSTS_COUNT'] = 'Количество сообщений пользователей.'; $lang['USER POSTS COUNT SYNCHRONIZED'] = 'Количество сообщений пользователей синхронизированы.'; +// Online Userlist +$lang['SHOW_ONLINE_USERLIST'] = 'Показать список пользователей онлайн'; + // // Auth pages // diff --git a/upload/templates/admin/index.tpl b/upload/templates/admin/index.tpl index f8ee94761..df273e5ef 100644 --- a/upload/templates/admin/index.tpl +++ b/upload/templates/admin/index.tpl @@ -170,7 +170,7 @@ table.forumline { margin: 0 auto; } -{L_WHOSONLINE} +{SHOW_ONLINE_USERLIST}