Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-08-28 15:54:33 +02:00
commit a08b078440
2 changed files with 10 additions and 1 deletions

View file

@ -2085,6 +2085,13 @@ viewforum_body_topic_row_prepend
* Since: 3.1.7-RC1 * Since: 3.1.7-RC1
* Purpose: Add content at the end of the topic list item. * Purpose: Add content at the end of the topic list item.
viewforum_body_topicrow_row_before
===
* Locations:
+ styles/prosilver/template/viewforum_body.html
* Since: 3.1.10-RC1
* Purpose: Add content before list of topics.
viewforum_buttons_bottom_before viewforum_buttons_bottom_before
=== ===
* Locations: * Locations:

View file

@ -126,6 +126,8 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT viewforum_body_topic_row_before -->
<!-- BEGIN topicrow --> <!-- BEGIN topicrow -->
<!-- IF not topicrow.S_TOPIC_TYPE_SWITCH and not topicrow.S_FIRST_ROW --> <!-- IF not topicrow.S_TOPIC_TYPE_SWITCH and not topicrow.S_FIRST_ROW -->
@ -150,7 +152,7 @@
<ul class="topiclist topics"> <ul class="topiclist topics">
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT viewforum_body_topic_row_before --> <!-- EVENT viewforum_body_topicrow_row_before -->
<li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->"> <li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->">
<!-- EVENT viewforum_body_topic_row_prepend --> <!-- EVENT viewforum_body_topic_row_prepend -->
<dl class="row-item {topicrow.TOPIC_IMG_STYLE}"> <dl class="row-item {topicrow.TOPIC_IMG_STYLE}">