Created
August 17, 2019 19:34
-
-
Save marc1706/3a8990f6db8fd3a029bcdcae19b6f7f9 to your computer and use it in GitHub Desktop.
prosilver changes 3.2.7 to 3.2.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/theme/plupload.css b/phpBB/styles/prosilver/theme/plupload.css | |
index f466803..b1f3ae2 100644 | |
--- a/phpBB/styles/prosilver/theme/plupload.css | |
+++ b/phpBB/styles/prosilver/theme/plupload.css | |
@@ -3,6 +3,10 @@ | |
margin-bottom: 1em; | |
} | |
+.attach-row-tpl { | |
+ display: none; | |
+} | |
+ | |
.file-list td { | |
vertical-align: middle; | |
} |
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/attachment.html b/phpBB/styles/prosilver/template/attachment.html | |
index 0978d91..615717e 100644 | |
--- a/phpBB/styles/prosilver/template/attachment.html | |
+++ b/phpBB/styles/prosilver/template/attachment.html | |
@@ -8,14 +8,14 @@ | |
<!-- IF _file.S_THUMBNAIL --> | |
<dl class="thumbnail"> | |
- <dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" class="postimage" alt="{_file.DOWNLOAD_NAME}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt> | |
+ <dt><a href="{_file.U_DOWNLOAD_LINK}"><img src="{_file.THUMB_IMAGE}" class="postimage" alt="{% if _file.COMMENT %}{{ _file.COMMENT|e('html') }}{% else %}{{ _file.DOWNLOAD_NAME }}{% endif %}" title="{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}" /></a></dt> | |
<!-- IF _file.COMMENT --><dd> {_file.COMMENT}</dd><!-- ENDIF --> | |
</dl> | |
<!-- ENDIF --> | |
<!-- IF _file.S_IMAGE --> | |
<dl class="file"> | |
- <dt class="attach-image"><img src="{_file.U_INLINE_LINK}" class="postimage" alt="{_file.DOWNLOAD_NAME}" onclick="viewableArea(this);" /></dt> | |
+ <dt class="attach-image"><img src="{_file.U_INLINE_LINK}" class="postimage" alt="{% if _file.COMMENT %}{{ _file.COMMENT|e('html') }}{% else %}{{ _file.DOWNLOAD_NAME }}{% endif %}" onclick="viewableArea(this);" /></dt> | |
<!-- IF _file.COMMENT --><dd><em>{_file.COMMENT}</em></dd><!-- ENDIF --> | |
<dd>{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}</dd> | |
</dl> | |
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html | |
index f6c518e..82df5d5 100644 | |
--- a/phpBB/styles/prosilver/template/mcp_forum.html | |
+++ b/phpBB/styles/prosilver/template/mcp_forum.html | |
@@ -86,7 +86,9 @@ | |
<div class="responsive-hide"> | |
<!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i> <!-- ENDIF --> | |
+ {% EVENT topiclist_row_topic_by_author_before %} | |
{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} | |
+ {% EVENT topiclist_row_topic_by_author_after %} | |
</div> | |
<!-- EVENT topiclist_row_append --> | |
</div> | |
diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html | |
index 45a9ae8..63197ef 100644 | |
--- a/phpBB/styles/prosilver/template/mcp_move.html | |
+++ b/phpBB/styles/prosilver/template/mcp_move.html | |
@@ -43,12 +43,14 @@ | |
<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF --> | |
<fieldset> | |
+ {% EVENT mcp_move_destination_forum_before %} | |
<dl class="fields2"> | |
<dt><label>{L_SELECT_DESTINATION_FORUM}{L_COLON}</label></dt> | |
<dd><select name="to_forum_id">{S_FORUM_SELECT}</select></dd> | |
<!-- IF S_CAN_LEAVE_SHADOW --><dd><label for="move_leave_shadow"><input type="checkbox" name="move_leave_shadow" id="move_leave_shadow" />{L_LEAVE_SHADOW}</label></dd><!-- ENDIF --> | |
<!-- IF S_CAN_LOCK_TOPIC --><dd><label for="move_lock_topics"><input type="checkbox" name="move_lock_topics" id="move_lock_topics" />{L_LOCK_TOPIC}</label></dd><!-- ENDIF --> | |
</dl> | |
+ {% EVENT mcp_move_destination_forum_after %} | |
<dl class="fields2"> | |
<dt> </dt> | |
<dd><strong>{MESSAGE_TEXT}</strong></dd> | |
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html | |
index b56ed18..090e240 100644 | |
--- a/phpBB/styles/prosilver/template/mcp_topic.html | |
+++ b/phpBB/styles/prosilver/template/mcp_topic.html | |
@@ -120,7 +120,7 @@ | |
<p class="author"> | |
<a href="#pr{postrow.POST_ID}" title="{postrow.MINI_POST}"> | |
<i class="icon fa-file fa-fw icon-lightgray icon-tiny" aria-hidden="true"></i><span class="sr-only">{postrow.MINI_POST}</span> | |
- </a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --> | |
+ </a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} {% EVENT mcp_topic_post_author_full_prepend %}<strong>{postrow.POST_AUTHOR_FULL}</strong>{% EVENT mcp_topic_post_author_full_append %}<!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --> | |
</p> | |
<!-- EVENT mcp_topic_postrow_post_details_after --> | |
diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html | |
index b46e9c9..ff5bfe1 100644 | |
--- a/phpBB/styles/prosilver/template/posting_attach_body.html | |
+++ b/phpBB/styles/prosilver/template/posting_attach_body.html | |
@@ -34,7 +34,7 @@ | |
</tr> | |
</thead> | |
<tbody class="responsive-skip-empty file-list" id="file-list"> | |
- <tr class="attach-row" id="attach-row-tpl"> | |
+ <tr class="attach-row attach-row-tpl" id="attach-row-tpl"> | |
<td class="attach-name"> | |
<span class="file-name ellipsis-text"></span> | |
<span class="attach-controls"> | |
diff --git a/phpBB/styles/prosilver/template/posting_poll_body.html b/phpBB/styles/prosilver/template/posting_poll_body.html | |
index ee7100a..7956496 100644 | |
--- a/phpBB/styles/prosilver/template/posting_poll_body.html | |
+++ b/phpBB/styles/prosilver/template/posting_poll_body.html | |
@@ -15,8 +15,8 @@ | |
<!-- IF S_SHOW_POLL_BOX --> | |
<dl> | |
- <dt><label for="poll_title">{L_POLL_QUESTION}{L_COLON}</label></dt> | |
- <dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox" /></dd> | |
+ <dt><label for="poll_title">{{ lang('POLL_QUESTION') ~ lang('COLON') }}</label></dt> | |
+ <dd><input type="text" name="poll_title" id="poll_title" maxlength="100" value="{{ POLL_TITLE }}" class="inputbox" /></dd> | |
</dl> | |
<dl> | |
<dt><label for="poll_option_text">{L_POLL_OPTIONS}{L_COLON}</label><br /><span>{L_POLL_OPTIONS_EXPLAIN}</span></dt> | |
diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html | |
index 1304046..033a884 100644 | |
--- a/phpBB/styles/prosilver/template/posting_review.html | |
+++ b/phpBB/styles/prosilver/template/posting_review.html | |
@@ -22,7 +22,7 @@ | |
<i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{post_review_row.MINI_POST}</span> | |
</a> | |
<!-- ENDIF --> | |
- {L_POST_BY_AUTHOR}<strong> {post_review_row.POST_AUTHOR_FULL}</strong> » {post_review_row.POST_DATE} | |
+ {L_POST_BY_AUTHOR} <!-- EVENT posting_review_row_post_author_username_prepend --><strong>{post_review_row.POST_AUTHOR_FULL}</strong><!-- EVENT posting_review_row_post_author_username_append --> » {post_review_row.POST_DATE} | |
</p> | |
<div class="content">{post_review_row.MESSAGE}</div> | |
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html | |
index 93c4484..8faece3 100644 | |
--- a/phpBB/styles/prosilver/template/posting_topic_review.html | |
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html | |
@@ -54,7 +54,7 @@ | |
<i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{topic_review_row.MINI_POST}</span> | |
</a> | |
<!-- ENDIF --> | |
- {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> » {topic_review_row.POST_DATE} | |
+ {L_POST_BY_AUTHOR} <!-- EVENT posting_topic_review_row_post_author_username_prepend --><strong>{topic_review_row.POST_AUTHOR_FULL}</strong><!-- EVENT posting_topic_review_row_post_author_username_append --> » {topic_review_row.POST_DATE} | |
</p> | |
<!-- EVENT posting_topic_review_row_post_details_after --> | |
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html | |
index d4dc6aa..391afa4 100644 | |
--- a/phpBB/styles/prosilver/template/search_results.html | |
+++ b/phpBB/styles/prosilver/template/search_results.html | |
@@ -117,7 +117,9 @@ | |
<div class="responsive-hide left-box"> | |
<!-- IF searchresults.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i><!-- ENDIF --> | |
<!-- IF searchresults.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> | |
+ {% EVENT topiclist_row_topic_by_author_before %} | |
{L_POST_BY_AUTHOR} <!-- EVENT search_results_topic_author_username_prepend -->{searchresults.TOPIC_AUTHOR_FULL}<!-- EVENT search_results_topic_author_username_append --> » {searchresults.FIRST_POST_TIME} » {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> | |
+ {% EVENT topiclist_row_topic_by_author_after %} | |
</div> | |
<!-- IF .searchresults.pagination --> | |
diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html | |
index ace6525..d4fef9f 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_agreement.html | |
+++ b/phpBB/styles/prosilver/template/ucp_agreement.html | |
@@ -62,8 +62,6 @@ | |
<div class="content"> | |
<h2 class="sitename-title">{SITENAME} - {AGREEMENT_TITLE}</h2> | |
<p>{AGREEMENT_TEXT}</p> | |
- <hr class="dashed" /> | |
- <p><a href="{U_BACK}" class="button2">{L_BACK}</a></p> | |
</div> | |
</div> | |
</div> | |
diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html | |
index 696f621..cfdbf9c 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_attachments.html | |
+++ b/phpBB/styles/prosilver/template/ucp_attachments.html | |
@@ -44,7 +44,7 @@ | |
</dt> | |
<dd class="extra">{attachrow.DOWNLOAD_COUNT}</dd> | |
<dd class="time"><span>{attachrow.POST_TIME}</span></dd> | |
- <dd class="mark"><input type="checkbox" name="attachment[{attachrow.ATTACH_ID}]" value="1" /></dd> | |
+ <dd class="mark"><input type="checkbox" name="attachment[{attachrow.ATTACH_ID}]" value="1"{% if attachrow.S_LOCKED %} disabled title="{{ lang('ATTACHMENT_LOCKED') }}"{% endif %} /></dd> | |
</dl> | |
</li> | |
<!-- END attachrow --> | |
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html | |
index 6362a0b..b53eb0c 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html | |
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html | |
@@ -36,7 +36,7 @@ | |
<p class="author"> | |
<span><i class="icon fa-file fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{history_row.MINI_POST}</span></span> {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong> | |
<br /> | |
- {L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL} | |
+ {L_MESSAGE_BY_AUTHOR} <!-- EVENT ucp_pm_history_row_message_author_username_prepend -->{history_row.MESSAGE_AUTHOR_FULL}<!-- EVENT ucp_pm_history_row_message_author_username_append --> | |
</p> | |
<div class="content"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div> | |
<div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div> | |
@@ -54,4 +54,3 @@ | |
<i class="icon fa-chevron-circle-up fa-fw icon-gray" aria-hidden="true"></i><span>{L_BACK_TO_TOP}</span> | |
</a> | |
</p> | |
- | |
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html | |
index 7a88492..41ff5b8 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html | |
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html | |
@@ -42,7 +42,14 @@ | |
<div id="page-footer" class="page-footer"> | |
<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div> | |
- <div class="copyright">Powered by phpBB® Forum Software © phpBB Limited<br />https://www.phpbb.com/</div> | |
+ <div class="copyright"> | |
+ <p>{{ CREDIT_LINE }} | |
+ </p> | |
+ {% if TRANSLATION_INFO %} | |
+ <p>{{ TRANSLATION_INFO }} | |
+ </p> | |
+ {% endif %} | |
+ </div> | |
</div> | |
</div> | |
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html | |
index d7099f3..1827738 100644 | |
--- a/phpBB/styles/prosilver/template/viewforum_body.html | |
+++ b/phpBB/styles/prosilver/template/viewforum_body.html | |
@@ -157,7 +157,7 @@ | |
<li class="row<!-- IF topicrow.S_ROW_COUNT is even --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- IF topicrow.S_POST_GLOBAL --> global-announce<!-- ENDIF --><!-- IF topicrow.S_POST_ANNOUNCE --> announce<!-- ENDIF --><!-- IF topicrow.S_POST_STICKY --> sticky<!-- ENDIF --><!-- IF topicrow.S_TOPIC_REPORTED --> reported<!-- ENDIF -->"> | |
<!-- EVENT viewforum_body_topic_row_prepend --> | |
<dl class="row-item {topicrow.TOPIC_IMG_STYLE}"> | |
- <dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> | |
+ <dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url('{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}'); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> | |
<!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT --><a href="{topicrow.U_NEWEST_POST}" class="row-item-link"></a><!-- ENDIF --> | |
<div class="list-inner"> | |
<!-- EVENT topiclist_row_prepend --> | |
@@ -198,7 +198,9 @@ | |
<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 --> | |
+ {% EVENT topiclist_row_topic_by_author_before %} | |
{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} | |
+ {% EVENT topiclist_row_topic_by_author_after %} | |
<!-- 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> | |
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html | |
index b504949..658062f 100644 | |
--- a/phpBB/styles/prosilver/template/viewtopic_print.html | |
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html | |
@@ -38,7 +38,14 @@ | |
<div id="page-footer" class="page-footer"> | |
<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div> | |
- <div class="copyright">Powered by phpBB® Forum Software © phpBB Limited<br />https://www.phpbb.com/</div> | |
+ <div class="copyright"> | |
+ <p>{{ CREDIT_LINE }} | |
+ </p> | |
+ {% if TRANSLATION_INFO %} | |
+ <p>{{ TRANSLATION_INFO }} | |
+ </p> | |
+ {% endif %} | |
+ </div> | |
</div> | |
</div> | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment