From 428485b579820c4677d78e17378838be5249bb8d Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Mon, 30 Jul 2007 21:09:31 +0000 Subject: [PATCH] * Prettifying file history table a bit. Especially for histories with long comments/descriptions it look clearer now. --- includes/DefaultSettings.php | 2 +- includes/ImagePage.php | 20 ++++++++++---------- skins/common/shared.css | 13 ++++++++++++- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index e764937b6a..d4b0b5ce2b 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1195,7 +1195,7 @@ $wgCacheEpoch = '20030516000000'; * to ensure that client-side caches don't keep obsolete copies of global * styles. */ -$wgStyleVersion = '93'; +$wgStyleVersion = '94'; # Server-side caching: diff --git a/includes/ImagePage.php b/includes/ImagePage.php index f95d26bd95..a6b33cd6cf 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -673,7 +673,7 @@ class ImageHistoryList { . '' . wfMsgHtml( 'filehist-datetime' ) . '' . '' . wfMsgHtml( 'filehist-user' ) . '' . '' . wfMsgHtml( 'filehist-dimensions' ) . '' - . '' . wfMsgHtml( 'filehist-filesize' ) . '' + . '' . wfMsgHtml( 'filehist-filesize' ) . '' . '' . wfMsgHtml( 'filehist-comment' ) . '' . "\n"; } @@ -686,7 +686,7 @@ class ImageHistoryList { global $wgUser, $wgLang, $wgTitle, $wgContLang; $local = $this->img->isLocal(); $row = ''; - + // Deletion link if( $local && $wgUser->isAllowed( 'delete' ) ) { $row .= ''; @@ -702,7 +702,7 @@ class ImageHistoryList { ) . ')'; $row .= ''; } - + // Reversion link/current indicator $row .= ''; if( $iscur ) { @@ -719,7 +719,7 @@ class ImageHistoryList { ) . ')'; } $row .= ''; - + // Date/time and image link $row .= ''; $url = $iscur ? $this->img->getUrl() : $this->img->getArchiveUrl( $img ); @@ -729,7 +729,7 @@ class ImageHistoryList { $wgLang->timeAndDate( $timestamp, true ) ); $row .= ''; - + // Uploading user $row .= ''; if( $local ) { @@ -738,19 +738,19 @@ class ImageHistoryList { $row .= htmlspecialchars( $usertext ); } $row .= ''; - + // Image dimensions // FIXME: It would be nice to show the duration (sound files) or // width/height/duration (video files) here, but this needs some // additional media handler work $row .= '' . wfMsgHtml( 'widthheight', $width, $height ) . ''; - + // File size - $row .= '' . $this->skin->formatSize( $size ) . ''; - + $row .= '' . $this->skin->formatSize( $size ) . ''; + // Comment $row .= '' . $this->skin->formatComment( $description, $this->title ) . ''; - + return "{$row}\n"; } diff --git a/skins/common/shared.css b/skins/common/shared.css index f03524bc35..6af03dba9f 100644 --- a/skins/common/shared.css +++ b/skins/common/shared.css @@ -31,10 +31,21 @@ div#mw-js-message { /** * File histories */ +table.filehistory { + border:1px solid #ccc; + border-collapse:collapse; +} + table.filehistory th, table.filehistory td { padding: 0 0.2em 0 0.2em; + vertical-align:top; + border:1px solid #ccc; } table.filehistory th { text-align: left; -} \ No newline at end of file +} +table.filehistory td.mw-imagepage-filesize, +table.filehistory th.mw-imagepage-filesize { + white-space:nowrap; +} -- 2.20.1