Report#30:Close full view after clicking on [read all] at news / announcements text view - thanks again to NCurk for providing this fix

This commit is contained in:
Kevin
2008-01-27 19:25:49 +00:00
parent 6a903e44f9
commit f8b6885b2c
4 changed files with 43 additions and 25 deletions

View File

@@ -36,18 +36,19 @@ $lang = array_merge($lang, array(
// news & global announcements // news & global announcements
'LATEST_ANNOUNCEMENTS' => 'Letzte Bekanntmachung', 'LATEST_ANNOUNCEMENTS' => 'Letzte Bekanntmachung',
'LATEST_NEWS' => 'Aktuelle Beiträge', 'LATEST_NEWS' => 'Aktuelle Beiträge',
'READ_FULL' => 'alles lesen', 'READ_FULL' => 'alles lesen',
'NO_NEWS' => 'Keine neuen Beiträge', 'NO_NEWS' => 'Keine neuen Beiträge',
'NO_ANNOUNCEMENTS' => 'Keine Bekanntmachung', 'NO_ANNOUNCEMENTS' => 'Keine Bekanntmachung',
'POSTED_BY' => 'Autor', 'POSTED_BY' => 'Autor',
'COMMENTS' => 'Antworten', 'COMMENTS' => 'Antworten',
'VIEW_COMMENTS' => 'Antworten anzeigen', 'VIEW_COMMENTS' => 'Antworten anzeigen',
'POST_REPLY' => 'Antwort schreiben', 'POST_REPLY' => 'Antwort schreiben',
'TOPIC_VIEWS' => 'Zugriffe', 'TOPIC_VIEWS' => 'Zugriffe',
'JUMP_NEWEST' => 'Zum letzten Beitrag springen', 'JUMP_NEWEST' => 'Zum letzten Beitrag springen',
'JUMP_FIRST' => 'Zum ersten Beitrag springen', 'JUMP_FIRST' => 'Zum ersten Beitrag springen',
'JUMP_TO_POST' => 'Rufe den Beitrag auf', 'JUMP_TO_POST' => 'Rufe den Beitrag auf',
'BACK' => 'Zurück',
// who is online // who is online
'WIO_TOTAL' => 'Insgesamt', 'WIO_TOTAL' => 'Insgesamt',
@@ -57,8 +58,8 @@ $lang = array_merge($lang, array(
//'RECORD_ONLINE_USERS'=> 'View record: <strong>%1$s</strong><br />%2$s', //'RECORD_ONLINE_USERS'=> 'View record: <strong>%1$s</strong><br />%2$s',
// Birthdays // Birthdays
'BIRTHDAYS_AHEAD' => 'In den nächsten %s Tagen', 'BIRTHDAYS_AHEAD' => 'In den nächsten %s Tagen',
'NO_BIRTHDAYS_AHEAD' => 'In diesem Zeitraum hat kein Mitglied Geburtstag', 'NO_BIRTHDAYS_AHEAD' => 'In diesem Zeitraum hat kein Mitglied Geburtstag',
// user menu // user menu
'USER_MENU' => 'Benutzer Menü', 'USER_MENU' => 'Benutzer Menü',
@@ -195,7 +196,7 @@ $lang = array_merge($lang, array(
// if you change the first day of the week in constants.php, you should change values for the short day names accordingly // if you change the first day of the week in constants.php, you should change values for the short day names accordingly
// e.g. FDOW = Sunday -> $lang['mini_cal']['day'][1] = 'Su'; ... $lang['mini_cal']['day'][7] = 'Sa'; // e.g. FDOW = Sunday -> $lang['mini_cal']['day'][1] = 'Su'; ... $lang['mini_cal']['day'][7] = 'Sa';
// FDOW = Monday -> $lang['mini_cal']['day'][1] = 'Mo'; ... $lang['mini_cal']['day'][7] = 'Su'; // FDOW = Monday -> $lang['mini_cal']['day'][1] = 'Mo'; ... $lang['mini_cal']['day'][7] = 'Su';
'mini_cal' => array( 'mini_cal' => array(
'day' => array( 'day' => array(
'1' => 'Mo', '1' => 'Mo',

View File

@@ -48,6 +48,7 @@ $lang = array_merge($lang, array(
'JUMP_NEWEST' => 'Jump to newest post', 'JUMP_NEWEST' => 'Jump to newest post',
'JUMP_FIRST' => 'Jump to first post', 'JUMP_FIRST' => 'Jump to first post',
'JUMP_TO_POST' => 'Jump to post', 'JUMP_TO_POST' => 'Jump to post',
'BACK' => 'Back',
// who is online // who is online
'WIO_TOTAL' => 'Total', 'WIO_TOTAL' => 'Total',

View File

@@ -107,20 +107,29 @@ else
$topic_id = $fetch_news[$i]['topic_id']; $topic_id = $fetch_news[$i]['topic_id'];
$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id, $global_announce_list = false); $topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id, $global_announce_list = false);
$unread_topic = (isset($topic_tracking_info[$topic_id]) && $fetch_news[$i]['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false; $unread_topic = (isset($topic_tracking_info[$topic_id]) && $fetch_news[$i]['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
$open_bracket = '[ ';
$close_bracket = ' ]';
$read_full = $user->lang['BACK'];
$template->assign_block_vars('announcements_row', array( $template->assign_block_vars('announcements_row', array(
'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
'TITLE' => $fetch_news[$i]['topic_title'], 'TITLE' => $fetch_news[$i]['topic_title'],
'POSTER' => $fetch_news[$i]['username'], 'POSTER' => $fetch_news[$i]['username'],
'TIME' => $fetch_news[$i]['topic_time'], 'TIME' => $fetch_news[$i]['topic_time'],
'TEXT' => $fetch_news[$i]['post_text'], 'TEXT' => $fetch_news[$i]['post_text'],
'REPLIES' => $fetch_news[$i]['topic_replies'], 'REPLIES' => $fetch_news[$i]['topic_replies'],
'TOPIC_VIEWS' => $fetch_news[$i]['topic_views'], 'TOPIC_VIEWS' => $fetch_news[$i]['topic_views'],
'U_LAST_COMMENTS' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", (($forum_id) ? 'f=' . $forum_id . '&amp;' : '') . 'p=' . $fetch_news[$i]['topic_last_post_id'] . '#p' . $fetch_news[$i]['topic_last_post_id']), 'U_LAST_COMMENTS' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", (($forum_id) ? 'f=' . $forum_id . '&amp;' : '') . 'p=' . $fetch_news[$i]['topic_last_post_id'] . '#p' . $fetch_news[$i]['topic_last_post_id']),
'U_VIEW_COMMENTS' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $topic_id), 'U_VIEW_COMMENTS' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $topic_id),
'U_POST_COMMENT' => append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=reply&amp;' . (($forum_id) ? 'f=' . $forum_id . '&amp;' : '') . 't=' . $topic_id), 'U_POST_COMMENT' => append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=reply&amp;' . (($forum_id) ? 'f=' . $forum_id . '&amp;' : '') . 't=' . $topic_id),
'S_POLL' => $fetch_news[$i]['poll'], 'S_POLL' => $fetch_news[$i]['poll'],
'S_UNREAD_INFO' => $unread_topic, 'S_UNREAD_INFO' => $unread_topic,
'U_READ_FULL' => append_sid("{$phpbb_root_path}portal.$phpEx", ''),
'L_READ_FULL' => $read_full,
'OPEN' => $open_bracket,
'CLOSE' => $close_bracket,
)); ));
} }

View File

@@ -95,6 +95,9 @@ else
$topic_id = $fetch_news[$i]['topic_id']; $topic_id = $fetch_news[$i]['topic_id'];
$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id, $global_announce_list = false); $topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id, $global_announce_list = false);
$unread_topic = (isset($topic_tracking_info[$topic_id]) && $fetch_news[$i]['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false; $unread_topic = (isset($topic_tracking_info[$topic_id]) && $fetch_news[$i]['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
$open_bracket = '[ ';
$close_bracket = ' ]';
$read_full = $user->lang['BACK'];
$template->assign_block_vars('news_row', array( $template->assign_block_vars('news_row', array(
'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
@@ -111,6 +114,10 @@ else
'U_POST_COMMENT' => append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=reply&amp;f=' . $fetch_news[$i]['forum_id'] . '&amp;t=' . $fetch_news[$i]['topic_id']), 'U_POST_COMMENT' => append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=reply&amp;f=' . $fetch_news[$i]['forum_id'] . '&amp;t=' . $fetch_news[$i]['topic_id']),
'S_POLL' => $fetch_news[$i]['poll'], 'S_POLL' => $fetch_news[$i]['poll'],
'S_UNREAD_INFO' => $unread_topic, 'S_UNREAD_INFO' => $unread_topic,
'U_READ_FULL' => append_sid("{$phpbb_root_path}portal.$phpEx", ''),
'L_READ_FULL' => $read_full,
'OPEN' => $open_bracket,
'CLOSE' => $close_bracket,
)); ));
} }