diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-09 10:08:06 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-09 10:08:06 +0200 |
| commit | 7b8f8d7d907386a860bbef3f19dbe26953e128b0 (patch) | |
| tree | e3ed0975bacc5e77ee4d284cc3800509c3b157a2 | |
| parent | b1d8f8a22c5be677a0f51299a683965e15b4b4f0 (diff) | |
| parent | 9e38f412ea0f1b0d8f3b1f03ae3dea1153517910 (diff) | |
| download | forums-7b8f8d7d907386a860bbef3f19dbe26953e128b0.tar forums-7b8f8d7d907386a860bbef3f19dbe26953e128b0.tar.gz forums-7b8f8d7d907386a860bbef3f19dbe26953e128b0.tar.bz2 forums-7b8f8d7d907386a860bbef3f19dbe26953e128b0.tar.xz forums-7b8f8d7d907386a860bbef3f19dbe26953e128b0.zip | |
Merge branch '3.1.x'
| -rw-r--r-- | phpBB/docs/events.md | 16 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 5 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index e349fe8e85..743db977dc 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1270,6 +1270,22 @@ ucp_pm_viewmessage_post_buttons_before * Purpose: Add post button to private messages (next to edit, quote etc), at the start of the list. +ucp_pm_viewmessage_post_buttons_list_after +=== +* Locations: + + styles/prosilver/template/ucp_pm_viewmessage.html +* Since: 3.1.6-RC1 +* Purpose: Add post button custom list to private messages (next to edit, quote etc), +after the original list. + +ucp_pm_viewmessage_post_buttons_list_before +=== +* Locations: + + styles/prosilver/template/ucp_pm_viewmessage.html +* Since: 3.1.6-RC1 +* Purpose: Add post button custom list to private messages (next to edit, quote etc), +before the original list. + ucp_pm_viewmessage_print_head_append === * Locations: diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 7704209fc8..d92b90a045 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -75,7 +75,9 @@ <div class="postbody"> <h3 class="first">{SUBJECT}</h3> - <!-- IF U_DELETE or U_EDIT or U_QUOTE or U_REPORT --> + <!-- DEFINE $SHOW_PM_POST_BUTTONS = (U_EDIT or U_DELETE or U_REPORT or U_QUOTE) --> + <!-- EVENT ucp_pm_viewmessage_post_buttons_list_before --> + <!-- IF $SHOW_PM_POST_BUTTONS --> <ul class="post-buttons"> <!-- EVENT ucp_pm_viewmessage_post_buttons_before --> <!-- IF U_EDIT --> @@ -101,6 +103,7 @@ <!-- EVENT ucp_pm_viewmessage_post_buttons_after --> </ul> <!-- ENDIF --> + <!-- EVENT ucp_pm_viewmessage_post_buttons_list_after --> <p class="author"> <strong>{L_SENT_AT}{L_COLON}</strong> {SENT_DATE} diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index e2f04db3e1..449fd3401f 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -212,9 +212,10 @@ <h3 <!-- IF postrow.S_FIRST_ROW -->class="first"<!-- ENDIF -->><!-- IF postrow.POST_ICON_IMG --><img src="{T_ICONS_PATH}{postrow.POST_ICON_IMG}" width="{postrow.POST_ICON_IMG_WIDTH}" height="{postrow.POST_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="#p{postrow.POST_ID}">{postrow.POST_SUBJECT}</a></h3> + <!-- DEFINE $SHOW_POST_BUTTONS = (postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE) --> <!-- EVENT viewtopic_body_post_buttons_list_before --> <!-- IF not S_IS_BOT --> - <!-- IF postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE --> + <!-- IF $SHOW_POST_BUTTONS --> <ul class="post-buttons"> <!-- EVENT viewtopic_body_post_buttons_before --> <!-- IF postrow.U_EDIT --> |