phpBB 3.2.5 to 3.2.6-RC1 prosilver changes
diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css | |
index d54c948343..0041417022 100644 | |
--- a/phpBB/styles/prosilver/theme/cp.css | |
+++ b/phpBB/styles/prosilver/theme/cp.css | |
@@ -300,11 +300,14 @@ ol.def-rules li { | |
padding: 0 3px; | |
} | |
+/* DEPRECATED 3.2.6 | |
.pmlist li.pm_message_reported_colour, .pm_message_reported_colour { | |
border-left-color: transparent; | |
border-right-color: transparent; | |
} | |
+*/ | |
+.pmlist li.pm_message_reported_colour, .pm_message_reported_colour, | |
.pmlist li.pm_marked_colour, .pm_marked_colour, | |
.pmlist li.pm_replied_colour, .pm_replied_colour, | |
.pmlist li.pm_friend_colour, .pm_friend_colour, |
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html | |
index eed27b5131..8250a1fd07 100644 | |
--- a/phpBB/styles/prosilver/template/forumlist_body.html | |
+++ b/phpBB/styles/prosilver/template/forumlist_body.html | |
@@ -103,7 +103,11 @@ | |
<!-- ENDIF --> | |
<br />{forumrow.LAST_POST_TIME} | |
<!-- ELSE --> | |
- {L_NO_POSTS}<br /> | |
+ {% if forumrow.U_UNAPPROVED_TOPICS %} | |
+ {{ lang('TOPIC_UNAPPROVED_FORUM', forumrow.TOPICS) }} | |
+ {% else %} | |
+ {{ lang('NO_POSTS') }} | |
+ {% endif %} | |
<!-- ENDIF --> | |
</span> | |
</dd> | |
diff --git a/phpBB/styles/prosilver/template/login_body_oauth.html b/phpBB/styles/prosilver/template/login_body_oauth.html | |
index 156485d211..1364d01ccb 100644 | |
--- a/phpBB/styles/prosilver/template/login_body_oauth.html | |
+++ b/phpBB/styles/prosilver/template/login_body_oauth.html | |
@@ -1,8 +1,6 @@ | |
+<br> | |
<div class="content"> | |
- <!-- BEGIN oauth --> | |
- <dl> | |
- <dt> </dt> | |
- <dd><a href="{oauth.REDIRECT_URL}" class="button2">{oauth.SERVICE_NAME}</a></dd> | |
- </dl> | |
- <!-- END oauth --> | |
+ {% for oauth in oauth %} | |
+ <a href="{{ oauth.REDIRECT_URL }}" class="button2">{{ oauth.SERVICE_NAME }}</a> | |
+ {% endfor %} | |
</div> | |
diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html | |
index d953f1039f..86a322435d 100644 | |
--- a/phpBB/styles/prosilver/template/mcp_ban.html | |
+++ b/phpBB/styles/prosilver/template/mcp_ban.html | |
@@ -9,12 +9,12 @@ | |
ban_give_reason[-1] = ''; | |
<!-- BEGIN bans --> | |
- ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}'; | |
+ ban_length['{bans.BAN_ID}'] = '{{ bans.A_LENGTH }}'; | |
<!-- IF bans.A_REASON --> | |
- ban_reason['{bans.BAN_ID}'] = '{{ bans.A_REASON | e('js') }}'; | |
+ ban_reason['{bans.BAN_ID}'] = '{{ bans.REASON | e('js') }}'; | |
<!-- ENDIF --> | |
<!-- IF bans.A_GIVE_REASON --> | |
- ban_give_reason['{bans.BAN_ID}'] = '{{ bans.A_GIVE_REASON | e('js') }}'; | |
+ ban_give_reason['{bans.BAN_ID}'] = '{{ bans.GIVE_REASON | e('js') }}'; | |
<!-- ENDIF --> | |
<!-- END bans --> | |
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html | |
index cf9d0bd6c1..c2297a8053 100644 | |
--- a/phpBB/styles/prosilver/template/mcp_post.html | |
+++ b/phpBB/styles/prosilver/template/mcp_post.html | |
@@ -108,10 +108,14 @@ | |
</p> | |
<!-- ENDIF --> | |
+ {% EVENT mcp_post_text_before %} | |
+ | |
<div id="post_details" class="content post_details"> | |
{POST_PREVIEW} | |
</div> | |
+ {% EVENT mcp_post_text_after %} | |
+ | |
<!-- IF S_HAS_ATTACHMENTS --> | |
<dl class="attachbox"> | |
<dt>{L_ATTACHMENTS}</dt> | |
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html | |
index cedc5031c7..5f03ad99cc 100644 | |
--- a/phpBB/styles/prosilver/template/memberlist_body.html | |
+++ b/phpBB/styles/prosilver/template/memberlist_body.html | |
@@ -12,19 +12,28 @@ | |
<!-- ENDIF --> | |
+{% EVENT memberlist_body_page_header_after %} | |
+ | |
<!-- IF S_SHOW_GROUP --> | |
+ {% EVENT memberlist_body_group_name_before %} | |
<h2 class="group-title"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2> | |
+ {% EVENT memberlist_body_group_name_after %} | |
<!-- IF U_MANAGE --> | |
<p class="right responsive-center manage rightside"><a href="{U_MANAGE}">{L_MANAGE_GROUP}</a></p> | |
<!-- ENDIF --> | |
<p>{GROUP_DESC} {GROUP_TYPE}</p> | |
+ {% EVENT memberlist_body_group_desc_after %} | |
+ | |
<p> | |
<!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF --> | |
+ {% EVENT memberlist_body_group_rank_before %} | |
<!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF --> | |
<!-- IF GROUP_RANK -->{GROUP_RANK}<!-- ENDIF --> | |
+ {% EVENT memberlist_body_group_rank_after %} | |
</p> | |
<!-- ELSE --> | |
+ {% EVENT memberlist_body_page_title_before %} | |
<h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARCH_WORDS}">{SEARCH_WORDS}</a><!-- ENDIF --></h2> | |
<div class="action-bar bar-top"> | |
@@ -60,6 +69,7 @@ | |
<th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th> | |
<th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th> | |
<!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF --> | |
+ {% EVENT memberlist_body_memberlist_after %} | |
</tr> | |
</thead> | |
<tbody> | |
@@ -91,12 +101,14 @@ | |
<th class="info">{% for field in custom_fields %}{% if not loop.first %}{L_COMMA_SEPARATOR} {% endif %}{{ field.PROFILE_FIELD_NAME }}{% endfor %}</th> | |
<th class="joined"><a href="{U_SORT_JOINED}#memberlist">{L_JOINED}</a></th> | |
<!-- IF U_SORT_ACTIVE --><th class="active"><a href="{U_SORT_ACTIVE}#memberlist">{L_LAST_ACTIVE}</a></th><!-- ENDIF --> | |
+ {% EVENT memberlist_body_leaders_set_after %} | |
<!-- ELSEIF S_SHOW_GROUP --> | |
<th class="name">{L_GROUP_MEMBERS}</th> | |
<th class="posts">{L_POSTS}</th> | |
<th class="info"><!-- BEGIN custom_fields --><!-- IF not custom_fields.S_FIRST_ROW -->{L_COMMA_SEPARATOR} <!-- ENDIF -->{custom_fields.PROFILE_FIELD_NAME}<!-- END custom_fields --></th> | |
<th class="joined">{L_JOINED}</th> | |
<!-- IF U_SORT_ACTIVE --><th class="active">{L_LAST_ACTIVE}</th><!-- ENDIF --> | |
+ {% EVENT memberlist_body_show_group_after %} | |
<!-- ENDIF --> | |
</tr> | |
</thead> | |
@@ -111,6 +123,7 @@ | |
<td class="info"><!-- BEGIN custom_fields --><div>{memberrow.custom_fields.PROFILE_FIELD_VALUE}</div><!-- BEGINELSE --> <!-- END custom_fields --></td> | |
<td>{memberrow.JOINED}</td> | |
<!-- IF S_VIEWONLINE --><td>{memberrow.LAST_ACTIVE} </td><!-- ENDIF --> | |
+ {% EVENT memberlist_body_memberrow_after %} | |
</tr> | |
<!-- BEGINELSE --> | |
<tr class="bg1"> | |
@@ -156,6 +169,8 @@ | |
</div> | |
</div> | |
+{% EVENT memberlist_body_page_footer_before %} | |
+ | |
<!-- IF S_IN_SEARCH_POPUP --> | |
<!-- INCLUDE simple_footer.html --> | |
<!-- ELSE --> | |
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html | |
index 2da14304c7..dc29285922 100644 | |
--- a/phpBB/styles/prosilver/template/navbar_header.html | |
+++ b/phpBB/styles/prosilver/template/navbar_header.html | |
@@ -179,17 +179,18 @@ | |
<ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar"> | |
<!-- DEFINE $MICRODATA = ' itemtype="http://schema.org/ListItem" itemprop="itemListElement" itemscope' --> | |
+ {% set navlink_position = 1 %} | |
<!-- EVENT overall_header_breadcrumbs_before --> | |
<li class="breadcrumbs" itemscope itemtype="http://schema.org/BreadcrumbList"> | |
<!-- IF U_SITE_HOME --> | |
- <span class="crumb" {$MICRODATA}><a href="{U_SITE_HOME}" itemprop="url" data-navbar-reference="home"><i class="icon fa-home fa-fw" aria-hidden="true"></i><span itemprop="title">{L_SITE_HOME}</span></a></span> | |
+ <span class="crumb" {$MICRODATA}><a href="{U_SITE_HOME}" itemtype="https://schema.org/Thing" itemprop="item" data-navbar-reference="home"><i class="icon fa-home fa-fw" aria-hidden="true"></i><span itemprop="name">{L_SITE_HOME}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span> | |
<!-- ENDIF --> | |
<!-- EVENT overall_header_breadcrumb_prepend --> | |
- <span class="crumb" {$MICRODATA}><a href="{U_INDEX}" itemprop="url" accesskey="h" data-navbar-reference="index"><!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw"></i><!-- ENDIF --><span itemprop="title">{L_INDEX}</span></a></span> | |
+ <span class="crumb" {$MICRODATA}><a href="{U_INDEX}" itemtype="https://schema.org/Thing" itemprop="item" accesskey="h" data-navbar-reference="index"><!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw"></i><!-- ENDIF --><span itemprop="name">{L_INDEX}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span> | |
<!-- BEGIN navlinks --> | |
<!-- EVENT overall_header_navlink_prepend --> | |
- <span class="crumb" {$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{navlinks.U_VIEW_FORUM}" itemprop="url"><span itemprop="title">{navlinks.FORUM_NAME}</span></a></span> | |
+ <span class="crumb" {$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{navlinks.U_VIEW_FORUM}" itemtype="https://schema.org/Thing" itemprop="item"><span itemprop="name">{navlinks.FORUM_NAME}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span> | |
<!-- EVENT overall_header_navlink_append --> | |
<!-- END navlinks --> | |
<!-- EVENT overall_header_breadcrumb_append --> | |
diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html | |
index 444713d6e0..b46e9c9175 100644 | |
--- a/phpBB/styles/prosilver/template/posting_attach_body.html | |
+++ b/phpBB/styles/prosilver/template/posting_attach_body.html | |
@@ -21,6 +21,7 @@ | |
<input type="button" class="button2" value="{L_PLUPLOAD_ADD_FILES}" id="add_files" /> | |
</div> | |
+ {% EVENT posting_attach_body_file_list_before %} | |
<div class="panel<!-- IF not .attach_row --> hidden<!-- ENDIF --> file-list-container" id="file-list-container"> | |
<div class="inner"> | |
<table class="table1 zebra-list fixed-width-table"> | |
@@ -55,16 +56,18 @@ | |
<span class="file-status"></span> | |
</td> | |
</tr> | |
+ {% EVENT posting_attach_body_attach_row_before %} | |
<!-- BEGIN attach_row --> | |
+ {% EVENT posting_attach_body_attach_row_prepend %} | |
<tr class="attach-row" data-attach-id="{attach_row.ATTACH_ID}"> | |
<td class="attach-name"> | |
<span class="file-name ellipsis-text"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span> | |
- <!-- EVENT posting_attach_body_attach_row_controls_prepend --> | |
+ {% EVENT posting_attach_body_attach_row_controls_prepend %} | |
<span class="attach-controls"> | |
<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" /> <!-- ENDIF --> | |
<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" /> | |
</span> | |
- <!-- EVENT posting_attach_body_attach_row_controls_append --> | |
+ {% EVENT posting_attach_body_attach_row_controls_append %} | |
<span class="clear"></span> | |
</td> | |
<td class="attach-comment"> | |
@@ -78,10 +81,13 @@ | |
<span class="file-status file-uploaded"></span> | |
</td> | |
</tr> | |
+ {% EVENT posting_attach_body_attach_row_append %} | |
<!-- END attach_row --> | |
+ {% EVENT posting_attach_body_attach_row_after %} | |
</tbody> | |
</table> | |
</div> | |
</div> | |
+ {% EVENT posting_attach_body_file_list_after %} | |
</div> | |
</div> | |
diff --git a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html | |
index 18316613b0..60061a3139 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html | |
+++ b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html | |
@@ -1,5 +1,5 @@ | |
<!-- BEGIN oauth --> | |
- <form id="ucp" method="post" action="{S_UCP_ACTION}"> | |
+ <form id="ucp_oauth_{oauth.SERVICE_ID}" method="post" action="{S_UCP_ACTION}"> | |
<h3>{oauth.SERVICE_NAME}</h3> | |
<fieldset class="fields2"> | |
diff --git a/phpBB/styles/prosilver/template/ucp_profile_signature.html b/phpBB/styles/prosilver/template/ucp_profile_signature.html | |
index 614f6f440d..ed28b7ab02 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_profile_signature.html | |
+++ b/phpBB/styles/prosilver/template/ucp_profile_signature.html | |
@@ -24,6 +24,7 @@ | |
<!-- INCLUDE posting_editor.html --> | |
<h3>{L_OPTIONS}</h3> | |
<fieldset> | |
+ {% EVENT ucp_profile_signature_posting_editor_options_prepend %} | |
<!-- IF S_BBCODE_ALLOWED --> | |
<div><label for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label></div> | |
<!-- ENDIF --> | |
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html | |
index bf659bb663..045f801ce5 100644 | |
--- a/phpBB/styles/prosilver/template/viewforum_body.html | |
+++ b/phpBB/styles/prosilver/template/viewforum_body.html | |
@@ -197,7 +197,7 @@ | |
<div class="topic-poster responsive-hide left-box"> | |
<!-- IF topicrow.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i><!-- ENDIF --> | |
<!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> | |
- {L_POST_BY_AUTHOR} <!-- EVENT viewforum_body_topic_author_username_prepend -->{topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME}<!-- EVENT viewforum_body_topic_author_username_append --> | |
+ {L_POST_BY_AUTHOR} <!-- EVENT viewforum_body_topic_author_username_prepend -->{topicrow.TOPIC_AUTHOR_FULL}<!-- EVENT viewforum_body_topic_author_username_append --> » {topicrow.FIRST_POST_TIME} | |
<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> » {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF --> | |
</div> | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment