Merge branch '3.2.x' into 3.3.x

This commit is contained in:
Marc Alexander 2020-03-15 15:44:41 +01:00
commit 671efc0726
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 18 additions and 0 deletions

View file

@ -2758,6 +2758,13 @@ viewforum_body_last_post_author_username_prepend
* Since: 3.2.4-RC1 * Since: 3.2.4-RC1
* Purpose: Prepend information to last post author username of member * Purpose: Prepend information to last post author username of member
viewforum_body_online_list_before
===
* Locations:
+ styles/prosilver/template/viewforum_body.html
* Since: 3.2.10-RC1
* Purpose: Add content before the online users list
viewforum_body_topic_author_username_append viewforum_body_topic_author_username_append
=== ===
* Locations: * Locations:
@ -2915,6 +2922,13 @@ viewtopic_body_footer_before
* Purpose: Add content to the bottom of the View topic screen below the posts * Purpose: Add content to the bottom of the View topic screen below the posts
and quick reply, directly before the jumpbox in Prosilver. and quick reply, directly before the jumpbox in Prosilver.
viewtopic_body_online_list_before
===
* Locations:
+ styles/prosilver/template/viewtopic_body.html
* Since: 3.2.10-RC1
* Purpose: Add content before the online users list
viewtopic_body_pagination_top_after viewtopic_body_pagination_top_after
=== ===
* Locations: * Locations:

View file

@ -298,6 +298,8 @@
<!-- INCLUDE jumpbox.html --> <!-- INCLUDE jumpbox.html -->
{% EVENT viewforum_body_online_list_before %}
<!-- IF S_DISPLAY_ONLINE_LIST and U_VIEWONLINE --> <!-- IF S_DISPLAY_ONLINE_LIST and U_VIEWONLINE -->
<div class="stat-block online-list"> <div class="stat-block online-list">
<h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3> <h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3>

View file

@ -449,6 +449,8 @@
<!-- EVENT viewtopic_body_footer_before --> <!-- EVENT viewtopic_body_footer_before -->
<!-- INCLUDE jumpbox.html --> <!-- INCLUDE jumpbox.html -->
{% EVENT viewtopic_body_online_list_before %}
<!-- IF S_DISPLAY_ONLINE_LIST and U_VIEWONLINE --> <!-- IF S_DISPLAY_ONLINE_LIST and U_VIEWONLINE -->
<div class="stat-block online-list"> <div class="stat-block online-list">
<h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3> <h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3>