aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-01-07 16:28:05 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-01-07 16:28:44 +0100
commitd3ca327f2c6bf8600439d6a928efbe9f0a545343 (patch)
tree75553cd65505f05beb3f461bb14159e28f9dfa83
parentca04f61b8a21aec32257fa4ffa0dafde8d932eca (diff)
parenta7058d968ff2e4b4cb4b32fb3f7284bd1a539c93 (diff)
downloadforums-d3ca327f2c6bf8600439d6a928efbe9f0a545343.tar
forums-d3ca327f2c6bf8600439d6a928efbe9f0a545343.tar.gz
forums-d3ca327f2c6bf8600439d6a928efbe9f0a545343.tar.bz2
forums-d3ca327f2c6bf8600439d6a928efbe9f0a545343.tar.xz
forums-d3ca327f2c6bf8600439d6a928efbe9f0a545343.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/prosilver/template/viewtopic_body.html phpBB/styles/subsilver2/template/viewtopic_body.html
-rw-r--r--phpBB/docs/events.md28
-rw-r--r--phpBB/styles/prosilver/template/viewtopic_body.html4
2 files changed, 32 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index a785c6d81c..f1dee8cee8 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -2225,6 +2225,34 @@ viewtopic_body_post_subject_before
* Since: 3.1.7-RC1
* Purpose: Add data before post icon and subject
+viewtopic_body_postrow_back2top_after
+===
+* Locations:
+ + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.8-RC1
+* Purpose: Add content to the post's bottom after the back to top link
+
+viewtopic_body_postrow_back2top_append
+===
+* Locations:
+ + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.8-RC1
+* Purpose: Add content to the post's bottom directly before the back to top link
+
+viewtopic_body_postrow_back2top_before
+===
+* Locations:
+ + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.8-RC1
+* Purpose: Add content to the post's bottom before the back to top link
+
+viewtopic_body_postrow_back2top_prepend
+===
+* Locations:
+ + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.8-RC1
+* Purpose: Add content to the post's bottom directly before the back to top link
+
viewtopic_body_postrow_custom_fields_after
===
* Locations:
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 5067cac418..0df6956181 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -359,12 +359,16 @@
</div>
+ <!-- EVENT viewtopic_body_postrow_back2top_before -->
<div class="back2top">
+ <!-- EVENT viewtopic_body_postrow_back2top_prepend -->
<a href="#top" class="top" title="{L_BACK_TO_TOP}">
<i class="icon fa-chevron-circle-up fa-fw icon-gray" aria-hidden="true"></i>
<span class="sr-only">{L_BACK_TO_TOP}</span>
</a>
+ <!-- EVENT viewtopic_body_postrow_back2top_append -->
</div>
+ <!-- EVENT viewtopic_body_postrow_back2top_after -->
</div>
</div>