From d16338aaa177a67bbacd9953c20789133ee494d3 Mon Sep 17 00:00:00 2001 From: nanosimbiot Date: Sun, 21 Aug 2011 19:04:43 +0000 Subject: [PATCH] r243 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@243 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/admin/admin_forum_prune.php | 2 +- upload/admin/admin_forums.php | 6 +++--- upload/admin/admin_log.php | 4 ++-- upload/attach_mod/displaying_torrent.php | 6 +++--- upload/config.php | 2 +- upload/templates/default/css/main.css | 4 ---- upload/templates/default/search_results.tpl | 2 +- upload/templates/default/tracker.tpl | 14 +++++++------- upload/templates/default/viewforum.tpl | 4 ++-- upload/tracker.php | 4 ++-- 10 files changed, 22 insertions(+), 26 deletions(-) diff --git a/upload/admin/admin_forum_prune.php b/upload/admin/admin_forum_prune.php index 2e59ae5ef..4b2cfccdd 100644 --- a/upload/admin/admin_forum_prune.php +++ b/upload/admin/admin_forum_prune.php @@ -44,7 +44,7 @@ if (isset($_REQUEST['submit'])) $prune_performed = true; $template->assign_block_vars('pruned', array( - 'ROW_CLASS' => !($i % 2) ? 'prow1' : 'prow2', + 'ROW_CLASS' => !($i % 2) ? 'row1' : 'row2', 'FORUM_NAME' => htmlCHR($row['forum_name']), 'PRUNED_TOPICS' => $pruned_topics, )); diff --git a/upload/admin/admin_forums.php b/upload/admin/admin_forums.php index a81074e66..8bfa8a16a 100644 --- a/upload/admin/admin_forums.php +++ b/upload/admin/admin_forums.php @@ -766,9 +766,9 @@ if (!$mode || $show_main_page) // $gen_cat = array(); - $bgr_class_1 = 'prow1'; - $bgr_class_2 = 'prow2'; - $bgr_class_over = 'prow3'; + $bgr_class_1 = 'row1'; + $bgr_class_2 = 'row2'; + $bgr_class_over = 'row3'; $template->assign_vars(array( 'U_ALL_FORUMS' => "admin_forums.php?c=all", diff --git a/upload/admin/admin_log.php b/upload/admin/admin_log.php index 7402762b0..97adb9b9d 100644 --- a/upload/admin/admin_log.php +++ b/upload/admin/admin_log.php @@ -16,8 +16,8 @@ $datastore->enqueue(array( $log_action->init(); $per_page = 50; -$row_class_1 = 'prow1'; -$row_class_2 = 'prow2'; +$row_class_1 = 'row1'; +$row_class_2 = 'row2'; $def_days = 3; $def_datetime = TIMENOW; $max_forum_name_len = 40; diff --git a/upload/attach_mod/displaying_torrent.php b/upload/attach_mod/displaying_torrent.php index 2a587c37f..553482447 100644 --- a/upload/attach_mod/displaying_torrent.php +++ b/upload/attach_mod/displaying_torrent.php @@ -5,9 +5,9 @@ if (!defined('IN_PHPBB')) die(basename(__FILE__)); global $bb_cfg, $t_data, $poster_id, $is_auth, $dl_link_css, $dl_status_css; $change_peers_bgr_over = true; -$bgr_class_1 = 'prow1'; -$bgr_class_2 = 'prow2'; -$bgr_class_over = 'prow3'; +$bgr_class_1 = 'row1'; +$bgr_class_2 = 'row2'; +$bgr_class_over = 'row3'; $show_peers_limit = 300; $max_peers_before_overflow = 20; diff --git a/upload/config.php b/upload/config.php index 9ade636e7..e283191aa 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 Stable'; -$bb_cfg['tp_release_state'] = 'R242'; +$bb_cfg['tp_release_state'] = 'R243'; $bb_cfg['tp_release_date'] = '22-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/templates/default/css/main.css b/upload/templates/default/css/main.css index 18bc6b825..815cb4e8b 100644 --- a/upload/templates/default/css/main.css +++ b/upload/templates/default/css/main.css @@ -178,10 +178,6 @@ a.topictitle:visited, a.torTopic:visited, a.tLink:visited { .row5, .row5 td { background: #E7E7E7; } .row6, .row6 td { background: #E9E9E6; } -.prow1 { background: #ECECEC; } -.prow2 { background: #E7E7E7; } -.prow3 { background: #DEE3E7; } - .p-body tr { background: #ECECEC; } .p-body tr:hover { background: #DEE3E7; } diff --git a/upload/templates/default/search_results.tpl b/upload/templates/default/search_results.tpl index dfccd0752..720a68612 100644 --- a/upload/templates/default/search_results.tpl +++ b/upload/templates/default/search_results.tpl @@ -109,7 +109,7 @@ [{ICON_GOTOPOST}{L_GOTO_SHORT} {t.PAGINATION} ] - {t.TOPIC_AUTHOR} + {t.TOPIC_AUTHOR} {t.REPLIES}

{t.LAST_POST_TIME}

diff --git a/upload/templates/default/tracker.tpl b/upload/templates/default/tracker.tpl index af260f613..0d5fbfb3e 100644 --- a/upload/templates/default/tracker.tpl +++ b/upload/templates/default/tracker.tpl @@ -309,28 +309,28 @@ ajax.callback.view_post = function(data) { {tor.FORUM_NAME} - + onclick="ajax.view_post({tor.POST_ID}, this); return false;" href="{TOPIC_URL}{tor.TOPIC_ID}">{tor.TOPIC_TITLE}{tor.TOR_TYPE}{tor.TOPIC_TITLE}
{tor.TOPIC_TIME}
{tor.USERNAME} - + {tor.TOR_SIZE_RAW} {tor.TOR_SIZE} {tor.MAGNET} {tor.TOR_SIZE} - {tor.SEEDS} - {tor.LEECHS} - {tor.COMPLETED} + {tor.SEEDS} + {tor.LEECHS} + {tor.COMPLETED} - +

{tor.UL_SPEED}

{tor.DL_SPEED}

- + {tor.ADDED_RAW}

{tor.ADDED_TIME}

{tor.ADDED_DATE}

diff --git a/upload/templates/default/viewforum.tpl b/upload/templates/default/viewforum.tpl index fe12b4816..8cddafc2d 100644 --- a/upload/templates/default/viewforum.tpl +++ b/upload/templates/default/viewforum.tpl @@ -447,7 +447,7 @@ td.topic_id { cursor: pointer; } {t.TOR_TYPE}{t.TOPIC_TITLE} -
+
{t.TOPIC_AUTHOR} @@ -544,7 +544,7 @@ td.topic_id { cursor: pointer; } [{ICON_GOTOPOST}{L_GOTO_SHORT} {t.PAGINATION} ] {t.REPLIES} - {t.TOPIC_AUTHOR} + {t.TOPIC_AUTHOR} {t.VIEWS}

{t.LAST_POST_TIME}

diff --git a/upload/tracker.php b/upload/tracker.php index 5aa940aa5..338703dc1 100644 --- a/upload/tracker.php +++ b/upload/tracker.php @@ -29,8 +29,8 @@ $tracker_url = basename(__FILE__); $time_format = 'H:i'; $date_format = 'j-M-y'; -$row_class_1 = 'prow1'; -$row_class_2 = 'prow2'; +$row_class_1 = 'row1'; +$row_class_2 = 'row2'; $start = isset($_REQUEST['start']) ? abs(intval($_REQUEST['start'])) : 0;