* @since 1.16.3
* @param Revision $rev
* @param bool $isPublic Show only if all users can see it
+ * @param bool $useParentheses (optional) Wrap comments in parentheses where needed
* @return string HTML
*/
- public static function revUserTools( $rev, $isPublic = false ) {
+ public static function revUserTools( $rev, $isPublic = false, $useParentheses = true ) {
if ( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) {
$link = wfMessage( 'rev-deleted-user' )->escaped();
} elseif ( $rev->userCan( Revision::DELETED_USER ) ) {
$userId = $rev->getUser( Revision::FOR_THIS_USER );
$userText = $rev->getUserText( Revision::FOR_THIS_USER );
$link = self::userLink( $userId, $userText )
- . self::userToolLinks( $userId, $userText );
+ . self::userToolLinks( $userId, $userText, false, 0, null,
+ $useParentheses );
} else {
$link = wfMessage( 'rev-deleted-user' )->escaped();
}
$stxt = wfMessage( 'historyempty' )->escaped();
} else {
$stxt = wfMessage( 'nbytes' )->numParams( $size )->escaped();
- $stxt = wfMessage( 'parentheses' )->rawParams( $stxt )->escaped();
}
- return "<span class=\"history-size\">$stxt</span>";
+ return "<span class=\"history-size mw-diff-bytes\">$stxt</span>";
}
/**
$curlink = $this->curLink( $rev, $latest );
$lastlink = $this->lastLink( $rev, $next );
- $curLastlinks = $curlink . $this->historyPage->message['pipe-separator'] . $lastlink;
+ $curLastlinks = Html::rawElement( 'span', [], $curlink ) .
+ Html::rawElement( 'span', [], $lastlink );
$histLinks = Html::rawElement(
'span',
- [ 'class' => 'mw-history-histlinks' ],
- $this->msg( 'parentheses' )->rawParams( $curLastlinks )->escaped()
+ [ 'class' => 'mw-history-histlinks mw-changeslist-links' ],
+ $curLastlinks
);
$diffButtons = $this->diffButtons( $rev, $firstInList );
$s .= " $link";
$s .= $dirmark;
$s .= " <span class='history-user'>" .
- Linker::revUserTools( $rev, true ) . "</span>";
+ Linker::revUserTools( $rev, true, false ) . "</span>";
$s .= $dirmark;
if ( $rev->isMinor() ) {
# Size is always public data
$prevSize = $this->parentLens[$row->rev_parent_id] ?? 0;
$sDiff = ChangesList::showCharacterDifference( $prevSize, $rev->getSize() );
- $fSize = Linker::formatRevisionSize( $rev->getSize() );
- $s .= ' <span class="mw-changeslist-separator">. .</span> ' . "$fSize $sDiff";
+ $fSize = Linker::formatRevisionSize( $rev->getSize(), false );
+ $s .= ' <span class="mw-changeslist-separator"></span> ' . "$fSize $sDiff";
}
# Text following the character difference is added just before running hooks
- $s2 = Linker::revComment( $rev, false, true );
+ $s2 = Linker::revComment( $rev, false, true, false );
if ( $notificationtimestamp && ( $row->rev_timestamp >= $notificationtimestamp ) ) {
$s2 .= ' <span class="updatedmarker">' . $this->msg( 'updatedmarker' )->escaped() . '</span>';
Hooks::run( 'HistoryRevisionTools', [ $rev, &$tools, $prevRev, $user ] );
if ( $tools ) {
- $s2 .= ' ' . $this->msg( 'parentheses' )->rawParams( $lang->pipeList( $tools ) )->escaped();
+ $s2 .= ' ' . Html::openElement( 'span', [ 'class' => 'mw-changeslist-links' ] );
+ foreach ( $tools as $tool ) {
+ $s2 .= Html::rawElement( 'span', [], $tool );
+ }
+ $s2 .= Html::closeElement( 'span' );
}
# Tags
# Include separator between character difference and following text
if ( $s2 !== '' ) {
- $s .= ' <span class="mw-changeslist-separator">. .</span> ' . $s2;
+ $s .= ' <span class="mw-changeslist-separator"></span> ' . $s2;
}
$attribs = [ 'data-mw-revid' => $rev->getId() ];