From 2a4fd352ffc5edcb69b294cb844378588c31159f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Sat, 5 May 2007 20:09:52 +0000
Subject: [PATCH] * Made a Imagelist a bit narrower, still too wide

---
 includes/SpecialImagelist.php     | 16 +++++-----------
 languages/messages/MessagesEn.php |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/includes/SpecialImagelist.php b/includes/SpecialImagelist.php
index 92b9ae1161..59fc78f50e 100644
--- a/includes/SpecialImagelist.php
+++ b/includes/SpecialImagelist.php
@@ -57,7 +57,6 @@ class ImageListPager extends TablePager {
 	function getFieldNames() {
 		if ( !$this->mFieldNames ) {
 			$this->mFieldNames = array(
-				'links' => '',
 				'img_timestamp' => wfMsg( 'imagelist_date' ),
 				'img_name' => wfMsg( 'imagelist_name' ),
 				'img_user_text' => wfMsg( 'imagelist_user' ),
@@ -75,7 +74,6 @@ class ImageListPager extends TablePager {
 
 	function getQueryInfo() {
 		$fields = $this->getFieldNames();
-		unset( $fields['links'] );
 		$fields = array_keys( $fields );
 		$fields[] = 'img_user';
 		return array(
@@ -112,17 +110,13 @@ class ImageListPager extends TablePager {
 	function formatValue( $field, $value ) {
 		global $wgLang;
 		switch ( $field ) {
-			case 'links':
-				$name = $this->mCurrentRow->img_name;
-				$ilink = "<a href=\"" . htmlspecialchars( Image::imageUrl( $name ) ) .
-				  "\">" . $this->mMessages['imgfile'] . "</a>";
-				$desc = $this->getSkin()->makeKnownLinkObj( Title::makeTitle( NS_IMAGE, $name ),
-					$this->mMessages['imgdesc'] );
-				return "$desc | $ilink";
 			case 'img_timestamp':
 				return $wgLang->timeanddate( $value, true );
 			case 'img_name':
-				return htmlspecialchars( $value );
+				$name = $this->mCurrentRow->img_name;
+				$link = $this->getSkin()->makeKnownLinkObj( Title::makeTitle( NS_IMAGE, $name ), $value );
+				$download = Xml::element('a', array( "href" => Image::imageUrl( $name ) ), $this->mMessages['imgfile'] );
+				return "$link ($download)";
 			case 'img_user_text':
 				if ( $this->mCurrentRow->img_user ) {
 					$link = $this->getSkin()->makeLinkObj( Title::makeTitle( NS_USER, $value ), 
@@ -132,7 +126,7 @@ class ImageListPager extends TablePager {
 				}
 				return $link;
 			case 'img_size':
-				return $wgLang->formatNum( $value );
+				return $this->getSkin()->formatSize( $value );
 			case 'img_description':
 				return $this->getSkin()->commentBlock( $value );
 		}
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c774fa2ec5..5f555236f0 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1463,7 +1463,7 @@ this old version, (rev) = revert to this old version.
 'imagelist_date' => 'Date',
 'imagelist_name' => 'Name',
 'imagelist_user' => 'User',
-'imagelist_size' => 'Size (bytes)',
+'imagelist_size' => 'Size',
 'imagelist_description' => 'Description',
 'imagelist_search_for' => 'Search for image name:',
 
-- 
2.20.1