aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-03-10 15:23:29 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-03-10 15:23:29 +0100
commit72d9cf3a95a6578a3876bf6f9ac7f4c3b9c9ecf0 (patch)
tree13544291c7ff8c293110967999f7729bebc7d2c9
parent6f3ca35ae7c2644514f60bd455189ae012b41560 (diff)
parent5b9fe33b1b3421d24abdd0db15db310aa717fb54 (diff)
downloadforums-72d9cf3a95a6578a3876bf6f9ac7f4c3b9c9ecf0.tar
forums-72d9cf3a95a6578a3876bf6f9ac7f4c3b9c9ecf0.tar.gz
forums-72d9cf3a95a6578a3876bf6f9ac7f4c3b9c9ecf0.tar.bz2
forums-72d9cf3a95a6578a3876bf6f9ac7f4c3b9c9ecf0.tar.xz
forums-72d9cf3a95a6578a3876bf6f9ac7f4c3b9c9ecf0.zip
Merge branch '3.1.x'
-rw-r--r--phpBB/docs/events.md7
-rw-r--r--phpBB/styles/prosilver/template/overall_header.html1
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 37a99570f9..5c4f561a3c 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -811,6 +811,13 @@ overall_header_page_body_before
* Since: 3.1.0-b3
* Purpose: Add content after the page-header, but before the page-body
+overall_header_searchbox_before
+===
+* Locations:
+ + styles/prosilver/template/overall_header.html
+* Since: 3.1.4-RC1
+* Purpose: Add content before the search box in the header
+
overall_header_stylesheets_after
===
* Locations:
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 121094f6e0..a3d8d40019 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -69,6 +69,7 @@
<p class="skiplink"><a href="#start_here">{L_SKIP}</a></p>
</div>
+ <!-- EVENT overall_header_searchbox_before -->
<!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH -->
<div id="search-box" class="search-box search-header">
<form action="{U_SEARCH}" method="get" id="search">