diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 22:16:24 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-04 22:16:24 +0100 |
| commit | 0c6c94e527fca6edc0d79430088142f4828610e4 (patch) | |
| tree | 18f669d2b6da01dc2fad0d68ddae1abf6d7fd1a0 | |
| parent | cfa2bc534b403fee05ac7e5188ba346313feb45f (diff) | |
| parent | 77b3f36992bf187443b598574032a85ce0a51309 (diff) | |
| download | forums-0c6c94e527fca6edc0d79430088142f4828610e4.tar forums-0c6c94e527fca6edc0d79430088142f4828610e4.tar.gz forums-0c6c94e527fca6edc0d79430088142f4828610e4.tar.bz2 forums-0c6c94e527fca6edc0d79430088142f4828610e4.tar.xz forums-0c6c94e527fca6edc0d79430088142f4828610e4.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/docs/events.md | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_team.html | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index ec3fba91ce..ce77c63397 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1016,6 +1016,20 @@ memberlist_search_sorting_options_before * Since: 3.1.2-RC1 * Purpose: Add information before the search sorting options field. +memberlist_team_username_append +=== +* Locations: + + styles/prosilver/template/memberlist_team.html +* Since: 3.1.11-RC1 +* Purpose: Append information to username of team member + +memberlist_team_username_prepend +=== +* Locations: + + styles/prosilver/template/memberlist_team.html +* Since: 3.1.11-RC1 +* Purpose: Add information before team user username + memberlist_view_contact_after === * Locations: diff --git a/phpBB/styles/prosilver/template/memberlist_team.html b/phpBB/styles/prosilver/template/memberlist_team.html index 63349064bb..59041fbac0 100644 --- a/phpBB/styles/prosilver/template/memberlist_team.html +++ b/phpBB/styles/prosilver/template/memberlist_team.html @@ -19,7 +19,7 @@ <tbody> <!-- BEGIN user --> <tr class="<!-- IF group.user.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF group.user.S_INACTIVE --> inactive<!-- ENDIF -->"> - <td><!-- IF group.user.RANK_IMG --><span class="rank-img">{group.user.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{group.user.RANK_TITLE}</span><!-- ENDIF -->{group.user.USERNAME_FULL}<!-- IF group.user.S_INACTIVE --> ({L_INACTIVE})<!-- ENDIF --></td> + <td><!-- IF group.user.RANK_IMG --><span class="rank-img">{group.user.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{group.user.RANK_TITLE}</span><!-- ENDIF --><!-- EVENT memberlist_team_username_prepend -->{group.user.USERNAME_FULL}<!-- IF group.user.S_INACTIVE --> ({L_INACTIVE})<!-- ENDIF --><!-- EVENT memberlist_team_username_append --></td> <td class="info"><!-- IF group.user.U_GROUP --> <a<!-- IF group.user.GROUP_COLOR --> style="font-weight: bold; color: #{group.user.GROUP_COLOR}"<!-- ENDIF --> href="{group.user.U_GROUP}">{group.user.GROUP_NAME}</a> <!-- ELSE --> |