mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Merge branch 'develop-ascraeus' into develop
Conflicts: phpBB/styles/subsilver2/template/viewforum_body.html phpBB/styles/subsilver2/template/viewtopic_body.html
This commit is contained in:
Joas Schilling
commit
1ed3eb7b0b
3 changed files with 74 additions and 2 deletions
|
|
@ -1050,6 +1050,62 @@ ucp_friend_list_after
|
|||
* Since: 3.1.0-a4
|
||||
* Purpose: Add optional elements after list of friends in UCP
|
||||
|
||||
viewforum_buttons_bottom_before
|
||||
===
|
||||
* Locations:
|
||||
+ styles/prosilver/template/viewforum_body.html
|
||||
* Since: 3.1.0-RC5
|
||||
* Purpose: Add buttons before New Topic button on the bottom of the topic's list
|
||||
|
||||
viewforum_buttons_bottom_after
|
||||
===
|
||||
* Locations:
|
||||
+ styles/prosilver/template/viewforum_body.html
|
||||
* Since: 3.1.0-RC5
|
||||
* Purpose: Add buttons after New Topic button on the bottom of the topic's list
|
||||
|
||||
viewforum_buttons_top_before
|
||||
===
|
||||
* Locations:
|
||||
+ styles/prosilver/template/viewforum_body.html
|
||||
* Since: 3.1.0-RC5
|
||||
* Purpose: Add buttons before New Topic button on the top of the topic's list
|
||||
|
||||
viewforum_buttons_top_after
|
||||
===
|
||||
* Locations:
|
||||
+ styles/prosilver/template/viewforum_body.html
|
||||
* Since: 3.1.0-RC5
|
||||
* Purpose: Add buttons after New Topic button on the top of the topic's list
|
||||
|
||||
viewtopic_buttons_bottom_before
|
||||
===
|
||||
* Locations:
|
||||
+ styles/prosilver/template/viewtopic_body.html
|
||||
* Since: 3.1.0-RC5
|
||||
* Purpose: Add buttons before Post Reply button on the bottom of the posts's list
|
||||
|
||||
viewtopic_buttons_bottom_after
|
||||
===
|
||||
* Locations:
|
||||
+ styles/prosilver/template/viewtopic_body.html
|
||||
* Since: 3.1.0-RC5
|
||||
* Purpose: Add buttons after Post Reply button on the bottom of the posts's list
|
||||
|
||||
viewtopic_buttons_top_before
|
||||
===
|
||||
* Locations:
|
||||
+ styles/prosilver/template/viewtopic_body.html
|
||||
* Since: 3.1.0-RC5
|
||||
* Purpose: Add buttons before Post Reply button on the top of the posts's list
|
||||
|
||||
viewtopic_buttons_top_after
|
||||
===
|
||||
* Locations:
|
||||
+ styles/prosilver/template/viewtopic_body.html
|
||||
* Since: 3.1.0-RC5
|
||||
* Purpose: Add buttons after Post Reply button on the top of the posts's list
|
||||
|
||||
viewforum_forum_name_append
|
||||
===
|
||||
* Locations:
|
||||
|
|
|
|||
|
|
@ -39,9 +39,13 @@
|
|||
|
||||
<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
|
||||
<div class="buttons">
|
||||
<!-- EVENT viewforum_buttons_top_before -->
|
||||
|
||||
<a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->">
|
||||
<!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF -->
|
||||
</a>
|
||||
|
||||
<!-- EVENT viewforum_buttons_top_after -->
|
||||
</div>
|
||||
<!-- ENDIF -->
|
||||
|
||||
|
|
@ -227,9 +231,13 @@
|
|||
<div class="action-bar bottom">
|
||||
<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
|
||||
<div class="buttons">
|
||||
<!-- EVENT viewforum_buttons_bottom_before -->
|
||||
|
||||
<a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->">
|
||||
<!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF -->
|
||||
</a>
|
||||
|
||||
<!-- EVENT viewforum_buttons_bottom_after -->
|
||||
</div>
|
||||
<!-- ENDIF -->
|
||||
|
||||
|
|
|
|||
|
|
@ -28,11 +28,15 @@
|
|||
<div class="action-bar top">
|
||||
|
||||
<div class="buttons">
|
||||
<!-- EVENT viewtopic_buttons_top_before -->
|
||||
|
||||
<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
|
||||
<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">
|
||||
<!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF -->
|
||||
</a>
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- EVENT viewtopic_buttons_top_after -->
|
||||
</div>
|
||||
|
||||
<!-- INCLUDE viewtopic_topic_tools.html -->
|
||||
|
|
@ -338,11 +342,15 @@
|
|||
<!-- EVENT viewtopic_body_topic_actions_before -->
|
||||
<div class="action-bar bottom">
|
||||
<div class="buttons">
|
||||
<!-- EVENT viewtopic_buttons_bottom_before -->
|
||||
|
||||
<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
|
||||
<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">
|
||||
<!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF -->
|
||||
</a>
|
||||
<!-- ENDIF -->
|
||||
|
||||
<!-- EVENT viewtopic_buttons_bottom_after -->
|
||||
</div>
|
||||
|
||||
<!-- INCLUDE viewtopic_topic_tools.html -->
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue