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

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_topic.html
This commit is contained in:
Marc Alexander 2015-08-20 10:08:47 +02:00
commit 5ae821ee28
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/docs/events.md
View file

@ -535,6 +535,20 @@ mcp_post_additional_options
* Since: 3.1.5-RC1 * Since: 3.1.5-RC1
* Purpose: Add content within the list of post moderation actions * Purpose: Add content within the list of post moderation actions
mcp_topic_topic_title_after
===
* Locations:
+ styles/prosilver/template/mcp_topic.html
* Since: 3.1.6-RC1
* Purpose: Add some information after the topic title
mcp_topic_topic_title_before
===
* Locations:
+ styles/prosilver/template/mcp_topic.html
* Since: 3.1.6-RC1
* Purpose: Add some information before the topic title
mcp_warn_post_add_warning_field_after mcp_warn_post_add_warning_field_after
=== ===
* Locations: * Locations:

2
phpBB/styles/prosilver/template/mcp_topic.html
View file

@ -87,7 +87,7 @@
<h3 id="review"> <h3 id="review">
<span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span>
{L_TOPIC_REVIEW}{L_COLON} {TOPIC_TITLE} {L_TOPIC_REVIEW}{L_COLON} <!-- EVENT mcp_topic_topic_title_before -->{TOPIC_TITLE}<!-- EVENT mcp_topic_topic_title_after -->
</h3> </h3>
<div id="topicreview"> <div id="topicreview">