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

Atom images + forum map fix

Browse source 
Начинаем добавлять ссылки на атом-ленты + корректировки в карте форумов.
This commit is contained in:
Exile 2014-08-12 23:31:00 +04:00
commit 05832b2c6d
8 changed files with 67 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
upload/config.php
View file

@ -141,8 +141,8 @@ if (isset($_SERVER['HTTP_CF_CONNECTING_IP']))
} }
// Increase number after changing js or css // Increase number after changing js or css
$bb_cfg['js_ver'] = 1; $bb_cfg['js_ver'] = 2;
$bb_cfg['css_ver'] = 1; $bb_cfg['css_ver'] = 2;
// Backup // Backup
$bb_cfg['db_backup_shell_cmd'] = ''; // '/path/to/db_backup.sh 2>&1' $bb_cfg['db_backup_shell_cmd'] = ''; // '/path/to/db_backup.sh 2>&1'
@ -600,7 +600,7 @@ $bb_cfg['captcha'] = array(
// Atom feed // Atom feed
$bb_cfg['atom'] = array( $bb_cfg['atom'] = array(
'path' => BB_PATH .'/atom/', 'path' => BB_PATH .'/atom/',
'url' => "http://{$domain_name}/atom", 'url' => './atom',
); );
define('BB_CFG_LOADED', true); define('BB_CFG_LOADED', true);

5
upload/language/en/main.php
View file

@ -135,7 +135,8 @@ $lang['SEARCH_SELF_BY_LAST'] = 'last post time';
$lang['SEARCH_SELF_BY_MY'] = 'my post time'; $lang['SEARCH_SELF_BY_MY'] = 'my post time';
$lang['SEARCH_UNANSWERED'] = 'View unanswered posts'; $lang['SEARCH_UNANSWERED'] = 'View unanswered posts';
$lang['SEARCH_UNANSWERED_SHORT'] = 'unanswered'; $lang['SEARCH_UNANSWERED_SHORT'] = 'unanswered';
$lang['SEARCH_LATEST'] = 'latest'; $lang['SEARCH_LATEST'] = 'Latest topics';
$lang['LATEST_RELEASES'] = 'Latest releases';
$lang['REGISTER'] = 'Register'; $lang['REGISTER'] = 'Register';
$lang['PROFILE'] = 'Profile'; $lang['PROFILE'] = 'Profile';
@ -1227,7 +1228,7 @@ $lang['SEL_CHAPTERS'] = 'Link to the selected partitions';
$lang['NOT_SEL_CHAPTERS'] = 'You have not selected topics'; $lang['NOT_SEL_CHAPTERS'] = 'You have not selected topics';
$lang['SEL_CHAPTERS_HELP'] = 'You can select a maximum %s partition'; $lang['SEL_CHAPTERS_HELP'] = 'You can select a maximum %s partition';
$lang['HIDE_CONTENTS'] = 'Hide the contents of {...}'; $lang['HIDE_CONTENTS'] = 'Hide the contents of {...}';
$lang['FILTER_BY_NAME'] = '<i>filter by name </i>'; $lang['FILTER_BY_NAME'] = '<i>Filter by name </i>';
$lang['BT_ONLY_ACTIVE'] = 'Active'; $lang['BT_ONLY_ACTIVE'] = 'Active';
$lang['BT_ONLY_MY'] = 'My releases'; $lang['BT_ONLY_MY'] = 'My releases';

5
upload/language/ru/main.php
View file

@ -135,7 +135,8 @@ $lang['SEARCH_SELF_BY_LAST'] = 'времени последнего сообще
$lang['SEARCH_SELF_BY_MY'] = 'времени моего сообщения'; $lang['SEARCH_SELF_BY_MY'] = 'времени моего сообщения';
$lang['SEARCH_UNANSWERED'] = 'Сообщения без ответов'; $lang['SEARCH_UNANSWERED'] = 'Сообщения без ответов';
$lang['SEARCH_UNANSWERED_SHORT'] = 'без ответов'; $lang['SEARCH_UNANSWERED_SHORT'] = 'без ответов';
$lang['SEARCH_LATEST'] = 'Последние'; $lang['SEARCH_LATEST'] = 'Последние темы';
$lang['LATEST_RELEASES'] = 'Последние раздачи';
$lang['REGISTER'] = 'Регистрация'; $lang['REGISTER'] = 'Регистрация';
$lang['PROFILE'] = 'Профиль'; $lang['PROFILE'] = 'Профиль';
@ -1227,7 +1228,7 @@ $lang['SEL_CHAPTERS'] = 'Ссылка на выбранные разделы';
$lang['NOT_SEL_CHAPTERS'] = 'Вы не выбрали разделы'; $lang['NOT_SEL_CHAPTERS'] = 'Вы не выбрали разделы';
$lang['SEL_CHAPTERS_HELP'] = 'Вы можете выбрать максимум %s разделов'; $lang['SEL_CHAPTERS_HELP'] = 'Вы можете выбрать максимум %s разделов';
$lang['HIDE_CONTENTS'] = 'Скрыть содержимое {...}'; $lang['HIDE_CONTENTS'] = 'Скрыть содержимое {...}';
$lang['FILTER_BY_NAME'] = '<i>фильтр по названию</i>'; $lang['FILTER_BY_NAME'] = '<i>Фильтр по названию</i>';
$lang['BT_ONLY_ACTIVE'] = 'Активные (есть сидер или личер)'; $lang['BT_ONLY_ACTIVE'] = 'Активные (есть сидер или личер)';
$lang['BT_ONLY_MY'] = 'Мои раздачи'; $lang['BT_ONLY_MY'] = 'Мои раздачи';

5
upload/language/ua/main.php
View file

@ -135,7 +135,8 @@ $lang['SEARCH_SELF_BY_LAST'] = 'з часу останнього повідом
$lang['SEARCH_SELF_BY_MY'] = 'з часу мого повідомлення'; $lang['SEARCH_SELF_BY_MY'] = 'з часу мого повідомлення';
$lang['SEARCH_UNANSWERED'] = 'Повідомлення без відповідей'; $lang['SEARCH_UNANSWERED'] = 'Повідомлення без відповідей';
$lang['SEARCH_UNANSWERED_SHORT'] = 'без відповідей'; $lang['SEARCH_UNANSWERED_SHORT'] = 'без відповідей';
$lang['SEARCH_LATEST'] = 'Останні'; $lang['SEARCH_LATEST'] = 'Останні теми';
$lang['LATEST_RELEASES'] = 'Останні роздачі';
$lang['REGISTER'] = 'Реєстрація'; $lang['REGISTER'] = 'Реєстрація';
$lang['PROFILE'] = 'Профіль'; $lang['PROFILE'] = 'Профіль';
@ -1227,7 +1228,7 @@ $lang['SEL_CHAPTERS'] = 'Посилання на вибрані розділи';
$lang['NOT_SEL_CHAPTERS'] = 'Ви не вибрали розділи'; $lang['NOT_SEL_CHAPTERS'] = 'Ви не вибрали розділи';
$lang['SEL_CHAPTERS_HELP'] = 'Ви можете вибрати максимум %s розділів'; $lang['SEL_CHAPTERS_HELP'] = 'Ви можете вибрати максимум %s розділів';
$lang['HIDE_CONTENTS'] = 'Приховати вміст {...}'; $lang['HIDE_CONTENTS'] = 'Приховати вміст {...}';
$lang['FILTER_BY_NAME'] = '<i>фільтрувати за назвою</i>'; $lang['FILTER_BY_NAME'] = '<i>Фільтрувати за назвою</i>';
$lang['BT_ONLY_ACTIVE'] = 'Активні (є сидер або лічер)'; $lang['BT_ONLY_ACTIVE'] = 'Активні (є сидер або лічер)';
$lang['BT_ONLY_MY'] = 'Мої роздачі'; $lang['BT_ONLY_MY'] = 'Мої роздачі';

2
upload/templates/default/css/main.css
View file

@ -732,6 +732,8 @@ td.last_td { border-right-width: 0 !important; }
#online_explain { float: right; } #online_explain { float: right; }
#online_userlist a { white-space: nowrap; } #online_userlist a { white-space: nowrap; }
#forums_top_nav { display: none; } #forums_top_nav { display: none; }
.f-map-wrap { margin-top: -1px; border: 1px solid #DEDEDE; }
/* ---------------------------------- * /* ---------------------------------- *
Forums on viewforum page Forums on viewforum page
* ---------------------------------- */ * ---------------------------------- */

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

@ -12,10 +12,10 @@
<!-- IF LOGGED_IN --> <!-- IF LOGGED_IN -->
<div id="forums_top_links"> <div id="forums_top_links">
<div class="floatL"> <div class="floatL">
<a href="{U_SEARCH_NEW}" class="med">{L_SEARCH_NEW}</a> &#0183;
<a href="{U_SEARCH_SELF_BY_LAST}" class="med">{L_SEARCH_SELF}</a> <a href="#search-my-posts" class="menu-root menu-alt1">{OPEN_MENU_IMG_ALT}</a> &#0183;
<a href="{U_SEARCH_LATEST}" class="med">{L_SEARCH_LATEST}</a> &#0183; <a href="{U_SEARCH_LATEST}" class="med">{L_SEARCH_LATEST}</a> &#0183;
<a href="{U_INDEX}?map=1" class="med bold">{FEED_IMG_ALT} {L_FORUM_MAP}</a> <a href="{U_SEARCH_SELF_BY_LAST}" class="med">{L_SEARCH_SELF}</a> <a href="#search-my-posts" class="menu-root menu-alt1">{OPEN_MENU_IMG_ALT}</a> &#0183;
<a href="{SITE_URL}atom/f/0.atom" class="med">{FEED_IMG} {L_LATEST_RELEASES}</a> &#0183;
<a href="{U_INDEX}?map=1" class="med bold">{FEED_IMG} {L_FORUM_MAP}</a>
</div> </div>
<div class="floatR med bold"> <div class="floatR med bold">
<a class="menu-root" href="#only-new-options">{L_DISPLAYING_OPTIONS}</a> <a class="menu-root" href="#only-new-options">{L_DISPLAYING_OPTIONS}</a>
@ -154,6 +154,7 @@
<!-- IF LOGGED_IN and SHOW_FORUMS --> <!-- IF LOGGED_IN and SHOW_FORUMS -->
<div id="mark_all_forums_read"> <div id="mark_all_forums_read">
<a href="{U_SEARCH_NEW}" class="med">{L_SEARCH_NEW}</a> &#0183;
<a href="{U_INDEX}" class="med" onclick="setCookie('{COOKIE_MARK}', 'all_forums');">{L_MARK_ALL_FORUMS_READ}</a> <a href="{U_INDEX}" class="med" onclick="setCookie('{COOKIE_MARK}', 'all_forums');">{L_MARK_ALL_FORUMS_READ}</a>
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->

71
upload/templates/default/index_map.tpl
View file

@ -1,15 +1,16 @@
<style type="text/css"> <style type="text/css">
#f-map a { font-size: 12px; text-decoration: none; } #f-map a { font-size: 12px; text-decoration: none; padding-left: 8px; }
#f-map li { margin: 4px 0 0 6px; } #f-map li { margin: 4px 0 0 6px; }
#f-map .b { font-weight: bold; } #f-map .b { font-weight: bold; }
ul.tree-root { margin-left: 0; } ul.tree-root { margin-left: 0; }
ul.tree-root ul > li { list-style: disc; } ul.tree-root > li > ul { margin-left: 0; }
ul.tree-root ul ul > li { list-style: circle; } ul.tree-root li { list-style: none; }
ul.tree-root > li { list-style: none !important; padding: 0; margin-left: 0 !important; } ul.tree-root > li { padding: 0; margin-left: 0 !important; }
.c_title { .c_title {
display: block; margin: 9px 0; padding: 0 0 5px 3px; border-bottom: 1px solid #B7C0C5; display: block; margin: 9px 0; padding: 0 0 5px 5px; border-bottom: 1px solid #B7C0C5;
color: #800000; font-size: 13px; font-weight: bold; letter-spacing: 1px; color: #800000; font-size: 13px; font-weight: bold; letter-spacing: 1px;
} }
ul.tree-root img { cursor: pointer; }
a.hl, a.hl:visited { color: #1515FF; } a.hl, a.hl:visited { color: #1515FF; }
</style> </style>
@ -26,6 +27,11 @@ function qs_highlight_found ()
a.className = ''; a.className = '';
} }
} }
function open_feed (f_id)
{
$('#feed-id').val(f_id);
$('#feed-form').submit();
}
$(function(){ $(function(){
$('#q-search').focus().quicksearch('#f-map li', { $('#q-search').focus().quicksearch('#f-map li', {
delay : 300, delay : 300,
@ -33,17 +39,27 @@ $(function(){
show : qs_highlight_found, show : qs_highlight_found,
onAfter : function(){ $('#f-load').hide(); $('#f-map').show(); } onAfter : function(){ $('#f-load').hide(); $('#f-map').show(); }
}); });
$.each($('#f-map a'), function(i,a){ $.each($('#f-map a'), function(i,a) {
$(a).attr('href', 'viewforum.php?f='+ $(a).attr('href')); var f_id = $(a).attr('href');
$(a)
.attr('href', 'viewforum.php?f='+ f_id)
.before('<img class="feed-small" src="{IMG}feed.png" alt="feed" onclick="open_feed('+ f_id +')">')
;
}); });
$.each($('span.c_title'), function(i,el){ $.each($('span.c_title'), function(i,el) {
$(el).text( this.title ); $(el).text( this.title );
this.title = ''; this.title = '';
}); });
}); });
</script> </script>
<div class="row1 pad_8 border bw_TRBL" style="margin-top: 4px;"> <form id="feed-form" method="post" action="feed.php" target="_blank" style="display: none;">
<input type="hidden" name="mode" value="get_feed_url">
<input type="hidden" name="type" value="f">
<input id="feed-id" type="hidden" name="id" value="">
</form>
<div class="f-map-wrap row1 pad_8">
<div style="margin: 20px 56px;"> <div style="margin: 20px 56px;">
<div style="padding: 0 0 12px 3px;"> <div style="padding: 0 0 12px 3px;">
<form autocomplete="off"> <form autocomplete="off">
@ -55,20 +71,29 @@ $(function(){
<div id="f-map" style="display: none;"> <div id="f-map" style="display: none;">
<!-- BEGIN c --> <!-- BEGIN c -->
<ul class="tree-root"> <ul class="tree-root">
<li><span class="b"><span class="c_title" title="{c.CAT_TITLE}" name="{c.CAT_TITLE}"></span></span> <li>
<!-- BEGIN f --> <span class="b">
<ul> <span class="c_title" title="{c.CAT_TITLE}"></span>
<li><span class="b"><a href="{c.f.FORUM_ID}">{c.f.FORUM_NAME}</a></span> </span>
<!-- IF c.f.LAST_SF_ID --> <!-- BEGIN f -->
<ul> <ul>
<!-- BEGIN sf --> <li>
<li><span><a href="{c.f.sf.SF_ID}">{c.f.sf.SF_NAME}</a></span></li> <span class="b">
<!-- END sf --> <a href="{c.f.FORUM_ID}">{c.f.FORUM_NAME}</a>
</ul> </span>
<!-- ENDIF --> <!-- IF c.f.LAST_SF_ID -->
</li> <ul>
</ul> <!-- BEGIN sf -->
<!-- END f --> <li>
<span><a href="{c.f.sf.SF_ID}">{c.f.sf.SF_NAME}</a></span>
</li>
<!-- END sf -->
</ul>
<!-- ENDIF -->
</li>
</ul>
<!-- END f -->
</li>
</ul> </ul>
<!-- END c --> <!-- END c -->
</div> </div>

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

@ -123,13 +123,13 @@ $template->assign_vars(array(
'IMG' => $_main, 'IMG' => $_main,
'TEXT_BUTTONS' => $bb_cfg['text_buttons'], 'TEXT_BUTTONS' => $bb_cfg['text_buttons'],
'POST_BTN_SPACER' => ($bb_cfg['text_buttons']) ? '&nbsp;' : '', 'POST_BTN_SPACER' => ($bb_cfg['text_buttons']) ? '&nbsp;' : '',
'FEED_IMG_ALT' => '<img src="'. $_main .'feed.png" class="feed-small" alt="a" />',
'TOPIC_ATTACH_ICON' => '<img src="images/icon_clip.gif" alt="" />', 'TOPIC_ATTACH_ICON' => '<img src="images/icon_clip.gif" alt="" />',
'OPEN_MENU_IMG_ALT' => '<img src="'. $_main .'menu_open_1.gif" class="menu-alt1" alt="" />', 'OPEN_MENU_IMG_ALT' => '<img src="'. $_main .'menu_open_1.gif" class="menu-alt1" alt="" />',
'TOPIC_LEFT_COL_SPACER_WITDH' => $bb_cfg['topic_left_column_witdh'] - 8, // 8px padding 'TOPIC_LEFT_COL_SPACER_WITDH' => $bb_cfg['topic_left_column_witdh'] - 8, // 8px padding
'POST_IMG_WIDTH_DECR_JS' => $bb_cfg['topic_left_column_witdh'] + $bb_cfg['post_img_width_decr'], 'POST_IMG_WIDTH_DECR_JS' => $bb_cfg['topic_left_column_witdh'] + $bb_cfg['post_img_width_decr'],
'ATTACH_IMG_WIDTH_DECR_JS' => $bb_cfg['topic_left_column_witdh'] + $bb_cfg['attach_img_width_decr'], 'ATTACH_IMG_WIDTH_DECR_JS' => $bb_cfg['topic_left_column_witdh'] + $bb_cfg['attach_img_width_decr'],
'MAGNET_LINKS' => $bb_cfg['magnet_links_enabled'], 'MAGNET_LINKS' => $bb_cfg['magnet_links_enabled'],
'FEED_IMG' => '<img src="'. $_main .'feed.png" class="feed-small" alt="feed" />',
)); ));
// post_buttons // post_buttons