github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r196

Browse source 
git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@196 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
pherum83 2011-08-06 00:54:35 +00:00
commit 916a40fbe6
8 changed files with 46 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
upload/config.php
View file

@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1;
// Increase number of revision after update
$bb_cfg['tp_version'] = '2.0';
$bb_cfg['tp_release_state'] = 'R195';
$bb_cfg['tp_release_date'] = '5-08-2011';
$bb_cfg['tp_release_state'] = 'R196';
$bb_cfg['tp_release_date'] = '6-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Попробуйте повторить запрос через несколько минут";

4
upload/index.php
View file

@ -253,7 +253,7 @@ foreach ($cat_forums as $cid => $c)
$template->assign_block_vars('c.f.sf', array(
'SF_ID' => $fid,
'SF_NAME' => $fname_html,
'SF_NEW' => $new ? ' new' : '',
'SF_NEW' => $new ? $lang['NEW'] : '',
));
continue;
}
@ -269,7 +269,7 @@ foreach ($cat_forums as $cid => $c)
'LAST_SF_ID' => isset($f['last_sf_id']) ? $f['last_sf_id'] : null,
'MODERATORS' => isset($moderators[$fid]) ? join(', ', $moderators[$fid]) : '',
'FORUM_FOLDER_ALT' => ($new) ? 'new' : 'old',
'FORUM_FOLDER_ALT' => ($new) ? $lang['NEW'] : $lang['OLD'],
));
if ($f['last_post_id'])

6
upload/language/lang_english/lang_main.php
View file

@ -1636,3 +1636,9 @@ $lang['LIST'] = 'List';
$lang['LIST_TITLE'] = 'List (Ctrl+L)';
$lang['LIST_ITEM'] = 'List item (Ctrl+0)';
$lang['QUOTE_SEL'] = 'Quote selected';
$lang['NEW'] = 'New';
$lang['NEWEST'] = 'Newest';
$lang['LATEST'] = 'Latest';
$lang['POST'] = 'Post';
$lang['OLD'] = 'Old';

6
upload/language/lang_russian/lang_main.php
View file

@ -1648,3 +1648,9 @@ $lang['LIST_ITEM'] = 'Элемент списка (Ctrl+0)';
$lang['QUOTE_SEL'] = 'Цит.выдел';
$lang['TRANSLIT'] = 'Транслит';
$lang['TRANSLIT_TITLE'] = 'Перевести выделение из транслита на русский';
$lang['NEW'] = 'Новое';
$lang['NEWEST'] = 'Непрочит.';
$lang['LATEST'] = 'Последнее';
$lang['POST'] = 'Пост';
$lang['OLD'] = 'Прочит';

6
upload/templates/default/index.tpl
View file

@ -216,11 +216,11 @@
<table class="bCenter med" id="f_icons_legend">
<tr>
<td><img class="forum_icon" src="{IMG}folder_new_big.gif" alt="new"/></td>
<td><img class="forum_icon" src="{IMG}folder_new_big.gif" alt="{L_NEW}"/></td>
<td>{L_NEW_POSTS}</td>
<td><img class="forum_icon" src="{IMG}folder_big.gif" alt="old" /></td>
<td><img class="forum_icon" src="{IMG}folder_big.gif" alt="{L_OLD}" /></td>
<td>{L_NO_NEW_POSTS}</td>
<td><img class="forum_icon" src="{IMG}folder_locked_big.gif" alt="locked" /></td>
<td><img class="forum_icon" src="{IMG}folder_locked_big.gif" alt="{L_FORUM_LOCKED_MAIN}" /></td>
<td>{L_FORUM_LOCKED_MAIN}</td>
</tr>
</table>

8
upload/templates/default/search_results.tpl
View file

