makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/styles/subsilver2/template/attachment.html
This commit is contained in:
Marc Alexander 2015-08-22 08:11:15 +02:00
commit d30b5207b8
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
phpBB/docs/events.md
View file

@ -290,6 +290,34 @@ acp_users_prefs_view_prepend
* Since: 3.1.0-b3
* Purpose: Add user options fieldset to the top of ACP users view prefs settings
attachment_file_after
===
* Locations:
+ styles/prosilver/template/attachment.html
* Since: 3.1.6-RC1
* Purpose: Add content after the attachment.
attachment_file_append
===
* Locations:
+ styles/prosilver/template/attachment.html
* Since: 3.1.6-RC1
* Purpose: Add custom attachment types displaying to the bottom of attachment block.
attachment_file_before
===
* Locations:
+ styles/prosilver/template/attachment.html
* Since: 3.1.6-RC1
* Purpose: Add content before the attachment.
attachment_file_prepend
===
* Locations:
+ styles/prosilver/template/attachment.html
* Since: 3.1.6-RC1
* Purpose: Add custom attachment types displaying to the top of attachment block.
forumlist_body_category_header_after
===
* Locations:

7
phpBB/styles/prosilver/template/attachment.html
View file

@ -1,8 +1,10 @@
<!-- EVENT attachment_file_before -->
<!-- BEGIN _file -->
<!-- IF _file.S_DENIED -->
<p>[{_file.DENIED_MESSAGE}]</p>
<!-- ELSE -->
<!-- EVENT attachment_file_prepend -->
<!-- IF _file.S_THUMBNAIL -->
<dl class="thumbnail">
@ -11,7 +13,6 @@
</dl>
<!-- ENDIF -->
<!-- IF _file.S_IMAGE -->
<dl class="file">
<dt class="attach-image"><img src="{_file.U_INLINE_LINK}" class="postimage" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt>
@ -28,8 +29,6 @@
</dl>
<!-- ENDIF -->
<!-- IF _file.S_WM_FILE -->
<!-- method used here from http://alistapart.com/articles/byebyeembed / autosizing seems to not work always, this will not fix -->
<object width="320" height="285" classid="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6" id="wmstream_{_file.ATTACH_ID}">
@ -118,5 +117,7 @@
<a href="{_file.U_DOWNLOAD_LINK}">{_file.DOWNLOAD_NAME}</a> [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]</p>
<!-- ENDIF -->
<!-- EVENT attachment_file_append -->
<!-- ENDIF -->
<!-- END _file -->
<!-- EVENT attachment_file_after -->