1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-22 00:21:02 +01:00

Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander 2016-12-17 16:41:38 +01:00
commit 544c7c4e08
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 16 additions and 0 deletions

View File

@ -1860,6 +1860,13 @@ ucp_main_front_user_activity_after
* Since: 3.1.6-RC1
* Purpose: Add content right after the user activity info viewing UCP front page
ucp_main_front_user_activity_append
===
* Locations:
+ styles/prosilver/template/ucp_main_front.html
* Since: 3.1.11-RC1
* Purpose: Add content after last user activity info viewing UCP front page
ucp_main_front_user_activity_before
===
* Locations:
@ -1867,6 +1874,13 @@ ucp_main_front_user_activity_before
* Since: 3.1.6-RC1
* Purpose: Add content right before the user activity info viewing UCP front page
ucp_main_front_user_activity_prepend
===
* Locations:
+ styles/prosilver/template/ucp_main_front.html
* Since: 3.1.11-RC1
* Purpose: Add content before first user activity info viewing UCP front page
ucp_pm_history_post_buttons_after
===
* Locations:

View File

@ -65,12 +65,14 @@
<!-- EVENT ucp_main_front_user_activity_before -->
<dl class="details">
<!-- EVENT ucp_main_front_user_activity_prepend -->
<dt>{L_JOINED}{L_COLON}</dt> <dd>{JOINED}</dd>
<dt>{L_LAST_ACTIVE}{L_COLON}</dt> <dd>{LAST_VISIT_YOU}</dd>
<dt>{L_TOTAL_POSTS}{L_COLON}</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}{L_COLON}</dt> <dd class="error"><i class="icon fa-exclamation-triangle fa-fw icon-red" aria-hidden="true"></i> [{WARNINGS}]</dd><!-- ENDIF -->
<!-- EVENT ucp_main_front_user_activity_append -->
</dl>
<!-- EVENT ucp_main_front_user_activity_after -->