aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-23 20:05:01 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-23 20:05:01 +0200
commit052a4e6f58c4b7fb7e18fbbad8dd3364b5e2c60f (patch)
treeb6059f5d52ba7e57bd3690f2ad1a0911160c385a /phpBB
parentec4924cf1453e2c88b1e49d1fc1f78c97b635688 (diff)
parent12590af750010c422dd38dcc130ad6d25b919743 (diff)
downloadforums-052a4e6f58c4b7fb7e18fbbad8dd3364b5e2c60f.tar
forums-052a4e6f58c4b7fb7e18fbbad8dd3364b5e2c60f.tar.gz
forums-052a4e6f58c4b7fb7e18fbbad8dd3364b5e2c60f.tar.bz2
forums-052a4e6f58c4b7fb7e18fbbad8dd3364b5e2c60f.tar.xz
forums-052a4e6f58c4b7fb7e18fbbad8dd3364b5e2c60f.zip
Merge pull request #2640 from dhruvgoel92/ticket/12532
[ticket/12532] Add navbar_header_username_append/prepend * dhruvgoel92/ticket/12532: [ticket/12532] Move logged_out event into its own <li> [ticket/12532] Fix tab -> space indentation in events.md [ticket/12532] Add navbar_header_logged_out_content event [ticket/12532] Add navbar_header_username_append/prepend
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/events.md28
-rw-r--r--phpBB/styles/prosilver/template/navbar_header.html15
2 files changed, 38 insertions, 5 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index f5bf21a08c..34f2c4b6ec 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -344,6 +344,26 @@ memberlist_view_user_statistics_before
* Since: 3.1.0-a1
* Purpose: Add entries before the user statistics part of any user profile
+navbar_header_username_append
+===
+* Locations:
+ + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b4
+* Purpose: Add text and HTMl after the username shown in the navbar.
+
+navbar_header_logged_out_content
+===
+* Locations:
+ + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b4
+* Purpose: Add text and HTML in place of the username when not logged in.
+
+navbar_header_username_prepend
+===
+* Locations:
+ + styles/prosilver/template/navbar_header.html
+* Since: 3.1.0-b4
+
overall_footer_after
===
* Locations:
@@ -767,7 +787,7 @@ ucp_prefs_view_radio_buttons_prepend
+ styles/prosilver/template/ucp_prefs_view.html
+ styles/subsilver2/template/ucp_prefs_view.html
* Since: 3.1.0-a1
-* Purpose: Add options to the top of the radio buttons block of the Edit
+* Purpose: Add options to the top of the radio buttons block of the Edit
Display Options screen
ucp_prefs_view_radio_buttons_append
@@ -776,7 +796,7 @@ ucp_prefs_view_radio_buttons_append
+ styles/prosilver/template/ucp_prefs_view.html
+ styles/subsilver2/template/ucp_prefs_view.html
* Since: 3.1.0-a1
-* Purpose: Add options to the bottom of the radio buttons block of the Edit
+* Purpose: Add options to the bottom of the radio buttons block of the Edit
Display Options screen
ucp_prefs_view_select_menu_prepend
@@ -785,7 +805,7 @@ ucp_prefs_view_select_menu_prepend
+ styles/prosilver/template/ucp_prefs_view.html
+ styles/subsilver2/template/ucp_prefs_view.html
* Since: 3.1.0-a1
-* Purpose: Add options to the top of the drop-down lists block of the Edit
+* Purpose: Add options to the top of the drop-down lists block of the Edit
Display Options screen
ucp_prefs_view_select_menu_append
@@ -794,7 +814,7 @@ ucp_prefs_view_select_menu_append
+ styles/prosilver/template/ucp_prefs_view.html
+ styles/subsilver2/template/ucp_prefs_view.html
* Since: 3.1.0-a1
-* Purpose: Add options to the bottom of the drop-down lists block of the Edit
+* Purpose: Add options to the bottom of the drop-down lists block of the Edit
Display Options screen
ucp_register_credentials_before
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index 83fa0727ec..67a3b553fd 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -14,7 +14,20 @@
<!-- EVENT overall_header_breadcrumb_append -->
</li>
- <!-- IF S_REGISTERED_USER --><li id="username_logged_in" class="rightside"><!-- IF CURRENT_USER_AVATAR --><a href="{U_USER_PROFILE}" class="header-avatar">{CURRENT_USER_AVATAR}</a> <!-- ENDIF -->{CURRENT_USERNAME_FULL}</li><!-- ENDIF -->
+ <!-- IF S_REGISTERED_USER -->
+ <li id="username_logged_in" class="rightside">
+ <!-- EVENT navbar_header_username_prepend -->
+ <!-- IF CURRENT_USER_AVATAR -->
+ <a href="{U_USER_PROFILE}" class="header-avatar">{CURRENT_USER_AVATAR}</a>
+ <!-- ENDIF -->
+ {CURRENT_USERNAME_FULL}
+ <!-- EVENT navbar_header_username_append -->
+ </li>
+ <!-- ELSE -->
+ <li id="logged_out" class="rightside">
+ <!-- EVENT navbar_header_logged_out_content -->
+ </li>
+ <!-- ENDIF -->
<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --><li class="responsive-search rightside" style="display: none;"><a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH}</a></li><!-- ENDIF -->
</ul>