From 32a1d3848d2fc980bb05895b538fb45414026e2f Mon Sep 17 00:00:00 2001 From: pherum83 Date: Sat, 21 Apr 2012 17:00:12 +0000 Subject: [PATCH] r405 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit обновление навигации разделов в трекере Ссылка на выбранные разделы Скрытие содержимого {...} git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@405 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/config.php | 4 +- upload/includes/sessions.php | 1 + upload/language/lang_english/lang_main.php | 5 + upload/language/lang_russian/lang_main.php | 5 + upload/templates/default/css/main.css | 11 + upload/templates/default/tracker.tpl | 249 ++++++++++++++------- upload/templates/default/viewforum.tpl | 6 - upload/tracker.php | 10 +- 8 files changed, 198 insertions(+), 93 deletions(-) diff --git a/upload/config.php b/upload/config.php index c80b00ff2..2fc9c4e76 100644 --- a/upload/config.php +++ b/upload/config.php @@ -52,8 +52,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.5 Beta'; -$bb_cfg['tp_release_state'] = 'R404'; -$bb_cfg['tp_release_date'] = '20-04-2012'; +$bb_cfg['tp_release_state'] = 'R405'; +$bb_cfg['tp_release_date'] = '21-04-2012'; // Database $charset = 'utf8'; diff --git a/upload/includes/sessions.php b/upload/includes/sessions.php index 6c5f1d412..73c41a47e 100644 --- a/upload/includes/sessions.php +++ b/upload/includes/sessions.php @@ -30,6 +30,7 @@ class user_common 'tr_t_t' => 0, // show time of the creation topics 'hl_tr' => 1, // show cursor in tracker.php 'i_aft_l' => 0, // show images only after full loading + 'h_tsp' => 0, // show released title {...} ); /** diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index eaaa45d48..19410d7ac 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1278,6 +1278,11 @@ $lang['GO_TO_SECTION'] = 'Goto section'; $lang['TORRENTS_FROM'] = 'Posts from'; $lang['SHOW_ONLY'] = 'Show only'; $lang['SHOW_COLUMN'] = 'Show column'; +$lang['SEL_CHAPTERS'] = 'Link to the selected partitions'; +$lang['NOT_SEL_CHAPTERS'] = 'You have not selected topics'; +$lang['SEL_CHAPTERS_HELP'] = 'You can select a maximum %s partition'; +$lang['HIDE_CONTENTS'] = 'Hide the contents of {...}'; +$lang['FILTER_BY_NAME'] = 'filter by name '; $lang['BT_ONLY_ACTIVE'] = 'Active'; $lang['BT_ONLY_MY'] = 'My releases'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index cac5cd533..18c55154d 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1285,6 +1285,11 @@ $lang['GO_TO_SECTION'] = 'перейти к разделу'; $lang['TORRENTS_FROM'] = 'Торренты за'; $lang['SHOW_ONLY'] = 'Показывать только'; $lang['SHOW_COLUMN'] = 'Показывать колонку'; +$lang['SEL_CHAPTERS'] = 'Ссылка на выбранные разделы'; +$lang['NOT_SEL_CHAPTERS'] = 'Вы не выбрали разделы'; +$lang['SEL_CHAPTERS_HELP'] = 'Вы можете выбрать максимум %s разделов'; +$lang['HIDE_CONTENTS'] = 'Скрыть содержимое {...}'; +$lang['FILTER_BY_NAME'] = 'фильтр по названию'; $lang['BT_ONLY_ACTIVE'] = 'Активные (есть сидер или личер)'; $lang['BT_ONLY_MY'] = 'Мои раздачи'; diff --git a/upload/templates/default/css/main.css b/upload/templates/default/css/main.css index 6f5bc68d1..27ebda87f 100644 --- a/upload/templates/default/css/main.css +++ b/upload/templates/default/css/main.css @@ -858,6 +858,17 @@ a.tr-dl:visited { color: #5493B4; font-weight: normal; } .ch { font-style: italic; color: #0080FF; } #fs-sel-cat option.cat-title { font-weight: bold; color: #005A88; background: #F5F5F5; } tr.hl-tr:hover td { background-color: #F8F8F8 !important; } + +#fs-nav-ul .b { font-weight: bold; } +#fs-nav-ul li, #fs-nav-close { cursor: pointer; } +#fs-nav-ul span.f:hover, #fs-nav-close:hover { color: blue; background: #DEE2E4; } +#fs-nav-list { border: 3px double #9AA7AD; background: #EFEFEF; padding: 8px; max-height: 500px; overflow: auto; } +#fs-sel-cat { width: 260px; } +#fs-sel-cat option.cat-title { font-weight: bold; color: #005A88; background: #F5F5F5; } + +.post_wrap { border: 1px #A5AFB4 solid; margin: 8px 8px 6px; overflow: auto; } +.post_links { margin: 6px; } +.unfolded2, .folded2 { display: inline !important; } /* ================================================================ * Images * ================================================================ */ diff --git a/upload/templates/default/tracker.tpl b/upload/templates/default/tracker.tpl index bd39f2229..cbb510b1d 100644 --- a/upload/templates/default/tracker.tpl +++ b/upload/templates/default/tracker.tpl @@ -47,11 +47,6 @@ ajax.callback.view_post = function(data) { }; - -