Version 5.0.0 beta 6
This commit is contained in:
Neo committed
1 parent
57d9db6ce2
commit
fa2a720105
115 files changed
+1823
-1147
No files matched your search
@@ -246,7 +246,7 @@ $return .= <<<IPSCONTENT
|
||||
<div class='i-flex i-align-items_center i-justify-content_space-between'>
|
||||
<a href='
|
||||
IPSCONTENT;
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( $item->url()->setQueryString( array( 'do' => 'findComment', 'comment' => $day['commentId'] ) ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( $item->shareableUrl( $day['commentId'] ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
$return .= <<<IPSCONTENT
|
||||
' class='i-font-weight_600'>
|
||||
IPSCONTENT;
|
||||
@@ -5826,14 +5826,14 @@ IPSCONTENT;
|
||||
$idField = $comment['comment']::$databaseColumnId;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class='i-padding_3 ipsEntry ipsEntry--recommended' data-commentID='
|
||||
<div class='ipsEntry ipsEntry--simple ipsEntry--featuredComment' data-commentID='
|
||||
IPSCONTENT;
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( $id, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
$return .= <<<IPSCONTENT
|
||||
'>
|
||||
<div class='ipsColumns i-gap_3'>
|
||||
<div class='ipsColumns__primary'>
|
||||
<div class="ipsPhotoPanel i-margin-bottom_2">
|
||||
<header class="ipsEntry__header">
|
||||
<div class="ipsEntry__header-align">
|
||||
<div class="ipsPhotoPanel">
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -5859,77 +5859,79 @@ $return .= <<<IPSCONTENT
|
||||
' rel="nofollow" data-action='goToComment'>{$comment['comment']->dateLine()}</a></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class='ipsRichText ipsTruncate_2'>{$comment['comment']->truncated( TRUE )}</div>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( $comment['note'] ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class='ipsEntry__recommendedNote'>
|
||||
<p class='ipsRichText'>
|
||||
IPSCONTENT;
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( $comment['note'], ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
$return .= <<<IPSCONTENT
|
||||
</p>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( isset( $comment['featured_by'] ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<p class='i-color_soft i-margin-top_2 i-link-color_inherit'>
|
||||
IPSCONTENT;
|
||||
|
||||
$htmlsprintf = array($comment['featured_by']->link()); $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'recommended_by', ENT_DISALLOWED, 'UTF-8', FALSE ), FALSE, array( 'htmlsprintf' => $htmlsprintf ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</p>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</div>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
elseif ( isset( $comment['featured_by'] ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
$htmlsprintf = array($comment['featured_by']->link()); $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'recommended_by', ENT_DISALLOWED, 'UTF-8', FALSE ), FALSE, array( 'htmlsprintf' => $htmlsprintf ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</div>
|
||||
<div class='i-basis_auto i-align-self_center'>
|
||||
|
||||
</header>
|
||||
<div class='ipsEntry__post'>
|
||||
<div class='ipsRichText ipsTruncate_2'>{$comment['comment']->truncated( TRUE )}</div>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \IPS\IPS::classUsesTrait( $comment['comment'], 'IPS\Content\Reactable' ) and \IPS\Settings::i()->reputation_enabled ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class='i-margin-top_2 i-flex'>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Theme::i()->getTemplate( "global", "core" )->reactionOverview( $comment['comment'] );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</div>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( $comment['note'] ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class='ipsEntry__recommendedNote'>
|
||||
<p>
|
||||
IPSCONTENT;
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( $comment['note'], ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
$return .= <<<IPSCONTENT
|
||||
</p>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( isset( $comment['featured_by'] ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<p class='i-font-style_italic i-color_soft i-margin-top_1 i-link-color_inherit'>
|
||||
IPSCONTENT;
|
||||
|
||||
$htmlsprintf = array($comment['featured_by']->link()); $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'recommended_by', ENT_DISALLOWED, 'UTF-8', FALSE ), FALSE, array( 'htmlsprintf' => $htmlsprintf ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</p>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</div>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
elseif ( isset( $comment['featured_by'] ) ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
$htmlsprintf = array($comment['featured_by']->link()); $return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'recommended_by', ENT_DISALLOWED, 'UTF-8', FALSE ), FALSE, array( 'htmlsprintf' => $htmlsprintf ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -5943,7 +5945,7 @@ IPSCONTENT;
|
||||
return $return;
|
||||
}
|
||||
|
||||
function featuredComments( $comments, $url, $titleLang='recommended_replies', $commentLang='__defart_comment' ) {
|
||||
function featuredComments( $comments, $url, $titleLang='recommended_replies', $commentLang='__defart_comment', $ipsBox=true ) {
|
||||
$return = '';
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
@@ -5952,7 +5954,17 @@ IPSCONTENT;
|
||||
IPSCONTENT;
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( $url, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
$return .= <<<IPSCONTENT
|
||||
' class='ipsBox ipsRecommendedComments
|
||||
' class='
|
||||
IPSCONTENT;
|
||||
|
||||
if ( $ipsBox ):
|
||||
$return .= <<<IPSCONTENT
|
||||
ipsBox ipsBox--featuredComments
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
ipsRecommendedComments
|
||||
IPSCONTENT;
|
||||
|
||||
if ( !\count( $comments ) ):
|
||||
@@ -5964,7 +5976,22 @@ endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
'>
|
||||
<div data-role="recommendedComments">
|
||||
<header class='ipsBox__header'>
|
||||
<header class='
|
||||
IPSCONTENT;
|
||||
|
||||
if ( $ipsBox ):
|
||||
$return .= <<<IPSCONTENT
|
||||
ipsBox__header
|
||||
IPSCONTENT;
|
||||
|
||||
else:
|
||||
$return .= <<<IPSCONTENT
|
||||
ipsTitle ipsTitle--h5 i-padding_2 i-flex i-align-items_center i-justify-content_space-between
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
'>
|
||||
<h2>
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -7616,6 +7643,12 @@ IPSCONTENT;
|
||||
$return .= \IPS\Theme\CustomTemplate::getCustomTemplatesForHookPoint( "core/front/global/globalTemplate", "body:inside-start", [ $title,$html,$location ] );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<a href="#ipsLayout__main" class="ipsSkipToContent">
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'jump_to_content', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</a>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -7706,12 +7739,6 @@ IPSCONTENT;
|
||||
$return .= \IPS\Theme::i()->getTemplate( "global", "core" )->announcementTop( );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<a href="#ipsLayout_main" class="ipsSkipToContent">
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'jump_to_content', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</a>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -8602,43 +8629,31 @@ IPSCONTENT;
|
||||
if ( \IPS\Login::registrationType() != 'disabled' ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class='i-text-align_center i-padding_3 cGuestTeaser'>
|
||||
<div class='i-text-align_center cGuestTeaser'>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( $isReview ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<h2 class='ipsTitle ipsTitle--h3'>
|
||||
<h2 class='ipsTitle ipsTitle--h4'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_review_title_reg', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</h2>
|
||||
<p class='i-color_soft i-margin-top_2'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_review_desc_reg', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</p>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
else:
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<h2 class='ipsTitle ipsTitle--h3'>
|
||||
<h2 class='ipsTitle ipsTitle--h4'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_title_reg', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</h2>
|
||||
<p class='i-color_soft i-margin-top_2'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_desc_reg', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</p>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -8646,45 +8661,32 @@ endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
<div class='ipsBox i-padding_3 i-margin-top_3'>
|
||||
<div class='ipsFluid i-basis_400'>
|
||||
<div class='cGuestTeaser_left'>
|
||||
<h2 class='ipsTitle ipsTitle--h3'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_account', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</h2>
|
||||
<p class='i-color_soft i-margin-bottom_3'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_account_desc', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</p>
|
||||
|
||||
<div class='ipsFluid i-basis_260 i-margin-top_3'>
|
||||
<div>
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \IPS\Login::registrationType() == 'redirect' ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<a href='
|
||||
<a href='
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Theme\Template::htmlspecialchars( \IPS\Settings::i()->allow_reg_target, ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', FALSE );
|
||||
$return .= <<<IPSCONTENT
|
||||
' class='ipsButton ipsButton--primary ipsButton--small' target="_blank" rel="noopener">
|
||||
|
||||
' class='ipsButton ipsButton--primary ipsButton--wide' target="_blank" rel="noopener">
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
else:
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<a href='
|
||||
<a href='
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= htmlspecialchars( \IPS\Http\Url::internal( "app=core&module=system&controller=register", null, "register", array(), 0 ), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', TRUE );
|
||||
$return .= <<<IPSCONTENT
|
||||
' class='ipsButton ipsButton--primary ipsButton--small'
|
||||
' class='ipsButton ipsButton--primary ipsButton--wide'
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \IPS\Login::registrationType() == 'normal' ):
|
||||
@@ -8700,33 +8702,21 @@ IPSCONTENT;
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
>
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
endif;
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_account_button', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</a>
|
||||
</div>
|
||||
<div class='cGuestTeaser_right'>
|
||||
<h2 class='ipsTitle ipsTitle--h3'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_signin', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</h2>
|
||||
<p class='i-color_soft i-margin-bottom_3'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_signin_desc', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</p>
|
||||
<a href='
|
||||
</div>
|
||||
<div>
|
||||
<a href='
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= htmlspecialchars( \IPS\Http\Url::internal( "app=core&module=system&controller=login", null, "login", array(), 0 )->addRef((string) $item->url() . '#replyForm'), ENT_QUOTES | ENT_DISALLOWED, 'UTF-8', TRUE );
|
||||
@@ -8736,13 +8726,12 @@ IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_signin_button', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
" class='ipsButton ipsButton--primary ipsButton--small'>
|
||||
" class='ipsButton ipsButton--secondary ipsButton--wide'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_signin_button', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -8752,21 +8741,19 @@ IPSCONTENT;
|
||||
else:
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<div class='i-text-align_center i-padding_3'>
|
||||
<h2 class='ipsTitle ipsTitle--h3'>
|
||||
<div class='i-text-align_center'>
|
||||
<h2 class='ipsTitle ipsTitle--h4'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_title_noreg', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</h2>
|
||||
<p class='i-color_soft i-margin-top_2'>
|
||||
<p class='i-color_soft i-margin-top_1'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_desc_noreg', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
</p>
|
||||
<br>
|
||||
<br>
|
||||
<a href='
|
||||
IPSCONTENT;
|
||||
|
||||
@@ -8777,7 +8764,7 @@ IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_signin_button', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
$return .= <<<IPSCONTENT
|
||||
" class='ipsButton ipsButton--secondary'>
|
||||
" class='ipsButton ipsButton--primary i-margin-top_3'>
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Member::loggedIn()->language()->addToStack( htmlspecialchars( 'teaser_signin_button', ENT_DISALLOWED, 'UTF-8', FALSE ), TRUE, array( ) );
|
||||
@@ -20827,7 +20814,19 @@ $return .= <<<IPSCONTENT
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
if ( \count( $tags ) > 4 ):
|
||||
if ( \count( $tags ) == 5 ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
$return .= \IPS\Theme::i()->getTemplate( "global", "core" )->tag( $tags[4], $tagEditUrl );
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
|
||||
IPSCONTENT;
|
||||
|
||||
elseif ( \count( $tags ) > 4 ):
|
||||
$return .= <<<IPSCONTENT
|
||||
|
||||
<li class='ipsTags__more ipsJS_show'>
|
||||
|
||||
Reference in new issue
Block a user