diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-20 10:23:56 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-20 10:23:56 +0200 |
| commit | 648389af6f5fa53062d93a63f5bb5cb1ec0a65c0 (patch) | |
| tree | 4957a6aef430735e27b822997c2b8573cce46d54 | |
| parent | 7cdaa03e20c8610445aa62925d2cf9c7b9395c52 (diff) | |
| parent | ffe72e500c3039ac5691bc1f3bbab203d8d4779f (diff) | |
| download | forums-648389af6f5fa53062d93a63f5bb5cb1ec0a65c0.tar forums-648389af6f5fa53062d93a63f5bb5cb1ec0a65c0.tar.gz forums-648389af6f5fa53062d93a63f5bb5cb1ec0a65c0.tar.bz2 forums-648389af6f5fa53062d93a63f5bb5cb1ec0a65c0.tar.xz forums-648389af6f5fa53062d93a63f5bb5cb1ec0a65c0.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/docs/events.md
phpBB/styles/subsilver2/template/mcp_forum.html
| -rw-r--r-- | phpBB/docs/events.md | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_forum.html | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 6f334caa79..acf555ecd3 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1211,7 +1211,9 @@ topiclist_row_prepend * Locations: + styles/prosilver/template/search_results.html + styles/prosilver/template/viewforum_body.html + + styles/prosilver/template/mcp_forum.html * Since: 3.1.0-a1 +* Changed: 3.1.6-RC1 Added event to mcp_forum.html * Purpose: Add content into topic rows (inside the elements containing topic titles) topiclist_row_append @@ -1219,7 +1221,9 @@ topiclist_row_append * Locations: + styles/prosilver/template/search_results.html + styles/prosilver/template/viewforum_body.html + + styles/prosilver/template/mcp_forum.html * Since: 3.1.0-a1 +* Changed: 3.1.6-RC1 Added event to mcp_forum.html * Purpose: Add content into topic rows (inside the elements containing topic titles) ucp_agreement_terms_after diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index f62ab11fa1..0758dd6f27 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -13,9 +13,9 @@ <div class="action-bar top"> <div class="pagination"> {TOTAL_TOPICS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> @@ -40,7 +40,7 @@ <dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->> <!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="icon-link"></a><!-- ENDIF --> <div class="list-inner"> - + <!-- EVENT topiclist_row_prepend --> <!-- IF topicrow.S_SELECT_TOPIC --><a href="{topicrow.U_SELECT_TOPIC}" class="topictitle">[ {L_SELECT_MERGE} ]</a> <!-- ENDIF --> <!-- EVENT mcp_forum_topic_title_before --> <a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> @@ -76,7 +76,7 @@ <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF --> {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} </div> - + <!-- EVENT topiclist_row_append --> </div> </dt> <dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd> @@ -109,9 +109,9 @@ <div class="action-bar bottom"> <div class="pagination"> {TOTAL_TOPICS} - <!-- IF .pagination --> + <!-- IF .pagination --> <!-- INCLUDE pagination.html --> - <!-- ELSE --> + <!-- ELSE --> • {PAGE_NUMBER} <!-- ENDIF --> </div> |