From f8b6885b2c4c0c4d8ef73c408603de4bf8a137a7 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 27 Jan 2008 19:25:49 +0000 Subject: [PATCH] Report#30:Close full view after clicking on [read all] at news / announcements text view - thanks again to NCurk for providing this fix --- languages/de/mods/lang_portal.php | 27 +++++++++++----------- root/language/en/mods/lang_portal.php | 1 + root/portal/block/announcements.php | 33 +++++++++++++++++---------- root/portal/block/news.php | 7 ++++++ 4 files changed, 43 insertions(+), 25 deletions(-) diff --git a/languages/de/mods/lang_portal.php b/languages/de/mods/lang_portal.php index 16186ec0..6741ac1d 100644 --- a/languages/de/mods/lang_portal.php +++ b/languages/de/mods/lang_portal.php @@ -36,18 +36,19 @@ $lang = array_merge($lang, array( // news & global announcements 'LATEST_ANNOUNCEMENTS' => 'Letzte Bekanntmachung', - 'LATEST_NEWS' => 'Aktuelle Beiträge', - 'READ_FULL' => 'alles lesen', - 'NO_NEWS' => 'Keine neuen Beiträge', + 'LATEST_NEWS' => 'Aktuelle Beiträge', + 'READ_FULL' => 'alles lesen', + 'NO_NEWS' => 'Keine neuen Beiträge', 'NO_ANNOUNCEMENTS' => 'Keine Bekanntmachung', - 'POSTED_BY' => 'Autor', - 'COMMENTS' => 'Antworten', + 'POSTED_BY' => 'Autor', + 'COMMENTS' => 'Antworten', 'VIEW_COMMENTS' => 'Antworten anzeigen', - 'POST_REPLY' => 'Antwort schreiben', - 'TOPIC_VIEWS' => 'Zugriffe', - 'JUMP_NEWEST' => 'Zum letzten Beitrag springen', - 'JUMP_FIRST' => 'Zum ersten Beitrag springen', - 'JUMP_TO_POST' => 'Rufe den Beitrag auf', + 'POST_REPLY' => 'Antwort schreiben', + 'TOPIC_VIEWS' => 'Zugriffe', + 'JUMP_NEWEST' => 'Zum letzten Beitrag springen', + 'JUMP_FIRST' => 'Zum ersten Beitrag springen', + 'JUMP_TO_POST' => 'Rufe den Beitrag auf', + 'BACK' => 'Zurück', // who is online 'WIO_TOTAL' => 'Insgesamt', @@ -57,8 +58,8 @@ $lang = array_merge($lang, array( //'RECORD_ONLINE_USERS'=> 'View record: %1$s
%2$s', // Birthdays - 'BIRTHDAYS_AHEAD' => 'In den nächsten %s Tagen', - 'NO_BIRTHDAYS_AHEAD' => 'In diesem Zeitraum hat kein Mitglied Geburtstag', + 'BIRTHDAYS_AHEAD' => 'In den nächsten %s Tagen', + 'NO_BIRTHDAYS_AHEAD' => 'In diesem Zeitraum hat kein Mitglied Geburtstag', // user menu '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 // 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( 'day' => array( '1' => 'Mo', diff --git a/root/language/en/mods/lang_portal.php b/root/language/en/mods/lang_portal.php index 668d5cb5..00822cdf 100644 --- a/root/language/en/mods/lang_portal.php +++ b/root/language/en/mods/lang_portal.php @@ -48,6 +48,7 @@ $lang = array_merge($lang, array( 'JUMP_NEWEST' => 'Jump to newest post', 'JUMP_FIRST' => 'Jump to first post', 'JUMP_TO_POST' => 'Jump to post', + 'BACK' => 'Back', // who is online 'WIO_TOTAL' => 'Total', diff --git a/root/portal/block/announcements.php b/root/portal/block/announcements.php index b103c551..a9ab926b 100644 --- a/root/portal/block/announcements.php +++ b/root/portal/block/announcements.php @@ -107,20 +107,29 @@ else $topic_id = $fetch_news[$i]['topic_id']; $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; + $open_bracket = '[ '; + $close_bracket = ' ]'; + $read_full = $user->lang['BACK']; + $template->assign_block_vars('announcements_row', array( - 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', - 'TITLE' => $fetch_news[$i]['topic_title'], - 'POSTER' => $fetch_news[$i]['username'], - 'TIME' => $fetch_news[$i]['topic_time'], - 'TEXT' => $fetch_news[$i]['post_text'], - 'REPLIES' => $fetch_news[$i]['topic_replies'], - 'TOPIC_VIEWS' => $fetch_news[$i]['topic_views'], - 'U_LAST_COMMENTS' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", (($forum_id) ? 'f=' . $forum_id . '&' : '') . '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_POST_COMMENT' => append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=reply&' . (($forum_id) ? 'f=' . $forum_id . '&' : '') . 't=' . $topic_id), - 'S_POLL' => $fetch_news[$i]['poll'], - 'S_UNREAD_INFO' => $unread_topic, + 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', + 'TITLE' => $fetch_news[$i]['topic_title'], + 'POSTER' => $fetch_news[$i]['username'], + 'TIME' => $fetch_news[$i]['topic_time'], + 'TEXT' => $fetch_news[$i]['post_text'], + 'REPLIES' => $fetch_news[$i]['topic_replies'], + 'TOPIC_VIEWS' => $fetch_news[$i]['topic_views'], + 'U_LAST_COMMENTS' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", (($forum_id) ? 'f=' . $forum_id . '&' : '') . '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_POST_COMMENT' => append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=reply&' . (($forum_id) ? 'f=' . $forum_id . '&' : '') . 't=' . $topic_id), + 'S_POLL' => $fetch_news[$i]['poll'], + '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, + )); } diff --git a/root/portal/block/news.php b/root/portal/block/news.php index b209e4ed..5e5ab04b 100644 --- a/root/portal/block/news.php +++ b/root/portal/block/news.php @@ -95,6 +95,9 @@ else $topic_id = $fetch_news[$i]['topic_id']; $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; + $open_bracket = '[ '; + $close_bracket = ' ]'; + $read_full = $user->lang['BACK']; $template->assign_block_vars('news_row', array( '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&f=' . $fetch_news[$i]['forum_id'] . '&t=' . $fetch_news[$i]['topic_id']), 'S_POLL' => $fetch_news[$i]['poll'], '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, )); }