diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 19:25:32 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 19:25:32 +0100 |
| commit | 987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439 (patch) | |
| tree | a44467f04dff803edbde24e95ca4d1bca9057a40 | |
| parent | 040d451dcca9ae54d8f4b7bdd2f231033765a8f2 (diff) | |
| parent | c31b53942d7b77f9cb069da24eecc703fba34468 (diff) | |
| download | forums-987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439.tar forums-987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439.tar.gz forums-987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439.tar.bz2 forums-987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439.tar.xz forums-987bd7b3a7c9071b162bc3f8c8e8ad0ea961b439.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/memberlist_search.html
| -rw-r--r-- | phpBB/docs/events.md | 21 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_search.html | 3 |
2 files changed, 24 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 6bbaed91b8..436a99d478 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -392,6 +392,27 @@ memberlist_body_username_prepend * Purpose: Add information before every username in the memberlist. Works in all display modes (leader, group and normal memberlist). +memberlist_search_fields_after +=== +* Locations: + + styles/prosilver/template/memberlist_search.html +* Since: 3.1.2-RC1 +* Purpose: Add information after the search fields column. + +memberlist_search_fields_before +=== +* Locations: + + styles/prosilver/template/memberlist_search.html +* Since: 3.1.2-RC1 +* Purpose: Add information before the search fields column. + +memberlist_search_sorting_options_before +=== +* Locations: + + styles/prosilver/template/memberlist_search.html +* Since: 3.1.2-RC1 +* Purpose: Add information before the search sorting options field. + memberlist_view_contact_after === * Locations: diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 4fba966151..ef5d29a8fa 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -6,6 +6,7 @@ <p>{L_FIND_USERNAME_EXPLAIN}</p> + <!-- EVENT memberlist_search_fields_before --> <fieldset class="fields1 column1"> <dl style="overflow: visible;"> <dt><label for="username">{L_USERNAME}{L_COLON}</label></dt> @@ -39,6 +40,7 @@ <dt><label for="search_group_id">{L_GROUP}{L_COLON}</label></dt> <dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd> </dl> + <!-- EVENT memberlist_search_sorting_options_before --> <dl> <dt><label for="sk" class="label3">{L_SORT_BY}{L_COLON}</label></dt> <dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd> @@ -66,6 +68,7 @@ <dd><input class="inputbox medium" type="text" name="ip" id="ip" value="{IP}" /></dd> </dl> <!-- ENDIF --> + <!-- EVENT memberlist_search_fields_after --> </fieldset> <div class="clear"></div> |