\n";
@@ -314,7 +314,7 @@ class CategoryViewer {
$rescnt = count( $this->articles );
$countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'article' );
- if( $rescnt > 0 ) {
+ if ( $rescnt > 0 ) {
$r = "
\n";
$r .= '
' . wfMsg( 'category_header', $ti ) . "
\n";
$r .= $countmsg;
@@ -325,7 +325,7 @@ class CategoryViewer {
}
function getImageSection() {
- if( $this->showGallery && ! $this->gallery->isEmpty() ) {
+ if ( $this->showGallery && ! $this->gallery->isEmpty() ) {
$dbcnt = $this->cat->getFileCount();
$rescnt = $this->gallery->count();
$countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'file' );
@@ -339,9 +339,9 @@ class CategoryViewer {
}
function getCategoryBottom() {
- if( $this->until != '' ) {
+ if ( $this->until != '' ) {
return $this->pagingLinks( $this->title, $this->nextPage, $this->until, $this->limit );
- } elseif( $this->nextPage != '' || $this->from != '' ) {
+ } elseif ( $this->nextPage != '' || $this->from != '' ) {
return $this->pagingLinks( $this->title, $this->from, $this->nextPage, $this->limit );
} else {
return '';
@@ -361,7 +361,7 @@ class CategoryViewer {
function formatList( $articles, $articles_start_char, $cutoff = 6 ) {
if ( count ( $articles ) > $cutoff ) {
return $this->columnList( $articles, $articles_start_char );
- } elseif ( count($articles) > 0) {
+ } elseif ( count( $articles ) > 0 ) {
// for short lists of articles in categories.
return $this->shortList( $articles, $articles_start_char );
}
@@ -372,62 +372,60 @@ class CategoryViewer {
* Format a list of articles chunked by letter in a three-column
* list, ordered vertically.
*
+ * TODO: Take the headers into account when creating columns, so they're
+ * more visually equal.
+ *
+ * More distant TODO: Scrap this and use CSS columns, whenever IE finally
+ * supports those.
+ *
* @param $articles Array
* @param $articles_start_char Array
* @return String
* @private
*/
function columnList( $articles, $articles_start_char ) {
- // divide list into three equal chunks
- $chunk = (int) ( count( $articles ) / 3 );
- $remaining = count( $articles ) % 3;
+ $columns = array_combine( $articles, $articles_start_char );
+ # Split into three columns
+ $columns = array_chunk( $columns, ceil( count( $columns ) / 3 ), true /* preserve keys */ );
- // get and display header
- $r = '
';
+ $ret = '| ';
+ $prevchar = null;
- $prev_start_char = 'none';
+ foreach ( $columns as $column ) {
+ $colContents = array();
- // loop through the chunks
- for( $startChunk = 0, $endChunk = $chunk, $chunkIndex = 0;
- $chunkIndex < 3;
- $chunkIndex++, $startChunk = $endChunk, $endChunk += $remaining == 0 ? $chunk : $chunk + 1 )
- {
- $r .= " | \n";
- $atColumnTop = true;
+ # Kind of like array_flip() here, but we keep duplicates in an
+ # array instead of dropping them.
+ foreach ( $column as $article => $char ) {
+ if ( !isset( $colContents[$char] ) ) {
+ $colContents[$char] = array();
+ }
+ $colContents[$char][] = $article;
+ }
- // output all articles in category
- for ($index = $startChunk ;
- $index < $endChunk && $index < count($articles);
- $index++ )
- {
- // check for change of starting letter or beginning of chunk
- if ( ($index == $startChunk) ||
- ($articles_start_char[$index] != $articles_start_char[$index - 1]) )
-
- {
- if( $atColumnTop ) {
- $atColumnTop = false;
- } else {
- $r .= "\n";
- }
- $cont_msg = "";
- if ( $articles_start_char[$index] == $prev_start_char )
- $cont_msg = ' ' . wfMsgHtml( 'listingcontinuesabbrev' );
- $r .= "" . htmlspecialchars( $articles_start_char[$index] ) . "$cont_msg\n";
- $prev_start_char = $articles_start_char[$index];
+ $first = true;
+ foreach ( $colContents as $char => $articles ) {
+ $ret .= '' . htmlspecialchars( $char );
+ if ( $first && $char === $prevchar ) {
+ # We're continuing a previous chunk at the top of a new
+ # column, so add " cont." after the letter.
+ $ret .= ' ' . wfMsgHtml( 'listingcontinuesabbrev' );
}
+ $ret .= "\n";
- $r .= "- {$articles[$index]}
";
- }
- if( !$atColumnTop ) {
- $r .= " \n";
- }
- $r .= " | \n";
+ $ret .= '- ';
+ $ret .= implode( "
\n- ", $articles );
+ $ret .= '
';
+ $first = false;
+ $prevchar = $char;
+ }
+ $ret .= "\n";
}
- $r .= ' |
';
- return $r;
+
+ $ret .= '
';
+ return $ret;
}
/**
@@ -439,10 +437,10 @@ class CategoryViewer {
*/
function shortList( $articles, $articles_start_char ) {
$r = '
' . htmlspecialchars( $articles_start_char[0] ) . "
\n";
- $r .= '
- '.$articles[0].'
';
- for ($index = 1; $index < count($articles); $index++ )
+ $r .= '- ' . $articles[0] . '
';
+ for ( $index = 1; $index < count( $articles ); $index++ )
{
- if ($articles_start_char[$index] != $articles_start_char[$index - 1])
+ if ( $articles_start_char[$index] != $articles_start_char[$index - 1] )
{
$r .= "
" . htmlspecialchars( $articles_start_char[$index] ) . "
\n";
}
@@ -468,7 +466,8 @@ class CategoryViewer {
$limitText = $wgLang->formatNum( $limit );
$prevLink = wfMsgExt( 'prevn', array( 'escape', 'parsemag' ), $limitText );
- if( $first != '' ) {
+
+ if ( $first != '' ) {
$prevQuery = $query;
$prevQuery['until'] = $first;
$prevLink = $sk->linkKnown(
@@ -478,8 +477,10 @@ class CategoryViewer {
$prevQuery
);
}
+
$nextLink = wfMsgExt( 'nextn', array( 'escape', 'parsemag' ), $limitText );
- if( $last != '' ) {
+
+ if ( $last != '' ) {
$lastQuery = $query;
$lastQuery['from'] = $last;
$nextLink = $sk->linkKnown(
@@ -520,12 +521,14 @@ class CategoryViewer {
# know the right figure.
# 3) We have no idea.
$totalrescnt = count( $this->articles ) + count( $this->children ) +
- ($this->showGallery ? $this->gallery->count() : 0);
- if($dbcnt == $rescnt || (($totalrescnt == $this->limit || $this->from
- || $this->until) && $dbcnt > $rescnt)){
+ ( $this->showGallery ? $this->gallery->count() : 0 );
+
+ if ( $dbcnt == $rescnt || ( ( $totalrescnt == $this->limit || $this->from
+ || $this->until ) && $dbcnt > $rescnt ) )
+ {
# Case 1: seems sane.
$totalcnt = $dbcnt;
- } elseif($totalrescnt < $this->limit && !$this->from && !$this->until){
+ } elseif ( $totalrescnt < $this->limit && !$this->from && !$this->until ) {
# Case 2: not sane, but salvageable. Use the number of results.
# Since there are fewer than 200, we can also take this opportunity
# to refresh the incorrect category table entry -- which should be
@@ -534,10 +537,14 @@ class CategoryViewer {
$this->cat->refreshCounts();
} else {
# Case 3: hopeless. Don't give a total count at all.
- return wfMsgExt("category-$type-count-limited", 'parse',
+ return wfMsgExt( "category-$type-count-limited", 'parse',
$wgLang->formatNum( $rescnt ) );
}
- return wfMsgExt( "category-$type-count", 'parse', $wgLang->formatNum( $rescnt ),
- $wgLang->formatNum( $totalcnt ) );
+ return wfMsgExt(
+ "category-$type-count",
+ 'parse',
+ $wgLang->formatNum( $rescnt ),
+ $wgLang->formatNum( $totalcnt )
+ );
}
}