Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug 1761: Cleanup of Recent Changes indicator flags

Browse source 
Fix by Niklas Laxstrom
This commit is contained in:
Jens Frank 2005-04-24 15:43:49 +00:00
parent 92c122bc67
commit eb1cf2c5b3
1 changed files with 19 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
includes/ChangesList.php
View file

@ -15,6 +15,19 @@ class ChangesList {
$this->skin =& $skin; $this->skin =& $skin;
} }
/**
* Returns the appropiate flags for new page, minor change and patrolling
*/
function recentChangesFlags( $new, $minor, $patrolled, $nothing = ' ' ) {
$f = $new ? '<span class="newpage">' . htmlspecialchars( wfMsg( 'newpageletter' ) ) . '</span>'
: $nothing;
$f .= $minor ? '<span class="minor">' . htmlspecialchars( wfMsg( 'minoreditletter' ) ) . '</span>'
: $nothing;
$f .= $patrolled ? '<span class="unpatrolled">!</span>' : $nothing;
return $f;
}
/** /**
* Returns text for the start of the tabular part of RC * Returns text for the start of the tabular part of RC
*/ */
@ -58,25 +71,7 @@ class ChangesList {
if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) { if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
$r .= '&nbsp;&nbsp;&nbsp;'; $r .= '&nbsp;&nbsp;&nbsp;';
} else { } else {
# M, N and ! $r .= $this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $rcObj->unpatrolled );
$M = wfMsg( 'minoreditletter' );
$N = wfMsg( 'newpageletter' );
if ( $rc_type == RC_NEW ) {
$r .= '<span class="newpage">' . htmlspecialchars( $N ) . '</span>';
} else {
$r .= '&nbsp;' ;
}
if ( $rc_minor ) {
$r .= '<span class="minor">' . htmlspecialchars( $M ) . '</span>';
} else {
$r .= '&nbsp;' ;
}
if ( $rcObj->unpatrolled ) {
$r .= '<span class="unpatrolled">!</span>';
} else {
$r .= '&nbsp;';
}
} }
# Timestamp # Timestamp
@ -123,9 +118,7 @@ class ChangesList {
function recentChangesBlockGroup ( $block ) { function recentChangesBlockGroup ( $block ) {
global $wgStylePath, $wgContLang ; global $wgStylePath, $wgContLang ;
$r = '' ; $r = '';
$M = wfMsg( 'minoreditletter' );
$N = wfMsg( 'newpageletter' );
# Collate list of users # Collate list of users
$isnew = false ; $isnew = false ;
@ -168,19 +161,9 @@ class ChangesList {
$r .= $tl ; $r .= $tl ;
# Main line # Main line
# M/N
$r .= '<tt>' ; $r .= '<tt>' ;
if ( $isnew ) { $r .= $this->recentChangesFlags( $isnew, false, $unpatrolled );
$r .= '<span class="newpage">' . htmlspecialchars( $N ) . '</span>';
} else {
$r .= '&nbsp;';
}
$r .= '&nbsp;'; # Minor
if ( $unpatrolled ) {
$r .= '<span class="unpatrolled">!</span>';
} else {
$r .= '&nbsp;';
}
# Timestamp # Timestamp
$r .= ' '.$block[0]->timestamp.' ' ; $r .= ' '.$block[0]->timestamp.' ' ;
@ -224,24 +207,7 @@ class ChangesList {
$r .= '<img src="'.$wgStylePath.'/common/images/Arr_.png" width="12" height="12" />'; $r .= '<img src="'.$wgStylePath.'/common/images/Arr_.png" width="12" height="12" />';
$r .= '<tt>&nbsp; &nbsp; &nbsp; &nbsp;' ; $r .= '<tt>&nbsp; &nbsp; &nbsp; &nbsp;' ;
if ( $rc_new ) { $r .= $this->recentChangesFlags( $rc_new, $rc_minor, $rcObj->unpatrolled );
$r .= '<span class="newpage">' . htmlspecialchars( $N ) . '</span>';
} else {
$r .= '&nbsp;' ;
}
if ( $rc_minor ) {
$r .= '<span class="minoredit">' . htmlspecialchars( $M ) . '</span>';
} else {
$r .= '&nbsp;' ;
}
if ( $rcObj->unpatrolled ) {
$r .= '<span class="unpatrolled">!</span>';
} else {
$r .= '&nbsp;';
}
$r .= '&nbsp;</tt>' ; $r .= '&nbsp;</tt>' ;
$o = '' ; $o = '' ;
@ -376,9 +342,7 @@ class ChangesList {
$s .= ') . . '; $s .= ') . . ';
# M, N and ! (minor, new and unpatrolled) # M, N and ! (minor, new and unpatrolled)
if ( $rc_minor ) { $s .= ' <span class="minor">'.htmlspecialchars( $message["minoreditletter"] ).'</span>'; } $s .= ' ' . $this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $unpatrolled, '' );
if ( $rc_type == RC_NEW ) { $s .= '<span class="newpage">'.htmlspecialchars( $message["newpageletter"] ).'</span>'; }
if ( $unpatrolled ) { $s .= ' <span class="unpatrolled">!</span>'; }
# Article link # Article link
# If it's a new article, there is no diff link, but if it hasn't been # If it's a new article, there is no diff link, but if it hasn't been