aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-01-27 14:31:29 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-01-27 14:31:29 +0100
commit3a4dae369ddfc85952591f4672be388cd7a85efb (patch)
treef4ff9b916e9dc35d34333bd261d8a1858bb42dff
parentb8b419704c509c62c8008f28521d7eb54d262360 (diff)
parent3c4f1508590abb2ff6c4b86c9060f3da106ae2a5 (diff)
downloadforums-3a4dae369ddfc85952591f4672be388cd7a85efb.tar
forums-3a4dae369ddfc85952591f4672be388cd7a85efb.tar.gz
forums-3a4dae369ddfc85952591f4672be388cd7a85efb.tar.bz2
forums-3a4dae369ddfc85952591f4672be388cd7a85efb.tar.xz
forums-3a4dae369ddfc85952591f4672be388cd7a85efb.zip
Merge branch '3.1.x'
-rw-r--r--phpBB/docs/events.md14
-rw-r--r--phpBB/styles/prosilver/template/navbar_header.html2
2 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index f1dee8cee8..bb1289b74f 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -1028,6 +1028,20 @@ navbar_header_quick_links_before
* Since: 3.1.0-RC2
* Purpose: Add links to the top of the quick-links drop-down menu in the header
+navbar_header_user_profile_append
+===
+* Locations:
+ + styles/prosilver/template/navbar_header.html
+* Since: 3.1.8-RC1
+* Purpose: Add links to the right of the user drop down area
+
+navbar_header_user_profile_prepend
+===
+* Locations:
+ + styles/prosilver/template/navbar_header.html
+* Since: 3.1.8-RC1
+* Purpose: Add links to the left of the notification area
+
navbar_header_username_append
===
* Locations:
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index a02ec45830..62f32344fb 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -100,6 +100,7 @@
<!-- ENDIF -->
<!-- IF S_REGISTERED_USER -->
+ <!-- EVENT navbar_header_user_profile_prepend -->
<li id="username_logged_in" class="rightside <!-- IF CURRENT_USER_AVATAR --> no-bulletin<!-- ENDIF -->" data-skip-responsive="true">
<!-- EVENT navbar_header_username_prepend -->
<div class="header-profile dropdown-container">
@@ -156,6 +157,7 @@
<!-- INCLUDE notification_dropdown.html -->
</li>
<!-- ENDIF -->
+ <!-- EVENT navbar_header_user_profile_append -->
<!-- ELSE -->
<li class="rightside" data-skip-responsive="true">
<a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">