|
diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html |
|
index b37ba238d2..54922620c4 100644 |
|
--- a/phpBB/styles/prosilver/template/bbcode.html |
|
+++ b/phpBB/styles/prosilver/template/bbcode.html |
|
@@ -13,6 +13,9 @@ |
|
<!-- BEGIN quote_close --></div></blockquote><!-- END quote_close --> |
|
<!-- BEGIN quote_extended --> |
|
<blockquote> |
|
+ <xsl:if test="@post_url"> |
|
+ <xsl:attribute name="cite"><xsl:value-of select="@post_url"/></xsl:attribute> |
|
+ </xsl:if> |
|
<xsl:if test="not(@author)"> |
|
<xsl:attribute name="class">uncited</xsl:attribute> |
|
</xsl:if> |
|
@@ -42,7 +45,7 @@ |
|
<a href="{@msg_url}" data-msg-id="{@msg_id}">↑</a> |
|
</xsl:if> |
|
<xsl:if test="@date"> |
|
- <div class="responsive-hide"><xsl:value-of select="@date"/></div> |
|
+ <span class="responsive-hide"><xsl:value-of select="@date"/></span> |
|
</xsl:if> |
|
</cite> |
|
</xsl:if> |
|
diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html |
|
index 8fc7faa50f..a62ea3c297 100644 |
|
--- a/phpBB/styles/prosilver/template/captcha_recaptcha.html |
|
+++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html |
|
@@ -3,6 +3,7 @@ |
|
<div>{L_RECAPTCHA_NOSCRIPT}</div> |
|
</noscript> |
|
{% INCLUDEJS RECAPTCHA_SERVER ~ '.js?onload=phpbbRecaptchaOnLoad&hl=' ~ lang('RECAPTCHA_LANG') %} |
|
+ {# The g-recaptcha class is used in JavaScript #} |
|
<div class="g-recaptcha" data-sitekey="{RECAPTCHA_PUBKEY}" data-callback="phpbbRecaptchaOnSubmit" data-size="invisible" data-tabindex="<!-- IF $CAPTCHA_TAB_INDEX -->{$CAPTCHA_TAB_INDEX}<!-- ELSE -->10<!-- ENDIF -->"></div> |
|
<!-- ELSE --> |
|
{L_RECAPTCHA_NOT_AVAILABLE} |
|
diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html |
|
index 90793d072b..3eba12fe74 100644 |
|
--- a/phpBB/styles/prosilver/template/mcp_front.html |
|
+++ b/phpBB/styles/prosilver/template/mcp_front.html |
|
@@ -91,7 +91,7 @@ |
|
</div> |
|
</dt> |
|
<dd class="moderation"> |
|
- <span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} <br /> |
|
+ <span>{L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} {{ report.REPORT_TIME }}<br /> |
|
{L_FORUM}{L_COLON} <a href="{report.U_FORUM}">{report.FORUM_NAME}</a></span> |
|
</dd> |
|
</dl> |
|
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html |
|
index c2297a8053..b62ed1ad5b 100644 |
|
--- a/phpBB/styles/prosilver/template/mcp_post.html |
|
+++ b/phpBB/styles/prosilver/template/mcp_post.html |
|
@@ -102,11 +102,11 @@ |
|
</form> |
|
<!-- ENDIF --> |
|
|
|
- <!-- IF S_MESSAGE_REPORTED --> |
|
+ {% if S_POST_REPORTED and not S_MCP_REPORT %} |
|
<p class="post-notice reported"> |
|
- <i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_REPORTED}</span> <a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_REPORTED}</strong></a> |
|
+ <i class="icon fa-exclamation fa-fw icon-red" aria-hidden="true"></i><span class="sr-only">{{ lang('TOPIC_REPORTED') }}</span> <a href="{{ U_MCP_REPORT }}"><strong>{{ lang('POST_REPORTED') }}</strong></a> |
|
</p> |
|
- <!-- ENDIF --> |
|
+ {% endif %} |
|
|
|
{% EVENT mcp_post_text_before %} |
|
|
|
@@ -329,9 +329,11 @@ |
|
</tbody> |
|
</table> |
|
|
|
+ {% if U_LOOKUP_ALL %} |
|
<div class="buttons"> |
|
<p><a href="{U_LOOKUP_ALL}#ip">{L_LOOKUP_ALL}</a></p> |
|
</div> |
|
+ {% endif %} |
|
|
|
<div class="pagination"> |
|
<ul> |
|
diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html |
|
index e7e0a5c9ba..fbf417cea4 100644 |
|
--- a/phpBB/styles/prosilver/template/mcp_reports.html |
|
+++ b/phpBB/styles/prosilver/template/mcp_reports.html |
|
@@ -46,7 +46,9 @@ |
|
<!-- IF S_PM --> |
|
<dt> |
|
<div class="list-inner"> |
|
- <a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.PM_SUBJECT}</a> <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br /> |
|
+ <a href="{{ postrow.U_VIEW_DETAILS }}" class="topictitle">{{ postrow.PM_SUBJECT }}</a> |
|
+ {% if postrow.ATTACH_ICON_IMG %} <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i>{% endif %} |
|
+ <br> |
|
<span>{L_MESSAGE_BY_AUTHOR} {postrow.PM_AUTHOR_FULL} » {postrow.PM_TIME}</span><br /> |
|
<span>{L_MESSAGE_TO} {postrow.RECIPIENTS}</span> |
|
<div class="responsive-show" style="display: none;"> |
|
@@ -60,7 +62,9 @@ |
|
<!-- ELSE --> |
|
<dt> |
|
<div class="list-inner"> |
|
- <a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <br /> |
|
+ <a href="{{ postrow.U_VIEW_DETAILS }}" class="topictitle">{{ postrow.POST_SUBJECT }}</a> |
|
+ {% if postrow.ATTACH_ICON_IMG %} <i class="icon fa-paperclip fa-fw" aria-hidden="true"></i>{% endif %} |
|
+ <br> |
|
<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_TIME}</span> |
|
<div class="responsive-show" style="display: none;"> |
|
{L_REPORTER}{L_COLON} {postrow.REPORTER_FULL} « {postrow.REPORT_TIME}<br /> |
|
@@ -81,7 +85,13 @@ |
|
|
|
<div class="action-bar bottom"> |
|
<!-- INCLUDE display_options.html --> |
|
- <!-- IF TOPIC_ID --><label><input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" /> <strong>{L_ONLY_TOPIC}</strong></label><!-- ENDIF --> |
|
+ <!-- IF TOPIC_ID --> |
|
+ <label> |
|
+ <input type="hidden" name="t" value="0"> |
|
+ <input type="checkbox" class="radio" name="t" value="{TOPIC_ID}" checked="checked" onClick="document.getElementById('mcp').submit()" /> |
|
+ <strong>{L_ONLY_TOPIC}</strong> |
|
+ </label> |
|
+ <!-- ENDIF --> |
|
|
|
<div class="pagination"> |
|
{TOTAL_REPORTS} |
|
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html |
|
index 889cab8b83..18588a6a76 100644 |
|
--- a/phpBB/styles/prosilver/template/mcp_topic.html |
|
+++ b/phpBB/styles/prosilver/template/mcp_topic.html |
|
@@ -161,6 +161,8 @@ |
|
|
|
</div> |
|
</div> |
|
+ <!-- BEGINELSE --> |
|
+ <p><strong>{{ lang('NO_POSTS_TIME_FRAME') }}</strong></p> |
|
<!-- END postrow --> |
|
</div> |
|
|
|
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html |
|
index 4e3d1e295e..1c5031e9b9 100644 |
|
--- a/phpBB/styles/prosilver/template/navbar_footer.html |
|
+++ b/phpBB/styles/prosilver/template/navbar_footer.html |
|
@@ -4,22 +4,22 @@ |
|
<ul id="nav-footer" class="nav-footer linklist" role="menubar"> |
|
<li class="breadcrumbs"> |
|
<!-- IF U_SITE_HOME --> |
|
- {% spaceless %} |
|
+ {% apply spaceless %} |
|
<span class="crumb"> |
|
<a href="{U_SITE_HOME}" data-navbar-reference="home"> |
|
<i class="icon fa-home fa-fw" aria-hidden="true"></i><span>{L_SITE_HOME}</span> |
|
</a> |
|
</span> |
|
- {% endspaceless %} |
|
+ {% endapply %} |
|
<!-- ENDIF --> |
|
<!-- EVENT overall_footer_breadcrumb_prepend --> |
|
- {% spaceless %} |
|
+ {% apply spaceless %} |
|
<span class="crumb"> |
|
<a href="{U_INDEX}" data-navbar-reference="index"> |
|
<!-- IF not U_SITE_HOME --><i class="icon fa-home fa-fw" aria-hidden="true"></i><!-- ENDIF --><span>{L_INDEX}</span> |
|
</a> |
|
</span> |
|
- {% endspaceless %} |
|
+ {% endapply %} |
|
<!-- EVENT overall_footer_breadcrumb_append --> |
|
</li> |
|
<!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT --> |
|
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html |
|
index 4a1a436d4a..a4b23f6ace 100644 |
|
--- a/phpBB/styles/prosilver/template/navbar_header.html |
|
+++ b/phpBB/styles/prosilver/template/navbar_header.html |
|
@@ -178,34 +178,41 @@ |
|
</ul> |
|
|
|
<ul id="nav-breadcrumbs" class="nav-breadcrumbs linklist navlinks" role="menubar"> |
|
- <!-- DEFINE $MICRODATA = ' itemtype="http://schema.org/ListItem" itemprop="itemListElement" itemscope' --> |
|
+ {% set MICRODATA = 'itemtype="https://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}" itemtype="https://schema.org/Thing" itemscope 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}" itemtype="https://schema.org/Thing" itemscope 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 --> |
|
- {% set NAVLINK_NAME = navlinks.BREADCRUMB_NAME | default(navlinks.FORUM_NAME) %} |
|
- {% set NAVLINK_LINK = navlinks.U_BREADCRUMB | default(navlinks.U_VIEW_FORUM) %} |
|
- <!-- EVENT overall_header_navlink_prepend --> |
|
- <span class="crumb" {$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->><a href="{{ NAVLINK_LINK }}" itemtype="https://schema.org/Thing" itemscope itemprop="item"><span itemprop="name">{{ NAVLINK_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 --> |
|
+ {% EVENT overall_header_breadcrumbs_before %} |
|
+ |
|
+ <li class="breadcrumbs" itemscope itemtype="https://schema.org/BreadcrumbList"> |
|
+ |
|
+ {% if U_SITE_HOME %} |
|
+ <span class="crumb" {{ MICRODATA }}><a itemprop="item" href="{{ U_SITE_HOME }}" 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 itemprop="item" href="{{ U_INDEX }}" 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> |
|
+ |
|
+ {% for navlink in navlinks %} |
|
+ {% set NAVLINK_NAME = navlink.BREADCRUMB_NAME | default(navlink.FORUM_NAME) %} |
|
+ {% set NAVLINK_LINK = navlink.U_BREADCRUMB | default(navlink.U_VIEW_FORUM) %} |
|
+ |
|
+ {% EVENT overall_header_navlink_prepend %} |
|
+ <span class="crumb" {{ MICRODATA }}{% if navlink.MICRODATA %} {{ navlink.MICRODATA }}{% endif %}><a itemprop="item" href="{{ NAVLINK_LINK }}"><span itemprop="name">{{ NAVLINK_NAME }}</span></a><meta itemprop="position" content="{{ navlink_position }}{% set navlink_position = navlink_position + 1 %}" /></span> |
|
+ {% EVENT overall_header_navlink_append %} |
|
+ {% endfor %} |
|
+ |
|
+ {% EVENT overall_header_breadcrumb_append %} |
|
</li> |
|
- <!-- EVENT overall_header_breadcrumbs_after --> |
|
|
|
- <!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --> |
|
+ {% EVENT overall_header_breadcrumbs_after %} |
|
+ |
|
+ {% if S_DISPLAY_SEARCH and not S_IN_SEARCH %} |
|
<li class="rightside responsive-search"> |
|
- <a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}" role="menuitem"> |
|
- <i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span> |
|
+ <a href="{{ U_SEARCH }}" title="{{ lang('SEARCH_ADV_EXPLAIN') }}" role="menuitem"> |
|
+ <i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{{ lang('SEARCH') }}</span> |
|
</a> |
|
</li> |
|
- <!-- ENDIF --> |
|
+ {% endif %} |
|
</ul> |
|
|
|
</div> |
|
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html |
|
index d1b8863438..5fbf289b44 100644 |
|
--- a/phpBB/styles/prosilver/template/overall_footer.html |
|
+++ b/phpBB/styles/prosilver/template/overall_footer.html |
|
@@ -64,7 +64,7 @@ |
|
</div> |
|
|
|
<script src="{T_JQUERY_LINK}"></script> |
|
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.4.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF --> |
|
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.5.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF --> |
|
<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> |
|
<!-- INCLUDEJS forum_fn.js --> |
|
<!-- INCLUDEJS ajax.js --> |
|
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html |
|
index 1564b5f522..92236b79ff 100644 |
|
--- a/phpBB/styles/prosilver/template/posting_buttons.html |
|
+++ b/phpBB/styles/prosilver/template/posting_buttons.html |
|
@@ -96,7 +96,7 @@ |
|
<!-- EVENT posting_editor_buttons_custom_tags_before --> |
|
|
|
<!-- BEGIN custom_tags --> |
|
- <button type="button" class="button button-secondary bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{{ custom_tags.BBCODE_HELPLINE|e('html_attr') }}"> |
|
+ <button type="button" class="button button-secondary bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{{ custom_tags.BBCODE_HELPLINE }}"> |
|
{custom_tags.BBCODE_TAG} |
|
</button> |
|
<!-- END custom_tags --> |
|
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html |
|
index d963c98e08..ce8a32b640 100644 |
|
--- a/phpBB/styles/prosilver/template/posting_editor.html |
|
+++ b/phpBB/styles/prosilver/template/posting_editor.html |
|
@@ -1,16 +1,24 @@ |
|
<fieldset class="fields1"> |
|
<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> |
|
|
|
+ {% EVENT posting_editor_topic_icons_before %} |
|
+ |
|
<!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS --> |
|
<dl> |
|
<dt><label for="icon">{L_ICON}{L_COLON}</label></dt> |
|
<dd> |
|
+ {% EVENT posting_editor_topic_icons_prepend %} |
|
+ |
|
<label for="icon"><input type="radio" name="icon" id="icon" value="0" checked="checked" tabindex="1" /> <!-- IF S_SHOW_TOPIC_ICONS -->{L_NO_TOPIC_ICON}<!-- ELSE -->{L_NO_PM_ICON}<!-- ENDIF --></label> |
|
<!-- BEGIN topic_icon --><label for="icon-{topic_icon.ICON_ID}"><input type="radio" name="icon" id="icon-{topic_icon.ICON_ID}" value="{topic_icon.ICON_ID}" {topic_icon.S_ICON_CHECKED} tabindex="1" /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="{topic_icon.ICON_ALT}" title="{topic_icon.ICON_ALT}" /></label> <!-- END topic_icon --> |
|
+ |
|
+ {% EVENT posting_editor_topic_icons_append %} |
|
</dd> |
|
</dl> |
|
<!-- ENDIF --> |
|
|
|
+ {% EVENT posting_editor_topic_icons_after %} |
|
+ |
|
<!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME --> |
|
<dl style="clear: left;"> |
|
<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt> |
|
@@ -109,7 +117,7 @@ |
|
<div id="tabs" class="tabs sub-panels" data-show-panel="<!-- IF SHOW_PANEL -->{SHOW_PANEL}<!-- ELSE -->options-panel<!-- ENDIF -->" role="tablist"> |
|
<ul> |
|
<li id="options-panel-tab" class="tab activetab"><a href="#tabs" data-subpanel="options-panel" role="tab" aria-controls="options-panel"><span>{L_OPTIONS}</span></a></li> |
|
- <!-- IF S_SHOW_ATTACH_BOX --> |
|
+ <!-- IF S_SHOW_ATTACH_BOX and FILTERS --> |
|
<li id="attach-panel-tab" class="tab"> |
|
<a href="#tabs" data-subpanel="attach-panel" role="tab" aria-controls="attach-panel"> |
|
{L_ATTACHMENTS} <strong id="file-total-progress" class="file-total-progress"><strong id="file-total-progress-bar" class="file-total-progress-bar"></strong></strong> |
|
diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html |
|
index 7c9deb5369..3bb57593f4 100644 |
|
--- a/phpBB/styles/prosilver/template/posting_layout.html |
|
+++ b/phpBB/styles/prosilver/template/posting_layout.html |
|
@@ -52,7 +52,7 @@ |
|
</div> |
|
</div> |
|
|
|
-<!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF --> |
|
+<!-- IF S_SHOW_ATTACH_BOX and FILTERS --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF --> |
|
|
|
<!-- IF S_SHOW_POLL_BOX or S_POLL_DELETE --><!-- INCLUDE posting_poll_body.html --><!-- ENDIF --> |
|
|
|
diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html |
|
index 316fa791e4..9c9b327201 100644 |
|
--- a/phpBB/styles/prosilver/template/posting_pm_layout.html |
|
+++ b/phpBB/styles/prosilver/template/posting_pm_layout.html |
|
@@ -34,7 +34,7 @@ |
|
</div> |
|
</div> |
|
|
|
-<!-- IF S_SHOW_ATTACH_BOX --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF --> |
|
+<!-- IF S_SHOW_ATTACH_BOX and FILTERS --><!-- INCLUDE posting_attach_body.html --><!-- ENDIF --> |
|
|
|
<!-- IF S_DISPLAY_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF --> |
|
|
|
diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html |
|
index 618e2680ba..2f667a3349 100644 |
|
--- a/phpBB/styles/prosilver/template/search_body.html |
|
+++ b/phpBB/styles/prosilver/template/search_body.html |
|
@@ -79,8 +79,11 @@ |
|
<dd>{S_SELECT_SORT_DAYS}</dd> |
|
</dl> |
|
<dl> |
|
- <dt><label>{L_RETURN_FIRST}{L_COLON}</label></dt> |
|
- <dd><select name="ch" title="{L_RETURN_FIRST}">{S_CHARACTER_OPTIONS}</select> {L_POST_CHARACTERS}</dd> |
|
+ <dt> |
|
+ <label for="ch">{{ lang('RETURN_FIRST') ~ lang('COLON') }}</label> |
|
+ <br><span>{{ lang('RETURN_FIRST_EXPLAIN') }}</span> |
|
+ </dt> |
|
+ <dd><input id="ch" name="ch" type="number" value="{{ DEFAULT_RETURN_CHARS }}" min="0" max="9999" title="{{ lang('RETURN_FIRST') }}"> {{ lang('POST_CHARACTERS') }}</dd> |
|
</dl> |
|
<!-- EVENT search_body_search_display_options_append --> |
|
</fieldset> |
|
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html |
|
index fde162ab34..c968bf896f 100644 |
|
--- a/phpBB/styles/prosilver/template/simple_footer.html |
|
+++ b/phpBB/styles/prosilver/template/simple_footer.html |
|
@@ -1,8 +1,19 @@ |
|
</div> |
|
|
|
- <div class="copyright" role="contentinfo">{CREDIT_LINE} |
|
- <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> |
|
- <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> |
|
+ <div class="copyright" role="contentinfo"> |
|
+ <p class="footer-row"> |
|
+ <span class="footer-copyright">{{ CREDIT_LINE }}</span> |
|
+ </p> |
|
+ {% if TRANSLATION_INFO %} |
|
+ <p class="footer-row"> |
|
+ <span class="footer-copyright">{{ TRANSLATION_INFO }}</span> |
|
+ </p> |
|
+ {% endif %} |
|
+ {% if DEBUG_OUTPUT %} |
|
+ <p class="footer-row"> |
|
+ <span class="footer-info">{{ DEBUG_OUTPUT }}</span> |
|
+ </p> |
|
+ {% endif %} |
|
</div> |
|
|
|
<div id="darkenwrapper" class="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}"> |
|
@@ -25,7 +36,7 @@ |
|
</div> |
|
|
|
<script src="{T_JQUERY_LINK}"></script> |
|
-<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.4.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF --> |
|
+<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.5.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF --> |
|
<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> |
|
<!-- INCLUDEJS forum_fn.js --> |
|
<!-- INCLUDEJS ajax.js --> |
|
diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html |
|
index 98d2eee1a0..87c88e9fcc 100644 |
|
--- a/phpBB/styles/prosilver/template/ucp_header.html |
|
+++ b/phpBB/styles/prosilver/template/ucp_header.html |
|
@@ -69,11 +69,11 @@ |
|
<dt>{L_FRIENDS}</dt> |
|
|
|
<!-- BEGIN friends_online --> |
|
- <dd class="friend-online" title="{L_FRIENDS_ONLINE}">{friends_online.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --> <input type="submit" name="add_to[{friends_online.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --><!-- IF friends_online.S_LAST_ROW and .friends_offline --><hr /><!-- ENDIF --></dd> |
|
+ <dd class="friend-online" title="{L_FRIENDS_ONLINE}">{% EVENT ucp_header_friends_online_username_full_prepend %}{friends_online.USERNAME_FULL}{% EVENT ucp_header_friends_online_username_full_append %} <!-- IF S_SHOW_PM_BOX --> <input type="submit" name="add_to[{friends_online.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --><!-- IF friends_online.S_LAST_ROW and .friends_offline --><hr /><!-- ENDIF --></dd> |
|
<!-- END friends_online --> |
|
|
|
<!-- BEGIN friends_offline --> |
|
- <dd class="friend-offline" title="{L_FRIENDS_OFFLINE}">{friends_offline.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --><input type="submit" name="add_to[{friends_offline.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --></dd> |
|
+ <dd class="friend-offline" title="{L_FRIENDS_OFFLINE}">{% EVENT ucp_header_friends_offline_username_full_prepend %}{friends_offline.USERNAME_FULL}{% EVENT ucp_header_friends_offline_username_full_append %} <!-- IF S_SHOW_PM_BOX --><input type="submit" name="add_to[{friends_offline.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --></dd> |
|
<!-- END friends_offline --> |
|
</dl> |
|
|
|
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html |
|
index 55e30477d2..1d0249abd1 100644 |
|
--- a/phpBB/styles/prosilver/template/ucp_notifications.html |
|
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html |
|
@@ -31,7 +31,7 @@ |
|
<!-- IF notification_types.EXPLAIN --><br /> {notification_types.EXPLAIN}<!-- ENDIF --> |
|
</td> |
|
<!-- BEGIN notification_methods --> |
|
- <td class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_types.notification_methods.METHOD}"<!-- IF notification_types.notification_methods.AVAILABLE and notification_types.notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --><!-- IF not notification_types.notification_methods.AVAILABLE --> disabled="disabled"<!-- ENDIF --> /></td> |
|
+ <td class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_types.notification_methods.METHOD}"<!-- IF notification_types.notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --><!-- IF not notification_types.notification_methods.AVAILABLE --> disabled="disabled"<!-- ENDIF --> /></td> |
|
<!-- END notification_methods --> |
|
</tr> |
|
<!-- ENDIF --> |
|
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html |
|
index f44382f500..5a97dbc1eb 100644 |
|
--- a/phpBB/styles/prosilver/template/ucp_register.html |
|
+++ b/phpBB/styles/prosilver/template/ucp_register.html |
|
@@ -40,17 +40,17 @@ |
|
<dt><label for="username">{L_USERNAME}{L_COLON}</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt> |
|
<dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd> |
|
</dl> |
|
- <dl> |
|
- <dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt> |
|
- <dd><input type="email" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" autocomplete="off" /></dd> |
|
- </dl> |
|
<dl> |
|
<dt><label for="new_password">{L_PASSWORD}{L_COLON}</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt> |
|
- <dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" autocomplete="off" /></dd> |
|
+ <dd><input type="password" tabindex="2" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" autocomplete="off" /></dd> |
|
</dl> |
|
<dl> |
|
<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}{L_COLON}</label></dt> |
|
- <dd><input type="password" tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" autocomplete="off" /></dd> |
|
+ <dd><input type="password" tabindex="3" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" autocomplete="off" /></dd> |
|
+ </dl> |
|
+ <dl> |
|
+ <dt><label for="email">{L_EMAIL_ADDRESS}{L_COLON}</label></dt> |
|
+ <dd><input type="email" tabindex="4" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" autocomplete="off" /></dd> |
|
</dl> |
|
|
|
<!-- EVENT ucp_register_credentials_after --> |
|
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html |
|
index 40beb784d7..1d0c7f4f74 100644 |
|
--- a/phpBB/styles/prosilver/template/viewforum_body.html |
|
+++ b/phpBB/styles/prosilver/template/viewforum_body.html |
|
@@ -58,7 +58,7 @@ |
|
<button class="button button-search" type="submit" title="{L_SEARCH}"> |
|
<i class="icon fa-search fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH}</span> |
|
</button> |
|
- <a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}"> |
|
+ <a href="{{ U_SEARCH_FORUM }}" class="button button-search-end" title="{L_SEARCH_ADV}"> |
|
<i class="icon fa-cog fa-fw" aria-hidden="true"></i><span class="sr-only">{L_SEARCH_ADV}</span> |
|
</a> |
|
{S_SEARCH_LOCAL_HIDDEN_FIELDS} |
|
@@ -298,6 +298,8 @@ |
|
|
|
<!-- INCLUDE jumpbox.html --> |
|
|
|
+{% EVENT viewforum_body_online_list_before %} |
|
+ |
|
<!-- IF S_DISPLAY_ONLINE_LIST and U_VIEWONLINE --> |
|
<div class="stat-block online-list"> |
|
<h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3> |
|
@@ -305,7 +307,7 @@ |
|
</div> |
|
<!-- ENDIF --> |
|
|
|
-<!-- IF S_DISPLAY_POST_INFO --> |
|
+<!-- IF S_IS_POSTABLE and rules|length --> |
|
<div class="stat-block permissions"> |
|
<h3>{L_FORUM_PERMISSIONS}</h3> |
|
<p><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></p> |
|
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html |
|
index 6af33f2f87..be24263011 100644 |
|
--- a/phpBB/styles/prosilver/template/viewtopic_body.html |
|
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html |
|
@@ -77,7 +77,7 @@ |
|
<!-- EVENT viewtopic_body_poll_before --> |
|
|
|
<!-- IF S_HAS_POLL --> |
|
- <form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" class="topic_poll"> |
|
+ <form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" data-refresh="true" class="topic_poll"> |
|
|
|
<div class="panel"> |
|
<div class="inner"> |
|
@@ -192,7 +192,7 @@ |
|
<div> |
|
<!-- ENDIF --> |
|
<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->> |
|
- <span class="contact-icon {postrow.contact.ID}-icon">{postrow.contact.NAME}</span> |
|
+ {% EVENT viewtopic_body_contact_icon_prepend %}<span class="contact-icon {postrow.contact.ID}-icon">{postrow.contact.NAME}</span>{% EVENT viewtopic_body_contact_icon_append %} |
|
</a> |
|
<!-- IF REMAINDER eq 3 or postrow.contact.S_LAST_ROW --> |
|
</div> |
|
@@ -224,7 +224,12 @@ |
|
<div id="post_content{postrow.POST_ID}"<!-- IF postrow.S_POST_HIDDEN --> style="display: none;"<!-- ENDIF -->> |
|
|
|
<!-- EVENT viewtopic_body_post_subject_before --> |
|
- <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="{postrow.POST_ICON_IMG_ALT}" title="{postrow.POST_ICON_IMG_ALT}" /> <!-- ENDIF --><a href="{postrow.U_MINI_POST}">{postrow.POST_SUBJECT}</a></h3> |
|
+ <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="{{ postrow.POST_ICON_IMG_ALT }}" title="{{ postrow.POST_ICON_IMG_ALT }}"> |
|
+ {% endif %} |
|
+ <a {% if postrow.S_FIRST_UNREAD %}class="first-unread" {% endif %}href="{{ postrow.U_MINI_POST }}">{{ 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 --> |
|
@@ -383,7 +388,6 @@ |
|
</div> |
|
</div> |
|
|
|
- <hr class="divider" /> |
|
<!-- EVENT viewtopic_body_postrow_post_after --> |
|
<!-- END postrow --> |
|
|
|
@@ -449,6 +453,8 @@ |
|
<!-- EVENT viewtopic_body_footer_before --> |
|
<!-- INCLUDE jumpbox.html --> |
|
|
|
+{% EVENT viewtopic_body_online_list_before %} |
|
+ |
|
<!-- IF S_DISPLAY_ONLINE_LIST and U_VIEWONLINE --> |
|
<div class="stat-block online-list"> |
|
<h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3> |