X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCategoryPage.php;h=362fbde97d0c845c372c83180d8a1ebfd800d92c;hb=2f86970bd3625f2cd9f130827b1c947214a5d8cc;hp=a5bdc05dcb4388143e319a2085733b366d60656f;hpb=f2e0654b536a282c29d59b8b591c6f3a86a88371;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index a5bdc05dcb..362fbde97d 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -86,7 +86,7 @@ class CategoryViewer {
* @private
*/
function getHTML() {
- global $wgOut, $wgCategoryMagicGallery, $wgCategoryPagingLimit;
+ global $wgOut, $wgCategoryMagicGallery, $wgCategoryPagingLimit, $wgContLang;
wfProfileIn( __METHOD__ );
$this->showGallery = $wgCategoryMagicGallery && !$wgOut->mNoGallery;
@@ -95,11 +95,22 @@ class CategoryViewer {
$this->doCategoryQuery();
$this->finaliseCategoryState();
- $r = $this->getCategoryTop() .
- $this->getSubcategorySection() .
+ $r = $this->getSubcategorySection() .
$this->getPagesSection() .
- $this->getImageSection() .
- $this->getCategoryBottom();
+ $this->getImageSection();
+
+ if( $r == '' ) {
+ // If there is no category content to display, only
+ // show the top part of the navigation links.
+ // FIXME: cannot be completely suppressed because it
+ // is unknown if 'until' or 'from' makes this
+ // give 0 results.
+ $r = $r . $this->getCategoryTop();
+ } else {
+ $r = $this->getCategoryTop() .
+ $r .
+ $this->getCategoryBottom();
+ }
// Give a proper message if category is empty
if ( $r == '' ) {
@@ -107,7 +118,7 @@ class CategoryViewer {
}
wfProfileOut( __METHOD__ );
- return $r;
+ return $wgContLang->convert($r);
}
function clearCategoryState() {
@@ -142,10 +153,14 @@ class CategoryViewer {
* @deprecated kept for compatibility, please use addSubcategoryObject instead
*/
function addSubcategory( $title, $sortkey, $pageLength ) {
- global $wgContLang;
// Subcategory; strip the 'Category' namespace from the link text.
- $this->children[] = $this->getSkin()->makeKnownLinkObj(
- $title, $wgContLang->convertHtml( $title->getText() ) );
+ $this->children[] = $this->getSkin()->link(
+ $title,
+ null,
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ );
$this->children_start_char[] = $this->getSubcategorySortChar( $title, $sortkey );
}
@@ -189,10 +204,16 @@ class CategoryViewer {
*/
function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) {
global $wgContLang;
- $titletext = $wgContLang->convert($title);
$this->articles[] = $isRedirect
- ? '' . $this->getSkin()->makeKnownLinkObj( $title, $titletext ) . ''
- : $this->getSkin()->makeSizeLinkObj( $pageLength, $title, $titletext );
+ ? '' .
+ $this->getSkin()->link(
+ $title,
+ null,
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ ) . ''
+ : $this->getSkin()->makeSizeLinkObj( $pageLength, $title );
$this->articles_start_char[] = $wgContLang->convert( $wgContLang->firstChar( $sortkey ) );
}
@@ -206,7 +227,7 @@ class CategoryViewer {
}
function doCategoryQuery() {
- $dbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_SLAVE, 'category' );
if( $this->from != '' ) {
$pageCondition = 'cl_sortkey >= ' . $dbr->addQuotes( $this->from );
$this->flip = false;
@@ -251,17 +272,11 @@ class CategoryViewer {
$this->addPage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect );
}
}
- $dbr->freeResult( $res );
}
function getCategoryTop() {
- $r = '';
- if( $this->until != '' ) {
- $r .= $this->pagingLinks( $this->title, $this->nextPage, $this->until, $this->limit );
- } elseif( $this->nextPage != '' || $this->from != '' ) {
- $r .= $this->pagingLinks( $this->title, $this->from, $this->nextPage, $this->limit );
- }
- return $r == ''
+ $r = $this->getCategoryBottom();
+ return $r === ''
? $r
: "
\n" . $r;
}
@@ -355,61 +370,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);
+ $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 = '
'; + $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 += $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 begining 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
' . 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 .= " | \n";
+ $ret .= '"; } - $r .= ' |