diff --git a/README.md b/README.md index 61cd9c8..8e67276 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Recent Topics for phpBB 3.3 Extension for phpBB to display recent topics on the index page. Originally based on NV Recent Topics by Joas Schilling ([nickvergessen](https://github.com/nickvergessen)), later maintained by PayBas. Now maintained by [avathar](https://www.avathar.be). -**Version:** 3.0.7 (06/04/2026) +**Version:** 3.0.8 (15/04/2026) [![Latest Stable Version](https://img.shields.io/github/v/release/avatharbe/RecentTopics)](https://github.com/avatharbe/RecentTopics/releases) #### Requirements @@ -15,7 +15,7 @@ Originally based on NV Recent Topics by Joas Schilling ([nickvergessen](https:// - PHP 8.1 or higher #### Features -- Recent (or unread) topics list on the index page +- Recent (or unread) topics list on the index page and viewforum page - Standalone pages at `/app.php/rt` (full) and `/app.php/rt/simple` (for iframe embedding) - Three display locations: Top, Bottom or Side - User-overridable preferences via UCP (enable/disable, location, count, sort order, unread only) @@ -25,7 +25,7 @@ Originally based on NV Recent Topics by Joas Schilling ([nickvergessen](https:// - Custom PHP events for extension developers #### ACP Options -- Enable/disable on index page +- Enable/disable on index page and viewforum page (independent settings) - Per-forum include/exclude (in ACP Forum Management) - Pagination: page limit, show all pages toggle - Minimum topic type level (normal/sticky/announcement/global) diff --git a/acp/recenttopics_module.php b/acp/recenttopics_module.php index 7fbd734..3293715 100644 --- a/acp/recenttopics_module.php +++ b/acp/recenttopics_module.php @@ -106,9 +106,29 @@ public function main($id, $mode) $rt_enable = $request->variable('rt_enable', 0); $config->set('rt_index', $rt_enable); + $rt_viewforum = $request->variable('rt_viewforum', 0); + $config->set('rt_viewforum', $rt_viewforum); + + $rt_viewforum_location = $request->variable('rt_viewforum_location', ''); + $old_vf_location = $config['rt_viewforum_location']; + $config->set('rt_viewforum_location', $rt_viewforum_location); + $rt_location = $request->variable('rt_location', ''); + $old_location = $config['rt_location']; $config->set('rt_location', $rt_location); + // Propagate location changes to users who still have the old default + /** @var \phpbb\db\driver\driver_interface $db */ + $db = $phpbb_container->get('dbal.conn'); + if ($rt_viewforum_location !== $old_vf_location) + { + $db->sql_query('UPDATE ' . USERS_TABLE . " SET user_rt_viewforum_location = '" . $db->sql_escape($rt_viewforum_location) . "' WHERE user_rt_viewforum_location = '" . $db->sql_escape($old_vf_location) . "'"); + } + if ($rt_location !== $old_location) + { + $db->sql_query('UPDATE ' . USERS_TABLE . " SET user_rt_location = '" . $db->sql_escape($rt_location) . "' WHERE user_rt_location = '" . $db->sql_escape($old_location) . "'"); + } + $rt_sort_start_time = $request->variable('rt_sort_start_time', false); $config->set('rt_sort_start_time', $rt_sort_start_time); @@ -173,6 +193,23 @@ public function main($id, $mode) ); } + $vf_display_types = array ( + 'RT_TOP' => $language->lang('RT_TOP'), + 'RT_BOTTOM' => $language->lang('RT_BOTTOM'), + ); + + foreach ($vf_display_types as $key => $display_type) + { + $template->assign_block_vars( + 'vf_location_row', + array( + 'VALUE' => $key, + 'SELECTED' => ($config['rt_viewforum_location'] == $key) ? ' selected="selected"' : '', + 'OPTION' => $display_type, + ) + ); + } + $topic_link_options = array( 0 => $language->lang('RT_TOPIC_LINK_FIRST'), 1 => $language->lang('RT_TOPIC_LINK_LAST'), @@ -200,6 +237,7 @@ public function main($id, $mode) 'U_RT_PAGE' => $helper->route('avathar_recenttopicsav_page', [], true, false, \Symfony\Component\Routing\Generator\UrlGeneratorInterface::ABSOLUTE_URL), 'U_RT_SIMPLE_PAGE' => $helper->route('avathar_recenttopicsav_simple', [], true, false, \Symfony\Component\Routing\Generator\UrlGeneratorInterface::ABSOLUTE_URL), 'RT_INDEX' => (int) $config['rt_index'], + 'RT_VIEWFORUM' => (int) $config['rt_viewforum'], 'RT_PAGE_NUMBER' => ($config['rt_page_number'] == '1') ? 'checked="checked"' : '', 'RT_PAGE_NUMBERMAX' => (int) $config['rt_page_numbermax'], 'RT_ANTI_TOPICS' => $config['rt_anti_topics'], @@ -230,6 +268,7 @@ public function main($id, $mode) 'user_rt_sort_start_time' => (int) $config['rt_sort_start_time'] , 'user_rt_unread_only' => (int) $config['rt_unread_only'], 'user_rt_location' => $config['rt_location'], + 'user_rt_viewforum_location' => $config['rt_viewforum_location'], 'user_rt_number' => ((int) $config['rt_number'] > 0 ? (int) $config['rt_number'] : 5 ) ); diff --git a/adm/style/acp_recenttopics.html b/adm/style/acp_recenttopics.html index 4764cc9..576a2d4 100644 --- a/adm/style/acp_recenttopics.html +++ b/adm/style/acp_recenttopics.html @@ -9,7 +9,20 @@

{{ lang('RECENT_TOPICS') }}


{{ lang('RT_DISPLAY_INDEX') }}
- +
+

{{ lang('RT_DISPLAY_VIEWFORUM') }}
+
+
+
+

{{ lang('RT_VIEWFORUM_LOCATION_EXP') }}
+
+ +
+

{{ lang('RT_PAGE_NUMBERMAX_EXP') }}
@@ -63,22 +76,6 @@

{{ lang('RECENT_TOPICS') }}

{% endif %} -
- {{ lang('RT_PAGES') }} -
-

{{ lang('RT_PAGE_ENABLE_EXP') }}
-
-
-
-

{{ lang('RT_PAGE_EXP') }}
-
{{ U_RT_PAGE }}
-
-
-

{{ lang('RT_SIMPLE_PAGE_EXP') }}
-
{{ U_RT_SIMPLE_PAGE }}
-
-
-
{{ lang('RT_OVERRIDABLE') }}
@@ -115,6 +112,21 @@

{{ lang('RECENT_TOPICS') }}

+
+ {{ lang('RT_PAGES') }} +
+

{{ lang('RT_PAGE_ENABLE_EXP') }}
+
+
+
+

{{ lang('RT_PAGE_EXP') }}
+
{{ U_RT_PAGE }}
+
+
+

{{ lang('RT_SIMPLE_PAGE_EXP') }}
+
{{ U_RT_SIMPLE_PAGE }}
+
+
{{ lang('RT_ADS_SETTINGS') }} diff --git a/composer.json b/composer.json index 8ebf084..5e2b46d 100644 --- a/composer.json +++ b/composer.json @@ -3,8 +3,8 @@ "type": "phpbb-extension", "description": "Recent Topics Extension for phpBB 3.3. Adds a list with recent topics to the index page.", "homepage": "https://www.avathar.be", - "version": "3.0.7", - "time": "2026-04-06", + "version": "3.0.8", + "time": "2026-04-15", "keywords": ["phpbb", "extension", "Recent Topics"], "license": "GPL-2.0-only", "authors": [ diff --git a/contrib/CHANGELOG.md b/contrib/CHANGELOG.md index b9e370b..805be42 100644 --- a/contrib/CHANGELOG.md +++ b/contrib/CHANGELOG.md @@ -1,5 +1,8 @@ ### Changelog +- 3.0.8 (15/04/2026) + - [NEW] Added optional recent topics display on viewforum pages (#178) — independent enable/disable and placement (top/bottom) from index page, with per-user UCP override + - 3.0.7 (06/04/2026) - [FIX] Fixed PHP 8 TypeError in sql_fetchfield() when "show all pages" pagination is enabled (#148) - [FIX] Fixed "Undefined array key 1" warning in viewonline listener (#176) diff --git a/core/recenttopics.php b/core/recenttopics.php index 2fdc9be..e550d06 100644 --- a/core/recenttopics.php +++ b/core/recenttopics.php @@ -241,8 +241,9 @@ public function __construct(auth $auth, /** * @param string $tpl_loopname + * @param string $context 'index' or 'viewforum' */ - public function display_recent_topics($tpl_loopname = 'recent_topics') + public function display_recent_topics($tpl_loopname = 'recent_topics', $context = 'index') { if (!function_exists('topic_status')) { @@ -275,11 +276,21 @@ public function display_recent_topics($tpl_loopname = 'recent_topics') $this->display_parent_forums = $this->config['rt_parents']; //rt block location - $this->location = $this->config['rt_location']; - // if user can set location and it is set then use the preference - if ($this->auth->acl_get('u_rt_location') && isset($this->user->data['user_rt_location'])) + if ($context === 'viewforum') { - $this->location = $this->user->data['user_rt_location']; + $this->location = $this->config['rt_viewforum_location']; + if ($this->auth->acl_get('u_rt_location') && isset($this->user->data['user_rt_viewforum_location'])) + { + $this->location = $this->user->data['user_rt_viewforum_location']; + } + } + else + { + $this->location = $this->config['rt_location']; + if ($this->auth->acl_get('u_rt_location') && isset($this->user->data['user_rt_location'])) + { + $this->location = $this->user->data['user_rt_location']; + } } $this->unread_only = $this->config['rt_unread_only']; @@ -398,23 +409,29 @@ public function display_recent_topics($tpl_loopname = 'recent_topics') $vars = ['ads_index_code']; extract($this->dispatcher->trigger_event('avathar.recenttopicsav.modify_ads_code', compact($vars))); - $this->template->assign_vars( - array( - 'RT_SORT_START_TIME' => $this->sort_topics === 'topic_time', - 'S_RECENT_TOPICS' => true, - 'S_LOCATION_TOP' => $this->location == 'RT_TOP', - 'S_LOCATION_BOTTOM' => $this->location == 'RT_BOTTOM', - 'S_LOCATION_SIDE' => $this->location == 'RT_SIDE', - 'S_RT_SIDE_SHOW_DATE' => !empty($this->config['rt_side_show_date']), - 'NEWEST_POST_IMG' => $this->user->img('icon_topic_newest', 'VIEW_NEWEST_POST'), - 'LAST_POST_IMG' => $this->user->img('icon_topic_latest', 'VIEW_LATEST_POST'), - 'POLL_IMG' => $this->user->img('icon_topic_poll', 'TOPIC_POLL'), - 'ADS_INDEX_CODE' => $ads_index_code, - 'S_POSTLOVE' => $this->topic_likes_service !== null, - strtoupper($tpl_loopname) . '_DISPLAY' => true, - ) + $location_prefix = ($context === 'viewforum') ? 'S_VF_LOCATION_' : 'S_LOCATION_'; + + $tpl_vars = array( + 'RT_SORT_START_TIME' => $this->sort_topics === 'topic_time', + 'S_RECENT_TOPICS' => true, + $location_prefix . 'TOP' => $this->location == 'RT_TOP', + $location_prefix . 'BOTTOM' => $this->location == 'RT_BOTTOM', + 'S_RT_SIDE_SHOW_DATE' => !empty($this->config['rt_side_show_date']), + 'NEWEST_POST_IMG' => $this->user->img('icon_topic_newest', 'VIEW_NEWEST_POST'), + 'LAST_POST_IMG' => $this->user->img('icon_topic_latest', 'VIEW_LATEST_POST'), + 'POLL_IMG' => $this->user->img('icon_topic_poll', 'TOPIC_POLL'), + 'ADS_INDEX_CODE' => $ads_index_code, + 'S_POSTLOVE' => $this->topic_likes_service !== null, + strtoupper($tpl_loopname) . '_DISPLAY' => true, ); + if ($context !== 'viewforum') + { + $tpl_vars['S_LOCATION_SIDE'] = $this->location == 'RT_SIDE'; + } + + $this->template->assign_vars($tpl_vars); + $this->fill_template($tpl_loopname, $topic_tracking_info, $topics_count); } @@ -943,7 +960,7 @@ private function fill_template($tpl_loopname, $topic_tracking_info, int $topics_ } } $pagination_url = append_sid($this->root_path . $this->user->page['page_name'], $append_params); - $this->pagination->generate_template_pagination($pagination_url, 'pagination', + $this->pagination->generate_template_pagination($pagination_url, 'rt_pagination', $tpl_loopname . '_start', $topics_count, $this->topics_per_page, max(0, min((int) $this->rtstart, $this->total_topics_limit))); $this->template->assign_vars( array ( diff --git a/event/listener.php b/event/listener.php index f7b95ef..ef6bad9 100644 --- a/event/listener.php +++ b/event/listener.php @@ -66,6 +66,7 @@ public static function getSubscribedEvents() { return array( 'core.index_modify_page_title' => 'display_rt', + 'core.viewforum_generate_page_after' => 'display_rt_viewforum', 'core.viewonline_overwrite_location' => 'viewonline_overwrite_location', 'core.acp_manage_forums_request_data' => 'acp_manage_forums_request_data', 'core.acp_manage_forums_initialise_data' => 'acp_manage_forums_initialise_data', @@ -86,6 +87,17 @@ public function display_rt() } } + /** + * Display recent topics on viewforum page + */ + public function display_rt_viewforum() + { + if (isset($this->config['rt_viewforum']) && $this->config['rt_viewforum']) + { + $this->rt_functions->display_recent_topics('recent_topics', 'viewforum'); + } + } + /** * Show users viewing Recent Topics on the Who Is Online page * diff --git a/event/ucp_listener.php b/event/ucp_listener.php index 4440943..5d61566 100644 --- a/event/ucp_listener.php +++ b/event/ucp_listener.php @@ -108,6 +108,7 @@ public function ucp_prefs_get_data($event) $event['data'], array( 'rt_enable' => $this->request->variable('rt_enable', (int) $this->user->data['user_rt_enable']), 'rt_location' => $this->request->variable('rt_location', $this->user->data['user_rt_location']), + 'rt_viewforum_location' => $this->request->variable('rt_viewforum_location', $this->user->data['user_rt_viewforum_location']), 'rt_number' => $this->request->variable('rt_number', (int) $this->user->data['user_rt_number']), 'rt_sort_start_time' => $this->request->variable('rt_sort_start_time', (int) $this->user->data['user_rt_sort_start_time']), 'rt_unread_only' => $this->request->variable('rt_unread_only', (int) $this->user->data['user_rt_unread_only']), @@ -161,6 +162,31 @@ public function ucp_prefs_get_data($event) ) ); } + + // Viewforum location (top/bottom only) + if ($this->config['rt_viewforum']) + { + $template_vars += array( + 'A_RT_VF_LOCATION' => true, + ); + + $vf_display_types = array ( + 'RT_TOP' => $this->language->lang('RT_TOP'), + 'RT_BOTTOM' => $this->language->lang('RT_BOTTOM'), + ); + + foreach ($vf_display_types as $key => $display_type) + { + $this->template->assign_block_vars( + 'vf_location_row', + array( + 'VALUE' => $key, + 'SELECTED' => ($event['data']['rt_viewforum_location'] == $key) ? ' selected="selected"' : '', + 'OPTION' => $display_type, + ) + ); + } + } } if ($this->auth->acl_get('u_rt_number')) @@ -198,11 +224,12 @@ public function ucp_prefs_set_data($event) { $event['sql_ary'] = array_merge( $event['sql_ary'], array( - 'user_rt_enable' => $event['data']['rt_enable'], - 'user_rt_location' => $event['data']['rt_location'], - 'user_rt_number' => $event['data']['rt_number'], - 'user_rt_sort_start_time' => $event['data']['rt_sort_start_time'], - 'user_rt_unread_only' => $event['data']['rt_unread_only'], + 'user_rt_enable' => $event['data']['rt_enable'], + 'user_rt_location' => $event['data']['rt_location'], + 'user_rt_viewforum_location' => $event['data']['rt_viewforum_location'], + 'user_rt_number' => $event['data']['rt_number'], + 'user_rt_sort_start_time' => $event['data']['rt_sort_start_time'], + 'user_rt_unread_only' => $event['data']['rt_unread_only'], ) ); } @@ -215,11 +242,12 @@ public function ucp_register_set_data($event) { $sql_ary = array( - 'user_rt_enable' => (int) $this->config['rt_index'], - 'user_rt_sort_start_time' => (int) $this->config['rt_sort_start_time'] , - 'user_rt_unread_only' => (int) $this->config['rt_unread_only'], - 'user_rt_location' => $this->config['rt_location'], - 'user_rt_number' => ((int) $this->config['rt_number'] > 0 ? (int) $this->config['rt_number'] : 5 ) + 'user_rt_enable' => (int) $this->config['rt_index'], + 'user_rt_sort_start_time' => (int) $this->config['rt_sort_start_time'], + 'user_rt_unread_only' => (int) $this->config['rt_unread_only'], + 'user_rt_location' => $this->config['rt_location'], + 'user_rt_viewforum_location' => $this->config['rt_viewforum_location'], + 'user_rt_number' => ((int) $this->config['rt_number'] > 0 ? (int) $this->config['rt_number'] : 5) ); $sql = 'UPDATE ' . USERS_TABLE . ' diff --git a/language/ar/info_acp_recenttopics.php b/language/ar/info_acp_recenttopics.php index a2fe95e..884367b 100644 --- a/language/ar/info_acp_recenttopics.php +++ b/language/ar/info_acp_recenttopics.php @@ -32,6 +32,9 @@ //global settings 'RT_GLOBAL_SETTINGS' => 'الإعدادات العامة', 'RT_DISPLAY_INDEX' => 'العرض في الصفحة الرئيسية ', + 'RT_DISPLAY_VIEWFORUM' => 'العرض في صفحة المنتدى', + 'RT_VIEWFORUM_LOCATION' => 'موقع العرض في صفحة المنتدى', + 'RT_VIEWFORUM_LOCATION_EXP' => 'حدد مكان عرض أحدث المواضيع في صفحة المنتدى. هذا الإعداد مستقل عن الصفحة الرئيسية.', 'RT_NUMBER' => 'عدد المواضيع ', 'RT_NUMBER_EXP' => 'عدد المواضيع التي تريد عرضها.', 'RT_PAGE_NUMBER' => 'عرض جميع الصفحات ', diff --git a/language/ar/recenttopics_ucp.php b/language/ar/recenttopics_ucp.php index a41fa20..f7fc993 100644 --- a/language/ar/recenttopics_ucp.php +++ b/language/ar/recenttopics_ucp.php @@ -42,6 +42,8 @@ 'RT_TOP' => 'الأعلى', 'RT_LOCATION' => 'مكان العرض ', 'RT_LOCATION_EXP' => 'حدد المكان لظهور أحدث المواضيع.', + 'RT_VIEWFORUM_LOCATION' => 'موقع العرض في صفحة المنتدى', + 'RT_VIEWFORUM_LOCATION_EXP' => 'حدد مكان عرض أحدث المواضيع في صفحة المنتدى.', 'RT_NUMBER' => 'عدد المواضيع ', 'RT_NUMBER_EXP' => 'عدد المواضيع التي تريد عرضها.', 'RT_SORT_START_TIME' => 'الترتيب حسب وقت إضافة الموضوع ', diff --git a/language/cs/info_acp_recenttopics.php b/language/cs/info_acp_recenttopics.php index cbaa3a3..80df232 100644 --- a/language/cs/info_acp_recenttopics.php +++ b/language/cs/info_acp_recenttopics.php @@ -29,6 +29,9 @@ //global settings 'RT_GLOBAL_SETTINGS' => 'Globální nastavení', 'RT_DISPLAY_INDEX' => 'Zobrazovat na úvodní stránce?', + 'RT_DISPLAY_VIEWFORUM' => 'Zobrazovat na stránce fóra', + 'RT_VIEWFORUM_LOCATION' => 'Umístění na stránce fóra', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Vyberte, kde se mají zobrazovat nedávná témata na stránce fóra. Toto nastavení je nezávislé na úvodní stránce.', 'RT_NUMBER' => 'Nedávná témata', 'RT_NUMBER_EXP' => 'Počet nedávných témat k zobrazení.', 'RT_PAGE_NUMBER' => 'Počet stránek nedávných témat', diff --git a/language/cs/recenttopics_ucp.php b/language/cs/recenttopics_ucp.php index a25839b..5fe8681 100644 --- a/language/cs/recenttopics_ucp.php +++ b/language/cs/recenttopics_ucp.php @@ -25,6 +25,8 @@ 'RT_SIDE' => 'Zobrazit na straně', 'RT_LOCATION' => 'Vyberte umístění', 'RT_LOCATION_EXP' => 'Vyberte umístění pro zobrazení nedávné témata.', + 'RT_VIEWFORUM_LOCATION' => 'Umístění na stránce fóra', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Vyberte, kde se mají zobrazovat nedávná témata na stránce fóra.', 'RT_NUMBER' => 'Nedávná témata', 'RT_NUMBER_EXP' => 'Počet nedávných témat k zobrazení.', 'RT_SORT_START_TIME' => 'Řadit nedávná témata podle času založení', diff --git a/language/de/info_acp_recenttopics.php b/language/de/info_acp_recenttopics.php index 1d492d2..42b682e 100644 --- a/language/de/info_acp_recenttopics.php +++ b/language/de/info_acp_recenttopics.php @@ -48,6 +48,9 @@ //allgemeine Einstellungen 'RT_GLOBAL_SETTINGS' => 'Globale Einstellungen', 'RT_DISPLAY_INDEX' => 'Anzeigen auf der Index-Seite', + 'RT_DISPLAY_VIEWFORUM' => 'Anzeigen auf der Forenansicht-Seite', + 'RT_VIEWFORUM_LOCATION' => 'Anzeigeort Forenansicht', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Wähle, wo die aktuellen Themen auf der Forenansicht-Seite angezeigt werden sollen. Diese Einstellung ist unabhängig von der Indexseite.', 'RT_NUMBER' => 'Anzahl Aktuelle Themen', 'RT_NUMBER_EXP' => 'Maximale Anzahl anzuzeigender Themen pro Seite', 'RT_PAGE_NUMBER' => 'Alle Seiten anzeigen', diff --git a/language/de/recenttopics_ucp.php b/language/de/recenttopics_ucp.php index 070da47..f7ab485 100644 --- a/language/de/recenttopics_ucp.php +++ b/language/de/recenttopics_ucp.php @@ -25,7 +25,9 @@ 'RT_BOTTOM' => 'Ansicht unten', 'RT_SIDE' => 'Ansicht auf der Seite', 'RT_LOCATION' => 'Anzeigeort', - 'RT_LOCATION_EXP' => 'Wähle den Anzeigeort des Blocks „Aktuelle Themen“ auf der Forenseite.', + 'RT_LOCATION_EXP' => 'Wähle den Anzeigeort des Blocks „Aktuelle Themen” auf der Forenseite.', + 'RT_VIEWFORUM_LOCATION' => 'Anzeigeort Forenansicht', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Wähle, wo die aktuellen Themen auf der Forenansicht-Seite angezeigt werden sollen.', 'RT_NUMBER' => 'Anzahl Aktuelle Themen', 'RT_NUMBER_EXP' => 'Maximale Anzahl Themen pro Seite', 'RT_SORT_START_TIME' => 'Nach Themen-Startzeit sortieren', diff --git a/language/de_x_sie/info_acp_recenttopics.php b/language/de_x_sie/info_acp_recenttopics.php index fcdcad6..cb19d42 100644 --- a/language/de_x_sie/info_acp_recenttopics.php +++ b/language/de_x_sie/info_acp_recenttopics.php @@ -48,6 +48,9 @@ //allgemeine Einstellungen 'RT_GLOBAL_SETTINGS' => 'Globale Einstellungen', 'RT_DISPLAY_INDEX' => 'Anzeigen auf der Index-Seite', + 'RT_DISPLAY_VIEWFORUM' => 'Anzeigen auf der Forenansicht-Seite', + 'RT_VIEWFORUM_LOCATION' => 'Anzeigeort Forenansicht', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Wählen Sie, wo die aktuellen Themen auf der Forenansicht-Seite angezeigt werden sollen. Diese Einstellung ist unabhängig von der Indexseite.', 'RT_NUMBER' => 'Anzahl Aktuelle Themen', 'RT_NUMBER_EXP' => 'Maximale Anzahl Themen pro Seite', 'RT_PAGE_NUMBER' => 'Alle Seiten anzeigen', diff --git a/language/de_x_sie/recenttopics_ucp.php b/language/de_x_sie/recenttopics_ucp.php index f3e878f..6b09d40 100644 --- a/language/de_x_sie/recenttopics_ucp.php +++ b/language/de_x_sie/recenttopics_ucp.php @@ -26,6 +26,8 @@ 'RT_SIDE' => 'Ansicht auf die Seite', 'RT_LOCATION' => 'Anzeigelage', 'RT_LOCATION_EXP' => 'Anzeigelage des Blocks «aktuellen Themen»', + 'RT_VIEWFORUM_LOCATION' => 'Anzeigeort Forenansicht', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Wählen Sie, wo die aktuellen Themen auf der Forenansicht-Seite angezeigt werden sollen.', 'RT_NUMBER' => 'Anzahl Aktuelle Themen', 'RT_NUMBER_EXP' => 'Maximale Anzahl Themen pro Seite', 'RT_SORT_START_TIME' => 'Nach Themen Startzeit sortieren', diff --git a/language/en/info_acp_recenttopics.php b/language/en/info_acp_recenttopics.php index 9f300ca..cf16682 100644 --- a/language/en/info_acp_recenttopics.php +++ b/language/en/info_acp_recenttopics.php @@ -32,6 +32,9 @@ //global settings 'RT_GLOBAL_SETTINGS' => 'Global Settings', 'RT_DISPLAY_INDEX' => 'Display on Index page', + 'RT_DISPLAY_VIEWFORUM' => 'Display on Viewforum page', + 'RT_VIEWFORUM_LOCATION' => 'Viewforum display location', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Select where to display recent topics on the viewforum page. This setting is independent from the index page location.', 'RT_NUMBER' => 'Number of recent topics to show', 'RT_NUMBER_EXP' => 'Maximum number of topics to display per page.', 'RT_PAGE_NUMBER' => 'Show all recent topic pages', diff --git a/language/en/recenttopics_ucp.php b/language/en/recenttopics_ucp.php index 4106e4a..687cd33 100644 --- a/language/en/recenttopics_ucp.php +++ b/language/en/recenttopics_ucp.php @@ -47,5 +47,7 @@ 'RT_SORT_START_TIME' => 'Sort recent topics by topic start time', 'RT_SORT_START_TIME_EXP' => 'Instead of sorting them by last post time.', 'RT_UNREAD_ONLY' => 'Only display unread topics in recent topics', + 'RT_VIEWFORUM_LOCATION' => 'Viewforum location', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Select where to display recent topics on the viewforum page.', ) ); diff --git a/language/es/info_acp_recenttopics.php b/language/es/info_acp_recenttopics.php index 00b6b75..98a116b 100644 --- a/language/es/info_acp_recenttopics.php +++ b/language/es/info_acp_recenttopics.php @@ -32,6 +32,9 @@ //ajustes globales 'RT_GLOBAL_SETTINGS' => 'Opciones globales', 'RT_DISPLAY_INDEX' => 'Mostrar en el índice', + 'RT_DISPLAY_VIEWFORUM' => 'Mostrar en la página del foro', + 'RT_VIEWFORUM_LOCATION' => 'Ubicación en vista del foro', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Seleccione dónde mostrar los temas recientes en la página del foro. Esta configuración es independiente de la página del índice.', 'RT_NUMBER' => 'Temas Recientes', 'RT_NUMBER_EXP' => 'Número de temas a mostrar.', 'RT_PAGE_NUMBER' => 'Páginas de temas recientes', diff --git a/language/es/recenttopics_ucp.php b/language/es/recenttopics_ucp.php index c67a9fa..1ea3c7f 100644 --- a/language/es/recenttopics_ucp.php +++ b/language/es/recenttopics_ucp.php @@ -42,6 +42,8 @@ 'RT_SIDE' => 'Mostrar en el lado derecho', 'RT_LOCATION' => 'Seleccionar posición', 'RT_LOCATION_EXP' => 'Elija una posición para mostrar la lista de temas recientes', + 'RT_VIEWFORUM_LOCATION' => 'Ubicación en vista del foro', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Seleccione dónde mostrar los temas recientes en la página del foro.', 'RT_NUMBER' => 'Temas Recientes', 'RT_NUMBER_EXP' => 'Número de temas a mostrar.', 'RT_SORT_START_TIME' => 'Ordenar los temas recientes por la hora de inicio de los temas', diff --git a/language/es_x_tu/info_acp_recenttopics.php b/language/es_x_tu/info_acp_recenttopics.php index 8c317de..d1ac4c1 100644 --- a/language/es_x_tu/info_acp_recenttopics.php +++ b/language/es_x_tu/info_acp_recenttopics.php @@ -32,6 +32,9 @@ //ajustes globales 'RT_GLOBAL_SETTINGS' => 'Opciones globales', 'RT_DISPLAY_INDEX' => 'Mostrar en el índice', + 'RT_DISPLAY_VIEWFORUM' => 'Mostrar en la página del foro', + 'RT_VIEWFORUM_LOCATION' => 'Ubicación en vista del foro', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Elige dónde mostrar los temas recientes en la página del foro. Esta configuración es independiente de la página del índice.', 'RT_NUMBER' => 'Temas Recientes', 'RT_NUMBER_EXP' => 'Número de temas a mostrar.', 'RT_PAGE_NUMBER' => 'Páginas de temas recientes', diff --git a/language/es_x_tu/recenttopics_ucp.php b/language/es_x_tu/recenttopics_ucp.php index 3fae5d9..ed7adb5 100644 --- a/language/es_x_tu/recenttopics_ucp.php +++ b/language/es_x_tu/recenttopics_ucp.php @@ -42,6 +42,8 @@ 'RT_SIDE' => 'Mostrar en el lado derecho', 'RT_LOCATION' => 'Seleccionar posición', 'RT_LOCATION_EXP' => 'Elige una posición para mostrar la lista de temas recientes', + 'RT_VIEWFORUM_LOCATION' => 'Ubicación en vista del foro', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Elige dónde mostrar los temas recientes en la página del foro.', 'RT_NUMBER' => 'Temas Recientes', 'RT_NUMBER_EXP' => 'Número de temas a mostrar.', 'RT_SORT_START_TIME' => 'Ordenar los temas recientes por la hora de inicio de los temas', diff --git a/language/fr/info_acp_recenttopics.php b/language/fr/info_acp_recenttopics.php index 906181a..3d4d4a5 100644 --- a/language/fr/info_acp_recenttopics.php +++ b/language/fr/info_acp_recenttopics.php @@ -48,6 +48,9 @@ //global settings 'RT_GLOBAL_SETTINGS' => 'Paramètres généraux', 'RT_DISPLAY_INDEX' => 'Permet d’afficher la liste des sujets récents sur la page de l’index du forum.', + 'RT_DISPLAY_VIEWFORUM' => 'Afficher sur la page du forum', + 'RT_VIEWFORUM_LOCATION' => 'Emplacement sur la page du forum', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Sélectionnez où afficher les sujets récents sur la page du forum. Ce paramètre est indépendant de la page d’index.', 'RT_NUMBER' => 'Nombre de sujets récents affichés', 'RT_NUMBER_EXP' => 'Permet de saisir le nombre maximum de sujets récents à afficher par page.', 'RT_PAGE_NUMBER' => 'Afficher toutes les pages des sujets récents', diff --git a/language/fr/recenttopics.php b/language/fr/recenttopics.php index a07e938..5ea605a 100644 --- a/language/fr/recenttopics.php +++ b/language/fr/recenttopics.php @@ -38,8 +38,8 @@ $lang = array_merge($lang, array( 'RECENT_TOPICS' => 'Sujets récents', 'RT_NO_TOPICS' => 'Il n’y a aucun nouveau sujet à afficher.', - ‘LIKES’ => 'J’aime', - ‘VIEWING_RECENT_TOPICS’ => 'Consulte les Sujets récents', + 'LIKES' => 'J’aime', + 'VIEWING_RECENT_TOPICS' => 'Consulte les Sujets récents', 'EXTENSION_REQUIRES_330' => 'Cette extension nécessite phpBB 3.3.0 ou supérieur.', ) ); diff --git a/language/fr/recenttopics_ucp.php b/language/fr/recenttopics_ucp.php index b761a41..242fd1f 100644 --- a/language/fr/recenttopics_ucp.php +++ b/language/fr/recenttopics_ucp.php @@ -42,6 +42,8 @@ 'RT_SIDE' => 'Sur le coté droit de la liste des forums', 'RT_LOCATION' => 'Sélectionner l’emplacement de la liste des sujets récents', 'RT_LOCATION_EXP' => 'Permet de sélectionner l’emplacement où afficher la liste des sujets récents.', + 'RT_VIEWFORUM_LOCATION' => 'Emplacement sur la page du forum', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Sélectionnez où afficher les sujets récents sur la page du forum.', 'RT_NUMBER' => 'Nombre de sujets récents affichés', 'RT_NUMBER_EXP' => 'Permet de saisir le nombre maximum de sujets récents à afficher par page.', 'RT_SORT_START_TIME' => 'Trier les sujets récents', diff --git a/language/nl/info_acp_recenttopics.php b/language/nl/info_acp_recenttopics.php index ca2d3f2..8e943f7 100644 --- a/language/nl/info_acp_recenttopics.php +++ b/language/nl/info_acp_recenttopics.php @@ -48,6 +48,9 @@ //algemene instellingen 'RT_GLOBAL_SETTINGS' => 'Algemene instellingen', 'RT_DISPLAY_INDEX' => 'Toon op de indexpagina', + 'RT_DISPLAY_VIEWFORUM' => 'Toon op de forumpagina', + 'RT_VIEWFORUM_LOCATION' => 'Weergavelocatie forumpagina', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Selecteer waar recente onderwerpen op de forumpagina worden weergegeven. Deze instelling is onafhankelijk van de indexpagina.', 'RT_NUMBER' => 'Aantal recente onderwerpen', 'RT_NUMBER_EXP' => 'Maximum aantal onderwerpen per pagina.', 'RT_PAGE_NUMBER' => 'Toon alle pagina’s', diff --git a/language/nl/recenttopics_ucp.php b/language/nl/recenttopics_ucp.php index 34deb11..f099211 100644 --- a/language/nl/recenttopics_ucp.php +++ b/language/nl/recenttopics_ucp.php @@ -25,7 +25,9 @@ 'RT_BOTTOM' => 'Toon beneden', 'RT_SIDE' => 'Toon rechts', 'RT_LOCATION' => 'Plaatsinstelling', - 'RT_LOCATION_EXP' => 'Stel plaats van ’recente onderwerpen’ blok in.', + 'RT_LOCATION_EXP' => 'Stel plaats van "recente onderwerpen" blok in.', + 'RT_VIEWFORUM_LOCATION' => 'Weergavelocatie forumpagina', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Selecteer waar recente onderwerpen op de forumpagina worden weergegeven.', 'RT_NUMBER' => 'Aantal recente onderwerpen', 'RT_NUMBER_EXP' => 'Maximum aantal onderwerpen per pagina.', 'RT_SORT_START_TIME' => 'Sorteer op onderwerptijdstip', diff --git a/language/pt/info_acp_recenttopics.php b/language/pt/info_acp_recenttopics.php index ad233ab..5e5edf9 100644 --- a/language/pt/info_acp_recenttopics.php +++ b/language/pt/info_acp_recenttopics.php @@ -32,6 +32,9 @@ //configurações globais 'RT_GLOBAL_SETTINGS' => 'Configurações globais', 'RT_DISPLAY_INDEX' => 'Exibir na página de índice', + 'RT_DISPLAY_VIEWFORUM' => 'Exibir na página do fórum', + 'RT_VIEWFORUM_LOCATION' => 'Local de exibição no fórum', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Selecione onde exibir os tópicos recentes na página do fórum. Esta configuração é independente da página de índice.', 'RT_NUMBER' => 'Número de tópicos recentes para mostrar', 'RT_NUMBER_EXP' => 'Número máximo de tópicos a serem exibidos por página.', 'RT_PAGE_NUMBER' => 'Mostrar todas as páginas de tópicos recentes', diff --git a/language/pt/recenttopics_ucp.php b/language/pt/recenttopics_ucp.php index 93ff853..d1d542a 100644 --- a/language/pt/recenttopics_ucp.php +++ b/language/pt/recenttopics_ucp.php @@ -42,6 +42,8 @@ 'RT_SIDE' => 'Mostrar no lado direito', 'RT_LOCATION' => 'Selecionar localização', 'RT_LOCATION_EXP' => 'Selecionar local para exibir tópicos recentes.', + 'RT_VIEWFORUM_LOCATION' => 'Local de exibição no fórum', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Selecione onde exibir os tópicos recentes na página do fórum.', 'RT_NUMBER' => 'Número de tópicos recentes para mostrar', 'RT_NUMBER_EXP' => 'Número máximo de tópicos a serem exibidos por página.', 'RT_SORT_START_TIME' => 'Ordenar tópicos recentes por tópico hora de início', diff --git a/language/ru/info_acp_recenttopics.php b/language/ru/info_acp_recenttopics.php index 1e396d8..64511e3 100644 --- a/language/ru/info_acp_recenttopics.php +++ b/language/ru/info_acp_recenttopics.php @@ -31,6 +31,9 @@ //global settings 'RT_GLOBAL_SETTINGS' => 'Общие настройки', 'RT_DISPLAY_INDEX' => 'Показывать на главной странице', + 'RT_DISPLAY_VIEWFORUM' => 'Показывать на странице форума', + 'RT_VIEWFORUM_LOCATION' => 'Расположение на странице форума', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Выберите, где отображать последние темы на странице форума. Эта настройка не зависит от расположения на главной странице.', 'RT_NUMBER' => 'Число тем в списке', 'RT_NUMBER_EXP' => 'Количество тем, отображаемых на главной странице.', 'RT_PAGE_NUMBER' => 'Число страниц в списке тем', diff --git a/language/ru/recenttopics_ucp.php b/language/ru/recenttopics_ucp.php index 55ab33e..31c5c6b 100644 --- a/language/ru/recenttopics_ucp.php +++ b/language/ru/recenttopics_ucp.php @@ -42,6 +42,8 @@ 'RT_SIDE' => 'Показывать сбоку', 'RT_LOCATION' => 'Расположение последних тем', 'RT_LOCATION_EXP' => 'Выберите расположение для отображения блока последних тем.', + 'RT_VIEWFORUM_LOCATION' => 'Расположение на странице форума', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Выберите, где отображать последние темы на странице форума.', 'RT_NUMBER' => 'Число тем в списке', 'RT_NUMBER_EXP' => 'Количество тем, отображаемых на главной странице.', 'RT_SORT_START_TIME' => 'Сортировать по дате создания', diff --git a/language/sk/info_acp_recenttopics.php b/language/sk/info_acp_recenttopics.php index cc68b09..161dc9a 100644 --- a/language/sk/info_acp_recenttopics.php +++ b/language/sk/info_acp_recenttopics.php @@ -32,6 +32,9 @@ //global settings 'RT_GLOBAL_SETTINGS' => 'Globálne nastavenia', 'RT_DISPLAY_INDEX' => 'Zobraziť na úvodnej stránke', + 'RT_DISPLAY_VIEWFORUM' => 'Zobraziť na stránke fóra', + 'RT_VIEWFORUM_LOCATION' => 'Umiestnenie na stránke fóra', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Vyberte, kde sa majú zobrazovať najnovšie témy na stránke fóra. Toto nastavenie je nezávislé od úvodnej stránky.', 'RT_NUMBER' => 'Počet najnovších tém na zobrazenie', 'RT_NUMBER_EXP' => 'Maximálny počet tém na zobrazenie na stránku.', 'RT_PAGE_NUMBER' => 'Zobraziť všetky stránky najnovších tém', diff --git a/language/sk/recenttopics_ucp.php b/language/sk/recenttopics_ucp.php index 82043d4..e88082d 100644 --- a/language/sk/recenttopics_ucp.php +++ b/language/sk/recenttopics_ucp.php @@ -26,6 +26,8 @@ 'RT_SIDE' => 'Zobraziť na strane', 'RT_LOCATION' => 'Vyberte umiestnenie', 'RT_LOCATION_EXP' => 'Vyberte umiestnenie pre zobrazenie najnovších tém.', + 'RT_VIEWFORUM_LOCATION' => 'Umiestnenie na stránke fóra', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Vyberte, kde sa majú zobrazovať najnovšie témy na stránke fóra.', 'RT_NUMBER' => 'Počet najnovších tém na zobrazenie', 'RT_NUMBER_EXP' => 'Maximálny počet tém na zobrazenie na stránku.', 'RT_SORT_START_TIME' => 'Zoradiť najnovšie témy podľa času vytvorenia', diff --git a/language/sv/info_acp_recenttopics.php b/language/sv/info_acp_recenttopics.php index 0a91cf6..6c4e2cc 100644 --- a/language/sv/info_acp_recenttopics.php +++ b/language/sv/info_acp_recenttopics.php @@ -33,6 +33,9 @@ //global settings 'RT_GLOBAL_SETTINGS' => 'Globala inställningar', 'RT_DISPLAY_INDEX' => 'Visa på indexsidan', + 'RT_DISPLAY_VIEWFORUM' => 'Visa på forumsidan', + 'RT_VIEWFORUM_LOCATION' => 'Visningsplats på forumsidan', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Välj var senaste trådar ska visas på forumsidan. Denna inställning är oberoende av indexsidan.', 'RT_NUMBER' => 'Antal senaste trådar att visa', 'RT_NUMBER_EXP' => 'Maximalt antal trådar att visa per sida.', 'RT_PAGE_NUMBER' => 'Visa alla sidor med senaste trådar', diff --git a/language/sv/recenttopics_ucp.php b/language/sv/recenttopics_ucp.php index 24a3ad5..baecdc2 100644 --- a/language/sv/recenttopics_ucp.php +++ b/language/sv/recenttopics_ucp.php @@ -27,6 +27,8 @@ 'RT_TOP' => 'Visa överst', 'RT_LOCATION' => 'Välj plats', 'RT_LOCATION_EXP' => 'Välj plats för att visa senaste trådar.', + 'RT_VIEWFORUM_LOCATION' => 'Visningsplats på forumsidan', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Välj var senaste trådar ska visas på forumsidan.', 'RT_NUMBER' => 'Antal senaste trådar att visa', 'RT_NUMBER_EXP' => 'Maximalt antal trådar att visa per sida.', 'RT_SORT_START_TIME' => 'Sortera senaste trådar efter trådens starttid', diff --git a/language/uk/info_acp_recenttopics.php b/language/uk/info_acp_recenttopics.php index 105202c..54dac7c 100644 --- a/language/uk/info_acp_recenttopics.php +++ b/language/uk/info_acp_recenttopics.php @@ -32,6 +32,9 @@ //global settings 'RT_GLOBAL_SETTINGS' => 'Загальні налаштування', 'RT_DISPLAY_INDEX' => 'Відображати на головній сторінці', + 'RT_DISPLAY_VIEWFORUM' => 'Відображати на сторінці форуму', + 'RT_VIEWFORUM_LOCATION' => 'Розташування на сторінці форуму', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Оберіть, де відображати останні теми на сторінці форуму. Це налаштування не залежить від головної сторінки.', 'RT_NUMBER' => 'Кількість тем в списку', 'RT_NUMBER_EXP' => 'Кількість тем на головній сторінці.', 'RT_PAGE_NUMBER' => 'Кількість сторінок в списку тем', diff --git a/language/uk/recenttopics_ucp.php b/language/uk/recenttopics_ucp.php index d763b57..95718aa 100644 --- a/language/uk/recenttopics_ucp.php +++ b/language/uk/recenttopics_ucp.php @@ -42,6 +42,8 @@ 'RT_TOP' => 'Відображати наверху', 'RT_LOCATION' => 'Оберіть місце розташування', 'RT_LOCATION_EXP' => 'Оберіть розташування блоку з останніми темами.', + 'RT_VIEWFORUM_LOCATION' => 'Розташування на сторінці форуму', + 'RT_VIEWFORUM_LOCATION_EXP' => 'Оберіть, де відображати останні теми на сторінці форуму.', 'RT_NUMBER' => 'Кількість останніх тем на сторінку', 'RT_NUMBER_EXP' => 'Максимальна кількість останніх тем, які будуть відображатись на одній сторінці.', 'RT_SORT_START_TIME' => 'Сортувати список останніх тем за датою створення тем', diff --git a/migrations/v308/release_3_0_8.php b/migrations/v308/release_3_0_8.php new file mode 100644 index 0000000..7011f6b --- /dev/null +++ b/migrations/v308/release_3_0_8.php @@ -0,0 +1,54 @@ +config['rt_version']) && version_compare($this->config['rt_version'], '3.0.8', '>='); + } + + public static function depends_on() + { + return ['\avathar\recenttopicsav\migrations\v307\release_3_0_7']; + } + + public function update_schema() + { + return [ + 'add_columns' => [ + $this->table_prefix . 'users' => [ + 'user_rt_viewforum_location' => ['VCHAR:10', 'RT_TOP'], + ], + ], + ]; + } + + public function revert_schema() + { + return [ + 'drop_columns' => [ + $this->table_prefix . 'users' => [ + 'user_rt_viewforum_location', + ], + ], + ]; + } + + public function update_data() + { + return [ + ['config.add', ['rt_viewforum', 0]], + ['config.add', ['rt_viewforum_location', 'RT_TOP']], + ['config.update', ['rt_version', '3.0.8']], + ]; + } +} diff --git a/styles/all/template/event/ucp_prefs_view_select_menu_append.html b/styles/all/template/event/ucp_prefs_view_select_menu_append.html index 4592bc4..37ec01f 100644 --- a/styles/all/template/event/ucp_prefs_view_select_menu_append.html +++ b/styles/all/template/event/ucp_prefs_view_select_menu_append.html @@ -21,6 +21,18 @@
{% endif %} + {% if A_RT_VF_LOCATION %} +
+

{{ lang('RT_VIEWFORUM_LOCATION_EXP') }}
+
+ +
+
+ {% endif %} {% if A_RT_NUMBER %}

{{ lang('RT_NUMBER_EXP') }}
diff --git a/styles/all/template/event/viewforum_body_online_list_before.html b/styles/all/template/event/viewforum_body_online_list_before.html new file mode 100644 index 0000000..fe20d78 --- /dev/null +++ b/styles/all/template/event/viewforum_body_online_list_before.html @@ -0,0 +1,5 @@ +{% if RECENT_TOPICS_DISPLAY and S_VF_LOCATION_BOTTOM %} +
+{% INCLUDE '@avathar_recenttopicsav/recent_topics_body_topbottom.html' %} +
+{% endif %} diff --git a/styles/all/template/event/viewforum_buttons_bottom_after.html b/styles/all/template/event/viewforum_buttons_bottom_after.html new file mode 100644 index 0000000..5231741 --- /dev/null +++ b/styles/all/template/event/viewforum_buttons_bottom_after.html @@ -0,0 +1 @@ +{# Bottom RT block moved to viewforum_body_online_list_before to avoid rendering inside the action-bar #} diff --git a/styles/all/template/event/viewforum_forum_title_after.html b/styles/all/template/event/viewforum_forum_title_after.html new file mode 100644 index 0000000..2f58bca --- /dev/null +++ b/styles/all/template/event/viewforum_forum_title_after.html @@ -0,0 +1,6 @@ +{% if RECENT_TOPICS_DISPLAY and S_VF_LOCATION_TOP %} +
+{% INCLUDE '@avathar_recenttopicsav/recent_topics_body_topbottom.html' %} +
+
+{% endif %} diff --git a/styles/all/template/recent_topics_body_side.html b/styles/all/template/recent_topics_body_side.html index cfc16b2..555d38e 100644 --- a/styles/all/template/recent_topics_body_side.html +++ b/styles/all/template/recent_topics_body_side.html @@ -84,10 +84,10 @@ -{% if loops.pagination|length %} +{% if loops.rt_pagination|length %}
{% endif %} diff --git a/styles/all/template/recent_topics_body_topbottom.html b/styles/all/template/recent_topics_body_topbottom.html index df30a1f..b4a7e38 100644 --- a/styles/all/template/recent_topics_body_topbottom.html +++ b/styles/all/template/recent_topics_body_topbottom.html @@ -1,11 +1,11 @@ -{% if S_LOCATION_BOTTOM || S_LOCATION_TOP %} +{% if S_LOCATION_BOTTOM || S_LOCATION_TOP || S_VF_LOCATION_BOTTOM || S_VF_LOCATION_TOP %} -{% if loops.pagination|length and (S_LOCATION_TOP) %} +{% if loops.rt_pagination|length and (S_LOCATION_TOP or S_VF_LOCATION_TOP) %}
{% endif %} @@ -121,10 +121,10 @@ {% endfor %} -{% if loops.pagination|length and (S_LOCATION_BOTTOM) %} +{% if loops.rt_pagination|length and (S_LOCATION_BOTTOM or S_VF_LOCATION_BOTTOM) %}
{% endif %} diff --git a/styles/all/template/recent_topics_page.html b/styles/all/template/recent_topics_page.html index 2a9adc1..c2467cf 100644 --- a/styles/all/template/recent_topics_page.html +++ b/styles/all/template/recent_topics_page.html @@ -2,10 +2,10 @@ -{% if loops.pagination|length and (S_LOCATION_TOP) %} +{% if loops.rt_pagination|length and (S_LOCATION_TOP) %}
{% endif %} @@ -120,10 +120,10 @@ {% endfor %} -{% if loops.pagination|length and (S_LOCATION_BOTTOM) %} +{% if loops.rt_pagination|length and (S_LOCATION_BOTTOM) %}
{% endif %} diff --git a/styles/all/template/recent_topics_simple.html b/styles/all/template/recent_topics_simple.html index a233671..7690ba0 100644 --- a/styles/all/template/recent_topics_simple.html +++ b/styles/all/template/recent_topics_simple.html @@ -2,10 +2,10 @@ -{% if loops.pagination|length and (S_LOCATION_TOP) %} +{% if loops.rt_pagination|length and (S_LOCATION_TOP) %}
{% endif %} @@ -116,10 +116,10 @@ {% endfor %} -{% if loops.pagination|length and (S_LOCATION_BOTTOM) %} +{% if loops.rt_pagination|length and (S_LOCATION_BOTTOM) %}
{% endif %} diff --git a/styles/all/template/rt_pagination.html b/styles/all/template/rt_pagination.html new file mode 100644 index 0000000..157952d --- /dev/null +++ b/styles/all/template/rt_pagination.html @@ -0,0 +1,30 @@ + diff --git a/styles/all/theme/recenttopics.css b/styles/all/theme/recenttopics.css index 0a7d61e..84727f6 100644 --- a/styles/all/theme/recenttopics.css +++ b/styles/all/theme/recenttopics.css @@ -108,9 +108,3 @@ white-space: nowrap; } -/* Advertisement block */ -.misc-block.advertisement { - margin: 10px auto; - padding: 0; - overflow: hidden; -} \ No newline at end of file diff --git a/styles/pbwow3/template/recent_topics_body_side.html b/styles/pbwow3/template/recent_topics_body_side.html index 9b6d452..fe1c610 100644 --- a/styles/pbwow3/template/recent_topics_body_side.html +++ b/styles/pbwow3/template/recent_topics_body_side.html @@ -1,8 +1,12 @@ {% if S_LOCATION_SIDE %}
-

{{ lang('RECENT_TOPICS') }}

-
+

{{ lang('RECENT_TOPICS') }} + {% set S_CC_FORUM_HIDDEN = S_EXT_COLCAT_HIDDEN %} + {% set U_CC_COLLAPSE_URL = U_EXT_COLCAT_COLLAPSE_URL %} + {% include '@phpbb_collapsiblecategories/collapsible_categories_button.html' ignore missing %} +

+
{% for recent_topics in loops.recent_topics %} {% if not recent_topics.S_TOPIC_TYPE_SWITCH and not recent_topics.S_FIRST_ROW %} @@ -12,7 +16,7 @@

{{ lang('RECENT_TOPICS') }}

{% if recent_topics.S_FIRST_ROW or not recent_topics.S_TOPIC_TYPE_SWITCH %}
    {% endif %} -
  • {{ lang('RECENT_TOPICS') }}
{% endfor %} - {% if loops.pagination|length %} + {% if loops.rt_pagination|length %}
{% endif %} diff --git a/styles/pbwow3/template/recent_topics_body_topbottom.html b/styles/pbwow3/template/recent_topics_body_topbottom.html index 38964a3..9f610d4 100644 --- a/styles/pbwow3/template/recent_topics_body_topbottom.html +++ b/styles/pbwow3/template/recent_topics_body_topbottom.html @@ -1,9 +1,11 @@ -{% if S_LOCATION_BOTTOM || S_LOCATION_TOP %} +{% if S_LOCATION_BOTTOM || S_LOCATION_TOP || S_VF_LOCATION_BOTTOM || S_VF_LOCATION_TOP %} -{% if loops.pagination|length and (S_LOCATION_TOP) %} + + +{% if loops.rt_pagination|length and (S_LOCATION_TOP or S_VF_LOCATION_TOP) %}
{% endif %} @@ -18,7 +20,7 @@ {% if recent_topics.S_FIRST_ROW or not recent_topics.S_TOPIC_TYPE_SWITCH %}
-

{{ lang('RECENT_TOPICS') }}

+

{{ lang('RECENT_TOPICS') }}

    @@ -29,9 +31,12 @@

    {{ lang('RECENT_TOPICS') }}

    {{ lang('VIEWS') }}
    {{ lang('LAST_POST') }}
- - - +