makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2021-03-14 09:30:52 +01:00
commit 9437d1cfe0
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 55 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
phpBB/docs/events.md
View file

@ -986,6 +986,34 @@ mcp_forum_actions_before
* Since: 3.1.11-RC1
* Purpose: Add some information before actions fieldset
mcp_forum_last_post_author_username_append
===
* Locations:
+ styles/prosilver/template/mcp_forum.html (2)
* Since: 3.3.4-RC1
* Purpose: Append information to last post author username of member
mcp_forum_last_post_author_username_prepend
===
* Locations:
+ styles/prosilver/template/mcp_forum.html (2)
* Since: 3.3.4-RC1
* Purpose: Prepend information to last post author username of member
mcp_forum_topic_author_username_append
===
* Locations:
+ styles/prosilver/template/mcp_forum.html
* Since: 3.3.4-RC1
* Purpose: Append information to topic author username of member
mcp_forum_topic_author_username_prepend
===
* Locations:
+ styles/prosilver/template/mcp_forum.html
* Since: 3.3.4-RC1
* Purpose: Prepend information to topic author username of member
mcp_forum_topic_title_after
===
* Locations:
@ -2279,6 +2307,13 @@ search_results_post_before
* Since: 3.1.0-b3
* Purpose: Add data before search result posts
search_results_post_subject_before
===
* Locations:
+ styles/prosilver/template/search_results.html
* Since: 3.3.4-RC1
* Purpose: Add data before search result posts subject
search_results_postprofile_after
===
* Locations:
@ -2328,6 +2363,20 @@ search_results_topic_before
* Since: 3.1.0-b4
* Purpose: Add data before search result topics
search_results_topic_header_lastpost_after
===
* Locations:
+ styles/prosilver/template/search_results.html
* Since: 3.3.4-RC1
* Purpose: Add header column(s) after `lastpost` column in search result topics
search_results_topic_row_lastpost_after
===
* Locations:
+ styles/prosilver/template/search_results.html
* Since: 3.3.4-RC1
* Purpose: Add data column(s) after `lastpost` column in search result topics
search_results_topic_title_after
===
* Locations:

6
phpBB/styles/prosilver/template/mcp_forum.html
View file

@ -81,7 +81,7 @@
<!-- EVENT topiclist_row_topic_title_after -->
<div class="responsive-show" style="display: none;">
{% if topicrow.ATTACH_ICON_IMG %}{{ Icon('iconify', 'fa:paperclip', '', true) }} {% endif %}
{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; {topicrow.LAST_POST_TIME}<br />
{L_LAST_POST} {L_POST_BY_AUTHOR} {% EVENT mcp_forum_last_post_author_username_prepend %}{topicrow.LAST_POST_AUTHOR_FULL}{% EVENT mcp_forum_last_post_author_username_append %} &laquo; {topicrow.LAST_POST_TIME}<br />
</div>
<span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span>
@ -103,14 +103,14 @@
<div class="responsive-hide">
{% if topicrow.ATTACH_ICON_IMG %}{{ Icon('iconify', 'fa:paperclip', '', true) }} {% endif %}
{% EVENT topiclist_row_topic_by_author_before %}
{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
{L_POST_BY_AUTHOR} {% EVENT mcp_forum_topic_author_username_prepend %}{topicrow.TOPIC_AUTHOR_FULL}{% EVENT mcp_forum_topic_author_username_append %} &raquo; {topicrow.FIRST_POST_TIME}
{% EVENT topiclist_row_topic_by_author_after %}
</div>
<!-- EVENT topiclist_row_append -->
</div>
</dt>
<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}<br />{topicrow.LAST_POST_TIME}</span></dd>
<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {% EVENT mcp_forum_last_post_author_username_prepend %}{topicrow.LAST_POST_AUTHOR_FULL}{% EVENT mcp_forum_last_post_author_username_append %}<br />{topicrow.LAST_POST_TIME}</span></dd>
<!-- IF not S_MERGE_SELECT -->
<dd class="mark">
<!-- IF not topicrow.S_MOVED_TOPIC --><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}"<!-- IF topicrow.S_TOPIC_CHECKED --> checked="checked"<!-- ENDIF --> /><!-- ELSE -->&nbsp;<!-- ENDIF -->

3
phpBB/styles/prosilver/template/search_results.html
View file

@ -69,6 +69,7 @@
<dd class="posts">{L_REPLIES}</dd>
<dd class="views">{L_VIEWS}</dd>
<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
{% EVENT search_results_topic_header_lastpost_after %}
</dl>
</li>
</ul>
@ -169,6 +170,7 @@
<br /><time datetime="{searchresults.LAST_POST_TIME_RFC3339}">{searchresults.LAST_POST_TIME}</time>
</span>
</dd>
{% EVENT search_results_topic_row_lastpost_after %}
</dl>
</li>
<!-- EVENT search_results_topic_after -->
@ -210,6 +212,7 @@
</dl>
<div class="postbody">
{% EVENT search_results_post_subject_before %}
<h3><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></h3>
<div class="content">{searchresults.MESSAGE}</div>
<!-- EVENT search_results_content_after -->