makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-04-21 21:18:53 +02:00
commit 36faf85488
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/styles/prosilver/template/bbcode.html
View file

@ -13,6 +13,9 @@
<!-- BEGIN quote_close --></div></blockquote><!-- END quote_close --> <!-- BEGIN quote_close --></div></blockquote><!-- END quote_close -->
<!-- BEGIN quote_extended --> <!-- BEGIN quote_extended -->
<blockquote> <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:if test="not(@author)">
<xsl:attribute name="class">uncited</xsl:attribute> <xsl:attribute name="class">uncited</xsl:attribute>
</xsl:if> </xsl:if>
@ -42,7 +45,7 @@
<a href="{@msg_url}" data-msg-id="{@msg_id}">&#8593;</a> <a href="{@msg_url}" data-msg-id="{@msg_id}">&#8593;</a>
</xsl:if> </xsl:if>
<xsl:if test="@date"> <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> </xsl:if>
</cite> </cite>
</xsl:if> </xsl:if>

2
phpBB/styles/prosilver/theme/content.css
View file

@ -534,7 +534,7 @@ blockquote cite:before,
padding-right: 5px; padding-right: 5px;
} }
blockquote cite > div { blockquote cite > span {
font-weight: normal; font-weight: normal;
float: right; float: right;
} }

4
tests/text_formatter/s9e/default_formatting_test.php
View file

@ -279,7 +279,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
), ),
array( array(
'[quote=Username post_id=123]...[/quote]', '[quote=Username post_id=123]...[/quote]',
'<blockquote><div><cite>Username wrote: <a href="phpBB/viewtopic.php?p=123#p123" data-post-id="123" onclick="if(document.getElementById(hash.substr(1)))href=hash">↑</a></cite>...</div></blockquote>' '<blockquote cite="phpBB/viewtopic.php?p=123#p123"><div><cite>Username wrote: <a href="phpBB/viewtopic.php?p=123#p123" data-post-id="123" onclick="if(document.getElementById(hash.substr(1)))href=hash">↑</a></cite>...</div></blockquote>'
), ),
array( array(
// Users are not allowed to submit their own URL for the post // Users are not allowed to submit their own URL for the post
@ -288,7 +288,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
), ),
array( array(
'[quote=Username time=58705871]...[/quote]', '[quote=Username time=58705871]...[/quote]',
'<blockquote><div><cite>Username wrote:<div class="responsive-hide">1971-11-11 11:11:11</div></cite>...</div></blockquote>' '<blockquote><div><cite>Username wrote:<span class="responsive-hide">1971-11-11 11:11:11</span></cite>...</div></blockquote>'
), ),
array( array(
'[quote=Username user_id=123]...[/quote]', '[quote=Username user_id=123]...[/quote]',

5
tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html
View file

@ -13,6 +13,9 @@
{% for quote_close in loops.quote_close %}</div></blockquote>{% endfor %} {% for quote_close in loops.quote_close %}</div></blockquote>{% endfor %}
{% for quote_extended in loops.quote_extended %} {% for quote_extended in loops.quote_extended %}
<blockquote> <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:if test="not(@author)">
<xsl:attribute name="class">uncited</xsl:attribute> <xsl:attribute name="class">uncited</xsl:attribute>
</xsl:if> </xsl:if>
@ -38,7 +41,7 @@
<a href="{@post_url}" data-post-id="{@post_id}" onclick="if(document.getElementById(hash.substr(1)))href=hash">&#8593;</a> <a href="{@post_url}" data-post-id="{@post_id}" onclick="if(document.getElementById(hash.substr(1)))href=hash">&#8593;</a>
</xsl:if> </xsl:if>
<xsl:if test="@date"> <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> </xsl:if>
</cite> </cite>
</xsl:if> </xsl:if>