@ -99,12 +99,12 @@
<td class="tLeft" style="padding: 2px 5px 3px 4px;">
<div class="topictitle" onmousedown="$p('tid_{t.TOPIC_ID}').className='opened'">
<!-- IF t.IS_UNREAD --><a href="{TOPIC_URL}{t.HREF_TOPIC_ID}{NEWEST_URL}">{ICON_NEWEST_REPLY}</a><!-- ENDIF -->
<!-- IF t.STATUS == MOVED --><span class="topicMoved">{L_MOVED}</span>
<!-- ELSEIF t.TYPE == ANNOUNCE --><span class="topicAnnounce">{L_ANNOUNCE}</span>
<!-- ELSEIF t.DL_CLASS --><span class="{t.DL_CLASS} iconDL">{L_DL_TOPIC}</span>
<!-- IF t.STATUS == MOVED --><span class="topicMoved">{L_TOPIC_MOVED}</span>
<!-- ELSEIF t.TYPE == ANNOUNCE --><span class="topicAnnounce">{L_TOPIC_ANNOUNCEMENT}</span>
<!-- ELSEIF t.DL_CLASS --><span class="{t.DL_CLASS} iconDL">{L_TOPIC_DL}</span>
<!-- ELSEIF t.ATTACH and not t.DL -->{TOPIC_ATTACH_ICON}
<!-- ENDIF -->
<!-- IF t.POLL --><span class="topicPoll">{L_POLL}</span><!-- ENDIF -->
<!-- IF t.POLL --><span class="topicPoll">{L_TOPIC_POLL}</span><!-- ENDIF -->
<a href="{TOPIC_URL}{t.TOPIC_ID}" class="topictitle"><span id="tid_{t.TOPIC_ID}">{t.TOPIC_TITLE}</span></a>
<!-- IF t.PAGINATION --><span class="topicPG">[{ICON_GOTOPOST}{L_GOTO_SHORT} {t.PAGINATION} ]</span><!-- ENDIF -->
</div>

38
upload/templates/default/tpl_config.php
View file

@ -132,22 +132,22 @@ if (!empty($page_cfg['load_tpl_vars']) AND $vars = array_flip($page_cfg['load_tp
if (isset($vars['post_buttons']))
{
$template->assign_vars(array(
'QUOTE_IMG' => ($bb_cfg['text_buttons']) ? $lang['REPLY_WITH_QUOTE_TXTB'] : '<img src="'. $images['icon_quote'] .'" alt="Quote" title="'. $lang['REPLY_WITH_QUOTE'] .'" />',
'EDIT_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['EDIT_DELETE_POST_TXTB'] : '<img src="'. $images['icon_edit'] .'" alt="Edit" title="'. $lang['EDIT_POST'] .'" />',
'DELETE_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['DELETE_POST_TXTB'] : '<img src="'. $images['icon_delpost'] .'" alt="Delete" title="'. $lang['DELETE_POST'] .'" />',
'IP_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['VIEW_IP_TXTB'] : '<img src="'. $images['icon_ip'] .'" alt="IP" title="'. $lang['VIEW_IP'] .'" />',
'MOD_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['MODERATE_POST_TXTB'] : '<img src="'. $images['icon_mod'] .'" alt="Moderate" title="'. $lang['MODERATE_POST'] .'" />',
'QUOTE_IMG' => ($bb_cfg['text_buttons']) ? $lang['REPLY_WITH_QUOTE_TXTB'] : '<img src="'. $images['icon_quote'] .'" alt="'.$lang['REPLY_WITH_QUOTE_TXTB'].'" title="'. $lang['REPLY_WITH_QUOTE'] .'" />',
'EDIT_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['EDIT_DELETE_POST_TXTB'] : '<img src="'. $images['icon_edit'] .'" alt="'.$lang['EDIT_DELETE_POST_TXTB'].'" title="'. $lang['EDIT_POST'] .'" />',
'DELETE_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['DELETE_POST_TXTB'] : '<img src="'. $images['icon_delpost'] .'" alt="'.$lang['DELETE_POST_TXTB'].'" title="'. $lang['DELETE_POST'] .'" />',
'IP_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['VIEW_IP_TXTB'] : '<img src="'. $images['icon_ip'] .'" alt="'.$lang['VIEW_IP_TXTB'].'" title="'. $lang['VIEW_IP'] .'" />',
'MOD_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['MODERATE_POST_TXTB'] : '<img src="'. $images['icon_mod'] .'" alt="'.$lang['MODERATE_POST_TXTB'].'" title="'. $lang['MODERATE_POST'] .'" />',
'QUOTE_URL' => BB_ROOT ."posting.php?mode=quote&amp;p=",
'EDIT_POST_URL' => BB_ROOT ."posting.php?mode=editpost&amp;p=",
'DELETE_POST_URL' => BB_ROOT ."posting.php?mode=delete&amp;p=",
'IP_POST_URL' => BB_ROOT ."modcp.php?mode=ip&amp;p=",
'PROFILE_IMG' => ($bb_cfg['text_buttons']) ? $lang['READ_PROFILE_TXTB'] : '<img src="'. $images['icon_profile'] .'" alt="Profile" title="'. $lang['READ_PROFILE'] .'" />',
'PM_IMG' => ($bb_cfg['text_buttons']) ? $lang['SEND_PM_TXTB'] : '<img src="'. $images['icon_pm'] .'" alt="PM" title="'. $lang['SEND_PRIVATE_MESSAGE'] .'" />',
'EMAIL_IMG' => ($bb_cfg['text_buttons']) ? $lang['SEND_EMAIL_TXTB'] : '<img src="'. $images['icon_email'] .'" alt="email" title="'. $lang['SEND_EMAIL'] .'" />',
'WWW_IMG' => ($bb_cfg['text_buttons']) ? $lang['VISIT_WEBSITE_TXTB'] : '<img src="'. $images['icon_www'] .'" alt="www" title="'. $lang['VISIT_WEBSITE'] .'" />',
'ICQ_IMG' => ($bb_cfg['text_buttons']) ? $lang['ICQ_TXTB'] : '<img src="'. $images['icon_icq'] .'" alt="ICQ" title="'. $lang['ICQ'] .'" />',
'PROFILE_IMG' => ($bb_cfg['text_buttons']) ? $lang['READ_PROFILE_TXTB'] : '<img src="'. $images['icon_profile'] .'" alt="'. $lang['READ_PROFILE_TXTB'] .'" title="'. $lang['READ_PROFILE'] .'" />',
'PM_IMG' => ($bb_cfg['text_buttons']) ? $lang['SEND_PM_TXTB'] : '<img src="'. $images['icon_pm'] .'" alt="'. $lang['SEND_PM_TXTB'] .'" title="'. $lang['SEND_PRIVATE_MESSAGE'] .'" />',
'EMAIL_IMG' => ($bb_cfg['text_buttons']) ? $lang['SEND_EMAIL_TXTB'] : '<img src="'. $images['icon_email'] .'" alt="'. $lang['SEND_EMAIL_TXTB'] .'" title="'. $lang['SEND_EMAIL'] .'" />',
'WWW_IMG' => ($bb_cfg['text_buttons']) ? $lang['VISIT_WEBSITE_TXTB'] : '<img src="'. $images['icon_www'] .'" alt="'.$lang['VISIT_WEBSITE_TXTB'].'" title="'. $lang['VISIT_WEBSITE'] .'" />',
'ICQ_IMG' => ($bb_cfg['text_buttons']) ? $lang['ICQ_TXTB'] : '<img src="'. $images['icon_icq'] .'" alt="'.$lang['ICQ_TXTB'].'" title="'. $lang['ICQ'] .'" />',
'EMAIL_URL' => BB_ROOT ."profile.php?mode=email&amp;u=",
'FORUM_URL' => BB_ROOT . FORUM_URL,
@ -159,11 +159,11 @@ if (!empty($page_cfg['load_tpl_vars']) AND $vars = array_flip($page_cfg['load_tp
if (isset($vars['post_icons']))
{
$template->assign_vars(array(
'MINIPOST_IMG' => '<img src="'. $images['icon_minipost'] .'" class="icon1" alt="post" />',
'ICON_GOTOPOST' => '<img src="'. $images['icon_gotopost'] .'" class="icon1" alt="goto" title="'. $lang['GOTO_PAGE'] .'" />',
'MINIPOST_IMG_NEW' => '<img src="'. $images['icon_minipost_new'] .'" class="icon1" alt="new" />',
'ICON_LATEST_REPLY' => '<img src="'. $images['icon_latest_reply'] .'" class="icon2" alt="latest" title="'. $lang['VIEW_LATEST_POST'] .'" />',
'ICON_NEWEST_REPLY' => '<img src="'. $images['icon_newest_reply'] .'" class="icon2" alt="newest" title="'. $lang['VIEW_NEWEST_POST'] .'" />',
'MINIPOST_IMG' => '<img src="'. $images['icon_minipost'] .'" class="icon1" alt="'.$lang['POST'].'" />',
'ICON_GOTOPOST' => '<img src="'. $images['icon_gotopost'] .'" class="icon1" alt="'.$lang['GO'].'" title="'. $lang['GOTO_PAGE'] .'" />',
'MINIPOST_IMG_NEW' => '<img src="'. $images['icon_minipost_new'] .'" class="icon1" alt="'.$lang['NEW'].'" />',
'ICON_LATEST_REPLY' => '<img src="'. $images['icon_latest_reply'] .'" class="icon2" alt="'.$lang['LATEST'].'" title="'. $lang['VIEW_LATEST_POST'] .'" />',
'ICON_NEWEST_REPLY' => '<img src="'. $images['icon_newest_reply'] .'" class="icon2" alt="'.$lang['NEWEST'].'" title="'. $lang['VIEW_NEWEST_POST'] .'" />',
));
}
if (isset($vars['topic_icons']))
@ -173,17 +173,13 @@ if (!empty($page_cfg['load_tpl_vars']) AND $vars = array_flip($page_cfg['load_tp
'ANNOUNCE' => POST_ANNOUNCE,
'STICKY' => POST_STICKY,
'LOCKED' => TOPIC_LOCKED,
'L_MOVED' => $lang['TOPIC_MOVED'],
'L_ANNOUNCE' => $lang['TOPIC_ANNOUNCEMENT'],
'L_DL_TOPIC' => $lang['TOPIC_DL'],
'L_POLL' => $lang['TOPIC_POLL'],
));
}
if (isset($vars['pm_icons']))
{
$template->assign_vars(array(
'INBOX_IMG' => '<img src="'. $images['pm_inbox'] .'" class="pm_box_icon" alt="" />',
'OUTBOX_IMG' => '<img src="'. $images['pm_outbox'] .'" class="pm_box_icon" alt="" />',
'INBOX_IMG' => '<img src="'. $images['pm_inbox'] .'" class="pm_box_icon" alt="" />',
'OUTBOX_IMG' => '<img src="'. $images['pm_outbox'] .'" class="pm_box_icon" alt="" />',
'SENTBOX_IMG' => '<img src="'. $images['pm_sentbox'] .'" class="pm_box_icon" alt="" />',
'SAVEBOX_IMG' => '<img src="'. $images['pm_savebox'] .'" class="pm_box_icon" alt="" />',
));

12
upload/templates/default/viewforum.tpl
View file

@ -444,10 +444,10 @@ td.topic_id { cursor: pointer; }
<div class="torTopic">
<!-- IF t.TOR_STATUS_ICON --><span id="status-{t.TOPIC_ID}">{t.TOR_STATUS_ICON}</span>&#0183;<!-- ENDIF -->
<!-- IF t.IS_UNREAD --><a href="{TOPIC_URL}{t.HREF_TOPIC_ID}{NEWEST_URL}">{ICON_NEWEST_REPLY}</a><!-- ENDIF -->
<!-- IF t.STATUS == MOVED --><span class="topicMoved">{L_MOVED}</span>
<!-- ELSEIF t.DL_CLASS --><span class="{t.DL_CLASS} iconDL"><b>{L_DL_TOPIC}</b></span>
<!-- IF t.STATUS == MOVED --><span class="topicMoved">{L_TOPIC_MOVED}</span>
<!-- ELSEIF t.DL_CLASS --><span class="{t.DL_CLASS} iconDL"><b>{L_TOPIC_DL}</b></span>
<!-- ENDIF -->
<!-- IF t.POLL --><span class="topicPoll">{L_POLL}</span><!-- ENDIF -->
<!-- IF t.POLL --><span class="topicPoll">{L_TOPIC_POLL}</span><!-- ENDIF -->
<!-- IF t.TOR_STALED || t.TOR_FROZEN -->
<!-- IF t.ATTACH --><span>{TOPIC_ATTACH_ICON}</span><!-- ENDIF -->
<a id="tt-{t.TOPIC_ID}" href="{TOPIC_URL}{t.HREF_TOPIC_ID}" class="gen tt-text">{t.TOPIC_TITLE}</a>
@ -545,11 +545,11 @@ td.topic_id { cursor: pointer; }
<td class="tt">
<span class="topictitle">
<!-- IF t.IS_UNREAD --><a href="{TOPIC_URL}{t.HREF_TOPIC_ID}{NEWEST_URL}">{ICON_NEWEST_REPLY}</a><!-- ENDIF -->
<!-- IF t.STATUS == MOVED --><span class="topicMoved">{L_MOVED}</span>
<!-- ELSEIF t.DL --><span class="">{L_DL_TOPIC}</span>
<!-- IF t.STATUS == MOVED --><span class="topicMoved">{L_TOPIC_MOVED}</span>
<!-- ELSEIF t.DL --><span class="">{L_TOPIC_DL}</span>
<!-- ELSEIF t.ATTACH -->{TOPIC_ATTACH_ICON}
<!-- ENDIF -->
<!-- IF t.POLL --><span class="topicPoll">{L_POLL}</span><!-- ENDIF -->
<!-- IF t.POLL --><span class="topicPoll">{L_TOPIC_POLL}</span><!-- ENDIF -->
<a id="tt-{t.TOPIC_ID}" href="{TOPIC_URL}{t.HREF_TOPIC_ID}" class="topictitle tt-text">{t.TOPIC_TITLE}</a>
</span>
<!-- IF t.PAGINATION --><span class="topicPG">[{ICON_GOTOPOST}{L_GOTO_SHORT} {t.PAGINATION} ]</span><!-- ENDIF -->