diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index b58dbc5b0..58e9c7f0d 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -1372,7 +1372,7 @@ CREATE TABLE IF NOT EXISTS `bb_users` ( `user_new_privmsg` smallint(5) unsigned NOT NULL default '0', `user_unread_privmsg` smallint(5) unsigned NOT NULL default '0', `user_last_privmsg` int(11) NOT NULL default '0', - `user_opt` int(11) NOT NULL default '0', + `user_opt` int(11) NOT NULL default '1', `user_rank` int(11) NOT NULL default '0', `user_avatar` varchar(100) NOT NULL default '', `user_avatar_type` tinyint(4) NOT NULL default '0', diff --git a/upload/admin/admin_log.php b/upload/admin/admin_log.php index 972d4cf93..7402762b0 100644 --- a/upload/admin/admin_log.php +++ b/upload/admin/admin_log.php @@ -380,7 +380,7 @@ else $log_type_select = array($lang['ACTS_LOG_ALL_ACTIONS'] => $all_types) + $log_action->log_type_select; // Order select -$order_options = ''; +$order_options = ''; $template->assign_vars(array( 'LOG_COLSPAN' => 4, @@ -389,7 +389,7 @@ $template->assign_vars(array( 'DATETIME_VAL' => date('Y-m-d', $datetime_val), 'DAYSBACK_NAME' => $daysback_key, 'DAYSBACK_VAL' => $daysback_val, - 'FIRST_LOG_TIME' => ($first_log_time) ? date('Y-m-d', $first_log_time) : 'none', + 'FIRST_LOG_TIME' => ($first_log_time) ? date('Y-m-d', $first_log_time) : $lang['ACC_NONE'], 'TITLE_MATCH_MAX' => $title_match_max_len, 'TITLE_MATCH_NAME' => $title_match_key, diff --git a/upload/config.php b/upload/config.php index 861ec28a9..183efd3c8 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.1 Beta'; -$bb_cfg['tp_release_state'] = 'R207'; +$bb_cfg['tp_release_state'] = 'R208'; $bb_cfg['tp_release_date'] = '12-08-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger diff --git a/upload/language/lang_english/lang_log_action.php b/upload/language/lang_english/lang_log_action.php index 01c74a494..a8d1ea3c2 100644 --- a/upload/language/lang_english/lang_log_action.php +++ b/upload/language/lang_english/lang_log_action.php @@ -25,4 +25,6 @@ $lang['ACTS_LOG_SORT_BY'] = 'Sort by'; $lang['ACTS_LOG_LOGS_ACTION'] = 'Action'; $lang['ACTS_LOG_USERNAME'] = 'Username'; $lang['ACTS_LOG_TIME'] = 'Time'; -$lang['ACTS_LOG_INFO'] = 'Info'; \ No newline at end of file +$lang['ACTS_LOG_INFO'] = 'Info'; +$lang['ACTS_LOG_FILTER'] = 'Filter'; +$lang['ACTS_LOG_TOPICS'] = 'Topics:'; \ No newline at end of file diff --git a/upload/language/lang_russian/lang_admin.php b/upload/language/lang_russian/lang_admin.php index 6cdc73051..c76958519 100644 --- a/upload/language/lang_russian/lang_admin.php +++ b/upload/language/lang_russian/lang_admin.php @@ -20,7 +20,6 @@ $lang['CREATE_NEW'] = 'Создать'; $lang['ADD_NEW'] = 'Добавить'; $lang['FLAGS'] = 'Флаги'; $lang['REBUILD_SEARCH_INDEX'] = 'Перечесть индексы поиска'; -$lang['ACTIONS_LOG'] = 'Лог действий'; $lang['FORUM_CONFIG'] = 'Настройки форумов'; $lang['TRACKER_CONFIG'] = 'Настройки трекера'; $lang['RELEASE_TEMPLATES'] = 'Шаблоны для релизов'; diff --git a/upload/language/lang_russian/lang_log_action.php b/upload/language/lang_russian/lang_log_action.php index e38dffb19..d56f2ea60 100644 --- a/upload/language/lang_russian/lang_log_action.php +++ b/upload/language/lang_russian/lang_log_action.php @@ -16,13 +16,15 @@ $lang['ACTS_LOG_ALL_ACTIONS'] = 'Все действия'; $lang['ACTS_LOG_SEARCH_OPTIONS'] = 'Настройки отчета по действиям'; $lang['ACTS_LOG_FORUM'] = 'Форум'; $lang['ACTS_LOG_ACTION'] = 'Действие'; -$lang['ACTS_LOG_USER'] = 'Юзер'; +$lang['ACTS_LOG_USER'] = 'Пользователь'; $lang['ACTS_LOG_LOGS_FROM'] = 'Логи с '; -$lang['ACTS_LOG_FIRST'] = 'сначала '; +$lang['ACTS_LOG_FIRST'] = 'сначала: '; $lang['ACTS_LOG_DAYS_BACK'] = 'дней назад'; $lang['ACTS_LOG_TOPIC_MATCH'] = 'Совпадение с названием темы'; $lang['ACTS_LOG_SORT_BY'] = 'Сотировать по'; $lang['ACTS_LOG_LOGS_ACTION'] = 'Действие'; $lang['ACTS_LOG_USERNAME'] = 'Имя пользователя'; $lang['ACTS_LOG_TIME'] = 'Время'; -$lang['ACTS_LOG_INFO'] = 'Инфо'; \ No newline at end of file +$lang['ACTS_LOG_INFO'] = 'Инфо'; +$lang['ACTS_LOG_FILTER'] = 'Фильтр'; +$lang['ACTS_LOG_TOPICS'] = 'Топик:'; \ No newline at end of file diff --git a/upload/templates/admin/admin_log.tpl b/upload/templates/admin/admin_log.tpl index b64f8feaa..bf7625154 100644 --- a/upload/templates/admin/admin_log.tpl +++ b/upload/templates/admin/admin_log.tpl @@ -14,7 +14,7 @@ table.log_filters td { - + - - - - - - + + + + +
Log actions: search options{L_ACTS_LOG_SEARCH_OPTIONS}
@@ -22,7 +22,7 @@ table.log_filters td {
- Forum + {L_ACTS_LOG_FORUM}

{SEL_FORUM}

@@ -30,7 +30,7 @@ table.log_filters td {
- Action + {L_ACTS_LOG_ACTION}

{SEL_LOG_TYPE}

@@ -38,7 +38,7 @@ table.log_filters td {
- User + {L_ACTS_LOG_USER}

{SEL_USERS}

@@ -54,20 +54,20 @@ table.log_filters td {
- Logs from (first: {FIRST_LOG_TIME}) + {L_ACTS_LOG_LOGS_FROM} ({L_ACTS_LOG_FIRST}{FIRST_LOG_TIME})

& - days back + {L_ACTS_LOG_DAYS_BACK}

- Topic title match + {L_ACTS_LOG_TOPIC_MATCH}

@@ -75,7 +75,7 @@ table.log_filters td {
- Sort by + {L_ACTS_LOG_SORT_BY}

@@ -102,10 +102,10 @@ table.log_filters td { - - - - + + + + @@ -174,7 +174,7 @@ table.log_filters td {
-Filter +{L_ACTS_LOG_FILTER}
ActionUsernameTimeInfo{L_ACTS_LOG_LOGS_ACTION}{L_ACTS_LOG_USERNAME}{L_ACTS_LOG_TIME}{L_ACTS_LOG_INFO}
@@ -190,7 +190,7 @@ table.log_filters td {
-

Topics:

+

{L_ACTS_LOG_TOPICS}

{topics.TOPIC_TITLE}

@@ -201,7 +201,7 @@ table.log_filters td {
-

Users:

+

{L_ACTS_LOG_USER}:

{users.USERNAME}

@@ -212,5 +212,4 @@ table.log_filters td {

- - + \ No newline at end of file diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/templates/default/usercp_viewprofile.tpl index 2f363473c..6b6afad0e 100644 --- a/upload/templates/default/usercp_viewprofile.tpl +++ b/upload/templates/default/usercp_viewprofile.tpl @@ -453,7 +453,7 @@ $(document).ready(function(){
+ {L_SEARCH_DL_WILL_DOWNLOADS} :: diff --git a/upload/templates/xs_mod/tpl/cache.tpl b/upload/templates/xs_mod/tpl/cache.tpl index 0d679fd8d..522f3a263 100644 --- a/upload/templates/xs_mod/tpl/cache.tpl +++ b/upload/templates/xs_mod/tpl/cache.tpl @@ -1,19 +1,3 @@ - -/*************************************************************************** - * cache.tpl - * --------- - * copyright : (C) 2003 - 2005 CyberAlien - * support : http://www.phpbbstyles.com - * - * version : 2.3.1 - * - * file revision : 55 - * project revision : 78 - * last modified : 05 Dec 2005 13:54:55 - * - ***************************************************************************/ - -

{L_XS_MANAGE_CACHE}

@@ -25,11 +9,11 @@

{L_XS_MANAGE_CACHE}
{L_XS_TEMPLATE}{L_XS_STYLES}{L_XS_CLEAR_ALL_LC}{L_XS_COMPILE_ALL_LC}
{L_XS_TEMPLATE}{L_XS_STYLES}{L_XS_CLEAR_ALL_LC}{L_XS_COMPILE_ALL_LC}