diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-16 10:08:19 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-16 10:08:19 +0100 |
| commit | 8da2f349fe39a46fcd70e59ff087071927edbc34 (patch) | |
| tree | 09364a69f0b2adb2da32d9e777b6ad1796d3fa9a /phpBB | |
| parent | a999dbad747f45605bbd74264c235e0b39b5af63 (diff) | |
| parent | b13f64b5a984c4f4848f1461c6675467df07f9be (diff) | |
| download | forums-8da2f349fe39a46fcd70e59ff087071927edbc34.tar forums-8da2f349fe39a46fcd70e59ff087071927edbc34.tar.gz forums-8da2f349fe39a46fcd70e59ff087071927edbc34.tar.bz2 forums-8da2f349fe39a46fcd70e59ff087071927edbc34.tar.xz forums-8da2f349fe39a46fcd70e59ff087071927edbc34.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/12054' into develop
* vsephpbb/ticket/12054:
[ticket/12054] Re-word event documentation
[ticket/12054] Reword descriptions and resort events alphabetically
[ticket/12054] Update index_body_linklist_before/after template events
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/events.md | 12 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/index_body.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/index_body.html | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 0130362131..65dd6c3899 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -54,13 +54,21 @@ forumlist_body_last_post_title_prepend * Since: 3.1.0-a1 * Purpose: Add content before the post title of the latest post in a forum on the forum list. -index_body_forumlist_before +index_body_linklist_after === * Locations: + styles/prosilver/template/index_body.html + styles/subsilver2/template/index_body.html * Since: 3.1.0-a3 -* Purpose: Add content above the forums list (on forum index only) +* Purpose: Add content after the linklist above the forum list on Board index + +index_body_linklist_before +=== +* Locations: + + styles/prosilver/template/index_body.html + + styles/subsilver2/template/index_body.html +* Since: 3.1.0-a3 +* Purpose: Add content before the linklist above the forum list on Board index index_body_stat_blocks_before === diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index bd640fd63f..58a5420db3 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -3,6 +3,8 @@ <p class="{S_CONTENT_FLOW_END} responsive-center<!-- IF S_USER_LOGGED_IN --> rightside<!-- ENDIF -->"><!-- IF S_USER_LOGGED_IN -->{LAST_VISIT_DATE}<!-- ELSE -->{CURRENT_TIME}<!-- ENDIF --></p> <!-- IF S_USER_LOGGED_IN --><p class="responsive-center">{CURRENT_TIME}<!-- IF U_MCP or U_ACP --> <br />[ <!-- IF U_ACP --><a href="{U_ACP}" title="{L_ACP}" data-responsive-text="{L_ACP_SHORT}">{L_ACP}</a><!-- IF U_MCP --> | <!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}" title="{L_MCP}" data-responsive-text="{L_MCP_SHORT}">{L_MCP}</a><!-- ENDIF --> ]<!-- ENDIF --></p><!-- ENDIF --> +<!-- EVENT index_body_linklist_before --> + <!-- IF S_DISPLAY_SEARCH or (S_USER_LOGGED_IN and not S_IS_BOT) --> <ul class="linklist bulletin"> <!-- IF S_DISPLAY_SEARCH --> @@ -19,7 +21,7 @@ </ul> <!-- ENDIF --> -<!-- EVENT index_body_forumlist_before --> +<!-- EVENT index_body_linklist_after --> <!-- INCLUDE forumlist_body.html --> diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index 00c328e994..763028966f 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -1,5 +1,7 @@ <!-- INCLUDE overall_header.html --> +<!-- EVENT index_body_linklist_before --> + <!-- IF U_MCP or U_ACP --> <div id="pageheader"> <p class="linkmcp">[ <!-- IF U_ACP --><a href="{U_ACP}">{L_ACP}</a><!-- IF U_MCP --> | <!-- ENDIF --><!-- ENDIF --><!-- IF U_MCP --><a href="{U_MCP}">{L_MCP}</a><!-- ENDIF --> ]</p> @@ -8,7 +10,7 @@ <br clear="all" /><br /> <!-- ENDIF --> -<!-- EVENT index_body_forumlist_before --> +<!-- EVENT index_body_linklist_after --> <!-- INCLUDE forumlist_body.html --> |