Created
June 6, 2022 15:38
-
-
Save marc1706/0da7bfa57aa7b758762063f006a32191 to your computer and use it in GitHub Desktop.
prosilver changes phpBB 3.3.7 to 3.3.8-RC1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html | |
index 4932860f8c..aebcb05dcd 100644 | |
--- a/phpBB/styles/prosilver/template/forumlist_body.html | |
+++ b/phpBB/styles/prosilver/template/forumlist_body.html | |
@@ -89,7 +89,7 @@ | |
<i class="icon fa-question fa-fw icon-blue" aria-hidden="true"></i><span class="sr-only">{L_POSTS_UNAPPROVED_FORUM}</span> | |
</a> | |
<!-- ENDIF --> | |
- <!-- IF forumrow.LAST_POST_TIME --> | |
+ <!-- IF forumrow.LAST_POST_TIME_RFC3339 --> | |
<dfn>{L_LAST_POST}</dfn> | |
<!-- IF forumrow.S_DISPLAY_SUBJECT --> | |
<!-- EVENT forumlist_body_last_post_title_prepend --> | |
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html | |
index c07c1e1de2..5d872e2415 100644 | |
--- a/phpBB/styles/prosilver/template/overall_footer.html | |
+++ b/phpBB/styles/prosilver/template/overall_footer.html | |
@@ -60,7 +60,7 @@ | |
<div> | |
<a id="bottom" class="anchor" accesskey="z"></a> | |
- <!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF --> | |
+ {% if not S_IS_BOT %}{{ RUN_CRON_TASK }}{% endif %} | |
</div> | |
<script src="{T_JQUERY_LINK}"></script> | |
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html | |
index ce8a32b640..12790360d6 100644 | |
--- a/phpBB/styles/prosilver/template/posting_editor.html | |
+++ b/phpBB/styles/prosilver/template/posting_editor.html | |
@@ -65,7 +65,9 @@ | |
{BBCODE_STATUS}<br /> | |
<!-- IF S_BBCODE_ALLOWED --> | |
{IMG_STATUS}<br /> | |
+ <!-- IF S_BBCODE_FLASH --> | |
{FLASH_STATUS}<br /> | |
+ <!-- ENDIF --> | |
{URL_STATUS}<br /> | |
<!-- ENDIF --> | |
{SMILIES_STATUS} | |
@@ -181,16 +183,18 @@ | |
</dl> | |
<!-- ENDIF --> | |
- <!-- IF S_SOFTDELETE_ALLOWED or S_DELETE_ALLOWED --> | |
- <hr class="dashed" /> | |
+ {% if S_SOFTDELETE_ALLOWED || S_DELETE_ALLOWED %} | |
+ <hr class="dashed"> | |
<dl> | |
- <dt><label for="delete">{L_DELETE_POST}{L_COLON}</label></dt> | |
- <dd><label for="delete"><input type="checkbox" name="delete" id="delete" {S_SOFTDELETE_CHECKED} /> {L_DELETE_POST_WARN}</label></dd> | |
- <!-- IF S_DELETE_ALLOWED and S_SOFTDELETE_ALLOWED --> | |
- <dd><label for="delete_permanent"><input type="checkbox" name="delete_permanent" id="delete_permanent" /> {L_DELETE_POST_PERMANENTLY}</label></dd> | |
- <!-- ENDIF --> | |
+ <dt><label for="delete">{{ lang('DELETE_POST') ~ lang('COLON') }}</label></dt> | |
+ {% if S_SOFTDELETE_ALLOWED %} | |
+ <dd><label for="delete"><input type="checkbox" name="delete" id="delete" {{ S_SOFTDELETE_CHECKED }}> {{ lang('DELETE_POST_WARN') }}</label></dd> | |
+ {% endif %} | |
+ {% if S_DELETE_ALLOWED %} | |
+ <dd><label for="delete_permanent"><input type="checkbox" name="delete_permanent" id="delete_permanent"> {{ lang('DELETE_POST_PERMANENTLY') }}</label></dd> | |
+ {% endif %} | |
</dl> | |
- <!-- ENDIF --> | |
+ {% endif %} | |
<!-- IF S_EDIT_REASON --> | |
<dl> | |
diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html | |
index 7fee914525..2fee21fd97 100644 | |
--- a/phpBB/styles/prosilver/template/posting_pm_header.html | |
+++ b/phpBB/styles/prosilver/template/posting_pm_header.html | |
@@ -73,6 +73,7 @@ | |
<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF --> | |
</li> | |
<!-- END to_recipient --> | |
+ </ul> | |
</dd> | |
<!-- ENDIF --> | |
</dl> | |
diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html | |
index e5d285e7bf..1355bd32b8 100644 | |
--- a/phpBB/styles/prosilver/template/posting_review.html | |
+++ b/phpBB/styles/prosilver/template/posting_review.html | |
@@ -6,7 +6,8 @@ | |
<!-- IF post_review_row.S_IGNORE_POST --> | |
<div class="post bg3 post-ignore"> | |
<div class="inner"> | |
- {post_review_row.L_IGNORE_POST} | |
+ {post_review_row.L_IGNORE_POST}<br> | |
+ <a class="display_post_review" href="{{ post_review_row.U_MINI_POST }}">{{ lang('POST_DISPLAY') }}</a> | |
<!-- ELSE --> | |
<div class="post <!-- IF post_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> | |
<div class="inner"> | |
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html | |
index 209dadf327..e6692b1729 100644 | |
--- a/phpBB/styles/prosilver/template/posting_topic_review.html | |
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html | |
@@ -13,11 +13,13 @@ | |
<!-- IF topic_review_row.S_IGNORE_POST --> | |
<div class="post bg3 post-ignore"> | |
<div class="inner"> | |
- {topic_review_row.L_IGNORE_POST} | |
+ {topic_review_row.L_IGNORE_POST}<br> | |
+ <a class="display_post_review" href="{{ post_review_row.U_MINI_POST }}">{{ lang('POST_DISPLAY') }}</a> | |
<!-- ELSE IF topic_review_row.S_POST_DELETED --> | |
<div class="post bg3 post-ignore"> | |
<div class="inner"> | |
- {topic_review_row.L_DELETE_POST} | |
+ {topic_review_row.L_DELETE_POST}<br> | |
+ <a class="display_post_review" href="{{ post_review_row.U_MINI_POST }}">{{ lang('POST_DISPLAY') }}</a> | |
<!-- ELSE --> | |
<div class="post <!-- IF topic_review_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF topic_review_row.POST_ID == REPORTED_POST_ID --> reported<!-- ENDIF -->"> | |
<div class="inner"> | |
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html | |
index 25647afe1a..6d3b3fc03d 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html | |
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html | |
@@ -54,6 +54,7 @@ | |
</a> | |
<!-- ENDIF --> | |
<br /> | |
+ {% EVENT ucp_main_bookmarks_topic_title_after %} | |
<!-- IF .topicrow.pagination --> | |
<div class="pagination"> | |
<ul> | |
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html | |
index d8de7fd093..8b2ad49ac0 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html | |
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html | |
@@ -36,12 +36,12 @@ | |
</div> | |
</dt> | |
<dd class="lastpost"> | |
- <!-- IF forumrow.LAST_POST_TIME --> | |
+ <!-- IF forumrow.LAST_POST_TIME_RFC3339 --> | |
<span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL} | |
<a href="{forumrow.U_LAST_POST}"> | |
<i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{VIEW_LATEST_POST}</span> | |
</a> | |
- <br />{forumrow.LAST_POST_TIME}</span> | |
+ <br /><time datetime="{forumrow.LAST_POST_TIME_RFC3339}">{forumrow.LAST_POST_TIME}</time></span> | |
<!-- ELSE --> | |
{L_NO_POSTS}<br /> | |
<!-- ENDIF --> | |
@@ -97,6 +97,7 @@ | |
</a> | |
<!-- ENDIF --> | |
<br /> | |
+ {% EVENT ucp_main_subscribed_topic_title_after %} | |
<!-- IF .topicrow.pagination --> | |
<div class="pagination"> | |
<ul> | |
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html | |
index e4d7ff2705..198304e293 100644 | |
--- a/phpBB/styles/prosilver/template/viewtopic_body.html | |
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html | |
@@ -211,13 +211,13 @@ | |
<!-- IF postrow.S_POST_HIDDEN --> | |
<!-- IF postrow.S_POST_DELETED --> | |
<div class="ignore" id="post_hidden{postrow.POST_ID}"> | |
- {postrow.L_POST_DELETED_MESSAGE}<br /> | |
- {postrow.L_POST_DISPLAY} | |
+ {postrow.L_POST_DELETED_MESSAGE}<br> | |
+ <a class="display_post" data-post-id="{{ postrow.POST_ID }}" href="{{ postrow.U_MINI_POST_VIEW }}">{{ lang('POST_DISPLAY') }}</a> | |
</div> | |
<!-- ELSEIF postrow.S_IGNORE_POST --> | |
<div class="ignore" id="post_hidden{postrow.POST_ID}"> | |
- {postrow.L_IGNORE_POST}<br /> | |
- {postrow.L_POST_DISPLAY} | |
+ {postrow.L_IGNORE_POST}<br> | |
+ <a class="display_post" data-post-id="{{ postrow.POST_ID }}" href="{{ postrow.U_MINI_POST_VIEW }}">{{ lang('POST_DISPLAY') }}</a> | |
</div> | |
<!-- ENDIF --> | |
<!-- ENDIF --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js | |
index 5e66e5cda1..db2a5732f7 100644 | |
--- a/phpBB/styles/prosilver/template/ajax.js | |
+++ b/phpBB/styles/prosilver/template/ajax.js | |
@@ -361,6 +361,17 @@ $('.display_post').click(function(e) { | |
$('#post_hidden' + postId).hide(); | |
}); | |
+/** | |
+ * Display hidden post on post review page | |
+ */ | |
+$('.display_post_review').on('click', function(e) { | |
+ e.preventDefault(); | |
+ | |
+ let $displayPostLink = $(this); | |
+ $displayPostLink.closest('.post-ignore').removeClass('post-ignore'); | |
+ $displayPostLink.hide(); | |
+}); | |
+ | |
/** | |
* Toggle the member search panel in memberlist.php. | |
* |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment