From 7c736d527d9aa386633b84d7d98e6e779e70271c Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Fri, 13 Nov 2015 05:50:10 -0500 Subject: [PATCH 1/4] [ticket/14289] Add events to navbar header PHPBB3-14289 --- phpBB/docs/events.md | 14 ++++++++++++++ phpBB/styles/prosilver/template/navbar_header.html | 2 ++ 2 files changed, 16 insertions(+) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 67f187ec81..1a77caad22 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1072,6 +1072,20 @@ navbar_header_logged_out_content * Since: 3.1.0-RC1 * Purpose: Add text and HTML in place of the username when not logged in. +navbar_header_navigation_append +=== +* Locations: + + styles/prosilver/template/navbar_header.html +* Since: 3.1.7-RC1 +* Purpose: Add links to the left of the notification area + +navbar_header_navigation_prepend +=== +* Locations: + + styles/prosilver/template/navbar_header.html +* Since: 3.1.7-RC1 +* Purpose: Add links to the right of the user drop down area + navbar_header_profile_list_after === * Locations: diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index faf48e0b05..07e6ff0440 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -46,6 +46,7 @@
  • {L_MCP_SHORT}
    • +
  • @@ -80,6 +81,7 @@
    • +
  • {L_LOGIN_LOGOUT}
    • From 469b975f94874ce88c1a332e1fe79deb31676975 Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Sun, 10 Jan 2016 06:53:44 -0500 Subject: [PATCH 2/4] [ticket/14289] Change to 3.1.8-RC1 and rename event PHPBB3-14289 --- phpBB/docs/events.md | 8 ++++---- phpBB/styles/prosilver/template/navbar_header.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 1a77caad22..70bdd71ae1 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1072,18 +1072,18 @@ navbar_header_logged_out_content * Since: 3.1.0-RC1 * Purpose: Add text and HTML in place of the username when not logged in. -navbar_header_navigation_append +navbar_header_user_profile_prepend === * Locations: + styles/prosilver/template/navbar_header.html -* Since: 3.1.7-RC1 +* Since: 3.1.8-RC1 * Purpose: Add links to the left of the notification area -navbar_header_navigation_prepend +navbar_header_user_profile_append === * Locations: + styles/prosilver/template/navbar_header.html -* Since: 3.1.7-RC1 +* Since: 3.1.8-RC1 * Purpose: Add links to the right of the user drop down area navbar_header_profile_list_after diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index 07e6ff0440..e948e2e0f6 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -46,7 +46,7 @@
  • {L_MCP_SHORT}
    • - +
  • @@ -81,7 +81,7 @@
    • - +
  • {L_LOGIN_LOGOUT}
    • From 9b51fe2dd54180134908e923ec843d70788ef4b7 Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Sat, 16 Jan 2016 09:21:07 -0500 Subject: [PATCH 3/4] [ticket/14289] Move append before prepend in events doc PHPBB3-14289 --- phpBB/docs/events.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 70bdd71ae1..cdf7a65247 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1072,13 +1072,6 @@ navbar_header_logged_out_content * Since: 3.1.0-RC1 * Purpose: Add text and HTML in place of the username when not logged in. -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_user_profile_append === * Locations: @@ -1086,6 +1079,13 @@ navbar_header_user_profile_append * 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_profile_list_after === * Locations: From 3af3c391a7dda860a60bcc8ef21d5679a4a31ec6 Mon Sep 17 00:00:00 2001 From: Richard McGirr Date: Mon, 18 Jan 2016 08:17:59 -0500 Subject: [PATCH 4/4] [ticket/14289] Fix location in events.md file PHPBB3-14289 --- phpBB/docs/events.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index cdf7a65247..092f3bc0cf 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1072,20 +1072,6 @@ navbar_header_logged_out_content * Since: 3.1.0-RC1 * Purpose: Add text and HTML in place of the username when not logged in. -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_profile_list_after === * Locations: @@ -1114,6 +1100,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: