From fc8b2740d8ca3990acf2964ee4dff06fa3ef4c9c Mon Sep 17 00:00:00 2001 From: Exile Date: Sat, 20 Dec 2014 20:38:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=90=D0=B4=D0=BC=D0=B8=D0=BD=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Мелкие изменения в выводе. --- admin/admin_log.php | 16 +++------------- install/upgrade/changes.txt | 3 ++- library/language/en/main.php | 3 ++- library/language/ru/main.php | 3 ++- library/language/uk/main.php | 3 ++- styles/templates/admin/admin_log.tpl | 13 ++++++------- 6 files changed, 17 insertions(+), 24 deletions(-) diff --git a/admin/admin_log.php b/admin/admin_log.php index 5c457b62b..9d5285681 100644 --- a/admin/admin_log.php +++ b/admin/admin_log.php @@ -182,9 +182,7 @@ if ($var =& $_REQUEST[$title_match_key]) } } -// // SQL -// $where = " WHERE l.log_time BETWEEN '$time_start_val' AND '$time_end_val'"; $where .= ($type_csv) ? " AND l.log_type_id IN($type_csv)" : ''; $where .= ($user_csv) ? " AND l.log_user_id IN($user_csv)" : ''; @@ -193,7 +191,7 @@ $where .= ($topic_csv) ? " AND l.log_topic_id IN($topic_csv)" : ''; $where .= ($title_match_sql) ? " AND MATCH (l.log_topic_title) AGAINST ('$title_match_sql' IN BOOLEAN MODE)" : ''; $sql = "SELECT l.*, u.* - FROM ". BB_LOG ." l + FROM ". BB_LOG ." l LEFT JOIN ". BB_USERS ." u ON(u.user_id = l.log_user_id) $where ORDER BY l.log_time @@ -265,7 +263,7 @@ if ($log_rowset) break; } - $msg .= " $row[log_msg]"; + $msg .= " {$row['log_msg']}"; $row_class = !($row_num & 1) ? $row_class_1 : $row_class_2; @@ -347,14 +345,9 @@ else $template->assign_block_vars('log_not_found', array()); } -// -// Selects -// +// Select $log_type_select = array($lang['ACTS_LOG_ALL_ACTIONS'] => $all_types) + $log_action->log_type_select; -// Order select -$order_options = ''; - $template->assign_vars(array( 'LOG_COLSPAN' => 4, @@ -368,9 +361,6 @@ $template->assign_vars(array( 'TITLE_MATCH_NAME' => $title_match_key, 'TITLE_MATCH_VAL' => $title_match_val, - 'ORDER_NAME' => '', - 'ORDER_OPTIONS' => $order_options, - 'SORT_NAME' => $sort_key, 'SORT_ASC' => $sort_asc, 'SORT_DESC' => $sort_desc, diff --git a/install/upgrade/changes.txt b/install/upgrade/changes.txt index 729c520d2..1b1487545 100644 --- a/install/upgrade/changes.txt +++ b/install/upgrade/changes.txt @@ -63,4 +63,5 @@ DROP TABLE IF EXISTS `bb_attach_quota`; DROP TABLE IF EXISTS `bb_quota_limits`; ALTER TABLE `bb_topics` ADD `attach_ext_id` TINYINT(4) NOT NULL DEFAULT '0' AFTER `topic_dl_type`; ALTER TABLE `bb_topics` ADD `filesize` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER `attach_ext_id`; -DELETE FROM `bb_config` WHERE `config_name` = 'new_tpls'; \ No newline at end of file +DELETE FROM `bb_config` WHERE `config_name` = 'new_tpls'; +ALTER TABLE `bb_log` DROP COLUMN `log_username`; \ No newline at end of file diff --git a/library/language/en/main.php b/library/language/en/main.php index 017219b5b..f11771353 100644 --- a/library/language/en/main.php +++ b/library/language/en/main.php @@ -2525,7 +2525,7 @@ $lang['ACTS_LOG_FORUM'] = 'Forum'; $lang['ACTS_LOG_ACTION'] = 'Action'; $lang['ACTS_LOG_USER'] = 'User'; $lang['ACTS_LOG_LOGS_FROM'] = 'Logs from '; -$lang['ACTS_LOG_FIRST'] = 'first '; +$lang['ACTS_LOG_FIRST'] = 'beginning with'; $lang['ACTS_LOG_DAYS_BACK'] = 'days back'; $lang['ACTS_LOG_TOPIC_MATCH'] = 'Topic title match'; $lang['ACTS_LOG_SORT_BY'] = 'Sort by'; @@ -2535,6 +2535,7 @@ $lang['ACTS_LOG_TIME'] = 'Time'; $lang['ACTS_LOG_INFO'] = 'Info'; $lang['ACTS_LOG_FILTER'] = 'Filter'; $lang['ACTS_LOG_TOPICS'] = 'Topics:'; +$lang['ACTS_LOG_OR'] = 'or'; $lang['RELEASE'] = 'Release Templates'; $lang['RELEASES'] = 'Releases'; diff --git a/library/language/ru/main.php b/library/language/ru/main.php index 74007536b..7647361ab 100644 --- a/library/language/ru/main.php +++ b/library/language/ru/main.php @@ -2525,7 +2525,7 @@ $lang['ACTS_LOG_FORUM'] = 'Форум'; $lang['ACTS_LOG_ACTION'] = 'Действие'; $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'] = 'Сортировать по'; @@ -2535,6 +2535,7 @@ $lang['ACTS_LOG_TIME'] = 'Время'; $lang['ACTS_LOG_INFO'] = 'Инфо'; $lang['ACTS_LOG_FILTER'] = 'Фильтр'; $lang['ACTS_LOG_TOPICS'] = 'Топик:'; +$lang['ACTS_LOG_OR'] = 'или'; $lang['RELEASE'] = 'Шаблоны для релизов'; $lang['RELEASES'] = 'Релизы'; diff --git a/library/language/uk/main.php b/library/language/uk/main.php index 12114589c..26247523e 100644 --- a/library/language/uk/main.php +++ b/library/language/uk/main.php @@ -2525,7 +2525,7 @@ $lang['ACTS_LOG_FORUM'] = 'Форум'; $lang['ACTS_LOG_ACTION'] = 'Дія'; $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'] = 'Сортувати по'; @@ -2535,6 +2535,7 @@ $lang['ACTS_LOG_TIME'] = 'Час'; $lang['ACTS_LOG_INFO'] = 'Інфо'; $lang['ACTS_LOG_FILTER'] = 'Фільтр'; $lang['ACTS_LOG_TOPICS'] = 'Топік:'; +$lang['ACTS_LOG_OR'] = 'або'; $lang['RELEASE'] = 'Шаблони для релізів'; $lang['RELEASES'] = 'Релізи'; diff --git a/styles/templates/admin/admin_log.tpl b/styles/templates/admin/admin_log.tpl index d7f871144..40001257b 100644 --- a/styles/templates/admin/admin_log.tpl +++ b/styles/templates/admin/admin_log.tpl @@ -53,11 +53,11 @@ table.log_filters td {
- {L_ACTS_LOG_LOGS_FROM} ({L_ACTS_LOG_FIRST}{FIRST_LOG_TIME}) + {L_ACTS_LOG_LOGS_FROM} ({L_ACTS_LOG_FIRST}: {FIRST_LOG_TIME})

- & + {L_ACTS_LOG_OR} {L_ACTS_LOG_DAYS_BACK}

@@ -72,14 +72,13 @@ table.log_filters td {
- -
+ +
{L_ACTS_LOG_SORT_BY}

- - - + +