Created
October 24, 2020 08:27
-
-
Save marc1706/b8988d6d1a1b634ad85996cd62a38ac4 to your computer and use it in GitHub Desktop.
prosilver changes phpBB 3.3.2-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/content.css b/phpBB/styles/prosilver/theme/content.css | |
index d1d20d4a99..13c04e57b1 100644 | |
--- a/phpBB/styles/prosilver/theme/content.css | |
+++ b/phpBB/styles/prosilver/theme/content.css | |
@@ -361,6 +361,17 @@ dd.option { | |
line-height: 1.4em; | |
} | |
+.agreement { | |
+ font-size: 12px; | |
+ line-height: 17px; | |
+ margin-bottom: 10px; | |
+} | |
+ | |
+.agreement-text { | |
+ line-height: 17px; | |
+ margin-bottom: 10px; | |
+} | |
+ | |
dl.faq { | |
font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; | |
font-size: 1.1em; | |
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css | |
index 61c204026b..17c545f53f 100644 | |
--- a/phpBB/styles/prosilver/theme/responsive.css | |
+++ b/phpBB/styles/prosilver/theme/responsive.css | |
@@ -554,9 +554,7 @@ | |
@media (min-width: 701px) { | |
.postbody { | |
- /** deduct postprofile width (including border width, margin and padding) and postbody margin and padding */ | |
width: calc(100% - 200px - 1px - 16px); | |
- margin-right: 16px; | |
} | |
.postprofile { |
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/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html | |
index 54922620c4..2780d869d2 100644 | |
--- a/phpBB/styles/prosilver/template/bbcode.html | |
+++ b/phpBB/styles/prosilver/template/bbcode.html | |
@@ -77,6 +77,19 @@ | |
<!-- BEGIN url --><a href="{URL}" class="postlink">{DESCRIPTION}</a><!-- END url --> | |
-<!-- BEGIN email --><a href="mailto:{EMAIL}">{DESCRIPTION}</a><!-- END email --> | |
+<!-- BEGIN email --> | |
+<a> | |
+ <xsl:attribute name="href"> | |
+ <xsl:text>mailto:</xsl:text> | |
+ <xsl:value-of select="@email"/> | |
+ <xsl:if test="@subject or @body"> | |
+ <xsl:text>?</xsl:text> | |
+ <xsl:if test="@subject">subject=<xsl:value-of select="@subject"/></xsl:if> | |
+ <xsl:if test="@body"><xsl:if test="@subject">&</xsl:if>body=<xsl:value-of select="@body"/></xsl:if> | |
+ </xsl:if> | |
+ </xsl:attribute> | |
+ <xsl:apply-templates/> | |
+</a> | |
+<!-- END email --> | |
<!-- BEGIN flash --><object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}"><param name="movie" value="{URL}" /><param name="play" value="false" /><param name="loop" value="false" /><param name="quality" value="high" /><param name="allowScriptAccess" value="never" /><param name="allowNetworking" value="internal" /><embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="false" loop="false" quality="high" allowscriptaccess="never" allownetworking="internal"></embed></object><!-- END flash --> | |
diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html | |
index 0363fe0f05..f304d727f2 100644 | |
--- a/phpBB/styles/prosilver/template/posting_attach_body.html | |
+++ b/phpBB/styles/prosilver/template/posting_attach_body.html | |
@@ -2,6 +2,7 @@ | |
<div class="inner"> | |
<p>{L_ADD_ATTACHMENT_EXPLAIN} <span class="hidden" id="drag-n-drop-message">{L_PLUPLOAD_DRAG_TEXTAREA}</span></p> | |
+ {% if MAX_ATTACHMENT_FILESIZE is not empty %}<p>{{ MAX_ATTACHMENT_FILESIZE }}</p>{% endif %} | |
<fieldset class="fields2" id="attach-panel-basic"> | |
<dl> | |
diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html | |
index 7959925d30..d7a90da88e 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_agreement.html | |
+++ b/phpBB/styles/prosilver/template/ucp_agreement.html | |
@@ -31,9 +31,9 @@ | |
<div class="panel"> | |
<div class="inner"> | |
<div class="content"> | |
- <h2 class="sitename-title">{SITENAME} - {L_REGISTRATION}</h2> | |
+ <h2 class="sitename-title">{{ SITENAME }} - {{ lang('REGISTRATION') }}</h2> | |
<!-- EVENT ucp_agreement_terms_before --> | |
- <p><!-- IF S_SHOW_COPPA -->{L_COPPA_BIRTHDAY}<!-- ELSE -->{L_TERMS_OF_USE}<!-- ENDIF --></p> | |
+ <div class="agreement">{% if S_SHOW_COPPA %}<p class="agreement-text">{{ lang('COPPA_BIRTHDAY') }}</p>{% else %}{{ lang('TERMS_OF_USE') }}{% endif %}</div> | |
<!-- EVENT ucp_agreement_terms_after --> | |
</div> | |
</div> | |
@@ -61,8 +61,8 @@ | |
<div class="panel"> | |
<div class="inner"> | |
<div class="content"> | |
- <h2 class="sitename-title">{SITENAME} - {AGREEMENT_TITLE}</h2> | |
- <p>{AGREEMENT_TEXT}</p> | |
+ <h2 class="sitename-title">{{ SITENAME }} - {{ AGREEMENT_TITLE }}</h2> | |
+ <div class="agreement">{{ AGREEMENT_TEXT }}</div> | |
</div> | |
</div> | |
</div> | |
diff --git a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html | |
index 65909b7068..d61c185eab 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html | |
+++ b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html | |
@@ -7,25 +7,34 @@ | |
<div class="inner"> | |
<p>{L_PROFILE_AUTOLOGIN_KEYS}</p> | |
<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> | |
+ {% DEFINE COLSPAN = 4 %} | |
<table class="table1"> | |
<thead> | |
<tr> | |
+ {% EVENT ucp_profile_autologin_keys_thead_key_before %} | |
<th class="name">{L_LOGIN_KEY}</th> | |
+ {% EVENT ucp_profile_autologin_keys_thead_key_after %} | |
<th class="center">{L_IP}</th> | |
<th class="center">{L_LOGIN_TIME}</th> | |
+ {% EVENT ucp_profile_autologin_keys_thead_mark_before %} | |
<th class="center mark">{L_MARK}</th> | |
+ {% EVENT ucp_profile_autologin_keys_thead_mark_after %} | |
</tr> | |
</thead> | |
<tbody> | |
<!-- BEGIN sessions --> | |
<!-- IF sessions.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF --> | |
+ {% EVENT ucp_profile_autologin_keys_tbody_key_before %} | |
<td><label for="{sessions.KEY}">{sessions.KEY}</label></td> | |
+ {% EVENT ucp_profile_autologin_keys_tbody_key_after %} | |
<td class="center">{sessions.IP}</td> | |
<td class="center">{sessions.LOGIN_TIME}</td> | |
+ {% EVENT ucp_profile_autologin_keys_tbody_mark_before %} | |
<td class="center mark"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}" /></td> | |
+ {% EVENT ucp_profile_autologin_keys_tbody_mark_after %} | |
</tr> | |
<!-- BEGINELSE --> | |
- <tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr> | |
+ <tr><td colspan="{{ definition.COLSPAN }}" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr> | |
<!-- END sessions --> | |
</tbody> | |
</table> | |
diff --git a/phpBB/styles/prosilver/template/ucp_reset_password.html b/phpBB/styles/prosilver/template/ucp_reset_password.html | |
index fc42164e11..ec19ff7958 100644 | |
--- a/phpBB/styles/prosilver/template/ucp_reset_password.html | |
+++ b/phpBB/styles/prosilver/template/ucp_reset_password.html | |
@@ -12,7 +12,7 @@ | |
{% if S_IS_PASSWORD_RESET %} | |
{% if PASSWORD_RESET_ERRORS %}<p class="error">{{ PASSWORD_RESET_ERRORS | join('<br>') }}</p>{% endif %} | |
<dl> | |
- <dt><label for="new_password">{{ lang('NEW_PASSWORD') ~ lang('COLON') }}</label></dt> | |
+ <dt><label for="new_password">{{ lang('NEW_PASSWORD') ~ lang('COLON') }}</label><br /><span>{{ lang('CHANGE_PASSWORD_EXPLAIN') }}</span></dt> | |
<dd><input class="inputbox autowidth" type="password" name="new_password" id="new_password" size="25" maxlength="255" title="{{ lang('CHANGE_PASSWORD') }}" autocomplete="off" /></dd> | |
</dl> | |
<dl> | |
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html | |
index 1d0c7f4f74..fc38455ec5 100644 | |
--- a/phpBB/styles/prosilver/template/viewforum_body.html | |
+++ b/phpBB/styles/prosilver/template/viewforum_body.html | |
@@ -250,7 +250,7 @@ | |
<!-- IF S_IS_POSTABLE --> | |
<div class="panel"> | |
<div class="inner"> | |
- <strong>{L_NO_TOPICS}</strong> | |
+ <strong>{{ lang(S_SORT_DAYS ? 'NO_TOPICS_TIME_FRAME' : 'NO_TOPICS') }}</strong> | |
</div> | |
</div> | |
<!-- ELSE IF not S_HAS_SUBFORUM --> |
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/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js | |
index 2e393657e8..72dc6b7736 100644 | |
--- a/phpBB/styles/prosilver/template/forum_fn.js | |
+++ b/phpBB/styles/prosilver/template/forum_fn.js | |
@@ -459,7 +459,7 @@ function parseDocument($container) { | |
$linksFirst = $linksNotSkip.not(filterLast), // The items that will be hidden first | |
$linksLast = $linksNotSkip.filter(filterLast), // The items that will be hidden last | |
persistent = $this.attr('id') === 'nav-main', // Does this list already have a menu (such as quick-links)? | |
- html = '<li class="responsive-menu hidden"><a href="javascript:void(0);" class="js-responsive-menu-link responsive-menu-link"><i class="icon fa-bars fa-fw" aria-hidden="true"></i></a><div class="dropdown"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>', | |
+ html = '<li class="responsive-menu hidden"><a href="javascript:void(0);" class="js-responsive-menu-link responsive-menu-link"><i class="icon fa-bars fa-fw" aria-hidden="true"></i></a><div class="dropdown"><div class="pointer"><div class="pointer-inner"></div></div><ul class="dropdown-contents" /></div></li>', | |
slack = 3; // Vertical slack space (in pixels). Determines how sensitive the script is in determining whether a line-break has occurred. | |
// Add a hidden drop-down menu to each links list (except those that already have one) | |
@@ -813,7 +813,7 @@ function parseDocument($container) { | |
$ul = $this.children(), | |
$tabs = $ul.children().not('[data-skip-responsive]'), | |
$links = $tabs.children('a'), | |
- $item = $ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"> </a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'), | |
+ $item = $ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"> </a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'), | |
$menu = $item.find('.dropdown-contents'), | |
maxHeight = 0, | |
lastWidth = false, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment