}
function view() {
- global $wgUseExternalEditor, $wgOut, $wgShowEXIF;
+ global $wgOut, $wgShowEXIF;
$this->img = new Image( $this->mTitle );
$wgOut->addHTML($this->showTOC($showmeta));
$this->openShowImage();
- if ($exif)
- $wgOut->addWikiText($this->makeMetadataTable($exif));
# No need to display noarticletext, we use our own message, output in openShowImage()
if( $this->getID() ) {
$this->closeShowImage();
$this->imageHistory();
$this->imageLinks();
+ if( $exif ) {
+ global $wgStylePath;
+ $expand = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-expand' ) ) );
+ $collapse = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-collapse' ) ) );
+ $wgOut->addHTML( "<h2 id=\"metadata\">" . wfMsgHtml( 'metadata' ) . "</h2>\n" );
+ $wgOut->addWikiText( $this->makeMetadataTable( $exif ) );
+ $wgOut->addHTML(
+ "<script type=\"text/javascript\" src=\"$wgStylePath/common/metadata.js\"></script>\n" .
+ "<script type=\"text/javascript\">attachMetadataToggle('mw_metadata', '$expand', '$collapse');</script>\n" );
+ }
} else {
Article::view();
}
function showTOC( $metadata ) {
global $wgLang;
$r = '<ul id="filetoc">
- <li><a href="#file">' . $wgLang->getNsText( NS_IMAGE ) . '</a></li>' .
- ($metadata ? '<li><a href="#metadata">' . wfMsgHtml( 'metadata' ) . '</a></li>' : '') . '
+ <li><a href="#file">' . $wgLang->getNsText( NS_IMAGE ) . '</a></li>
<li><a href="#filehistory">' . wfMsgHtml( 'imghistory' ) . '</a></li>
- <li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . '</a></li>
+ <li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . '</a></li>' .
+ ($metadata ? '<li><a href="#metadata">' . wfMsgHtml( 'metadata' ) . '</a></li>' : '') . '
</ul>';
return $r;
}
* @return string
*/
function makeMetadataTable( $exif ) {
- $r = "{| class=metadata align=right width=250px\n";
- $r .= '|+ id=metadata | '. htmlspecialchars( wfMsgHtml( 'metadata' ) ) . "\n";
+ $r = wfMsg( 'metadata-help' ) . "\n\n";
+ $r .= "{| id=mw_metadata class=mw_metadata\n";
+ $visibleFields = $this->visibleMetadataFields();
foreach( $exif as $k => $v ) {
$tag = strtolower( $k );
- $r .= "! class=$tag |" . wfMsg( "exif-$tag" ) . "\n";
- $r .= "| class=$tag |" . htmlspecialchars( $v ) . "\n";
- $r .= "|-\n";
+ $msg = wfMsg( "exif-$tag" );
+ $class = "exif-$tag";
+ if( !in_array( $tag, $visibleFields ) ) {
+ $class .= ' collapsable';
+ }
+ $r .= "|- class=\"$class\"\n";
+ $r .= "!| $msg\n";
+ $r .= "|| $v\n";
}
- return substr($r, 0, -3) . '|}';
+ $r .= '|}';
+ return $r;
+ }
+
+ /**
+ * Get a list of EXIF metadata items which should be displayed when
+ * the metadata table is collapsed.
+ *
+ * @return array of strings
+ * @access private
+ */
+ function visibleMetadataFields() {
+ $fields = array();
+ $lines = explode( "\n", wfMsgForContent( 'metadata-fields' ) );
+ foreach( $lines as $line ) {
+ if( preg_match( '/^\\*\s*(.*?)\s*$/', $line, $matches ) ) {
+ $fields[] = $matches[1];
+ }
+ }
+ return $fields;
}
/**
return Article::getContent( $noredir );
}
- function openShowImage()
- {
- global $wgOut, $wgUser, $wgImageLimits, $wgRequest,
- $wgUseImageResize, $wgRepositoryBaseUrl,
- $wgUseExternalEditor, $wgServer, $wgFetchCommonsDescriptions;
- $full_url = $this->img->getViewURL();
+ function openShowImage() {
+ global $wgOut, $wgUser, $wgImageLimits, $wgRequest, $wgUseImageResize;
+
+ $full_url = $this->img->getURL();
$anchoropen = '';
$anchorclose = '';
# "Download high res version" link below the image
$msg = wfMsgHtml('showbigimage', $width, $height, intval( $this->img->getSize()/1024 ) );
- if ( $width > $maxWidth ) {
- $height = floor( $height * $maxWidth / $width );
- $width = $maxWidth;
- }
- if ( $height > $maxHeight ) {
- $width = floor( $width * $maxHeight / $height );
- $height = $maxHeight;
- }
- if ( !$this->img->mustRender()
- && ( $width != $this->img->getWidth() || $height != $this->img->getHeight() ) ) {
+
+ # We'll show a thumbnail of this image
+ if ( $width > $maxWidth || $height > $maxHeight ) {
+ # Calculate the thumbnail size.
+ # First case, the limiting factor is the width, not the height.
+ if ( $width / $height >= $maxWidth / $maxHeight ) {
+ $height = round( $height * $maxWidth / $width);
+ $width = $maxWidth;
+ # Note that $height <= $maxHeight now.
+ } else {
+ $newwidth = floor( $width * $maxHeight / $height);
+ $height = round( $height * $newwidth / $width );
+ $width = $newwidth;
+ # Note that $height <= $maxHeight now, but might not be identical
+ # because of rounding.
+ }
+
if( $wgUseImageResize ) {
$thumbnail = $this->img->getThumbnail( $width );
if ( $thumbnail == null ) {
- $url = $full_url;
+ $url = $this->img->getViewURL();
} else {
- $url = $thumbnail->getUrl();
+ $url = $thumbnail->getURL();
}
} else {
# No resize ability? Show the full image, but scale
# it down in the browser so it fits on the page.
- $url = $full_url;
+ $url = $this->img->getViewURL();
}
$anchoropen = "<a href=\"{$full_url}\">";
- $anchorclose = "</a><br />\n$anchoropen{$msg}</a>";
+ $anchorclose = "</a><br />";
+ if( $this->img->mustRender() ) {
+ $showLink = true;
+ } else {
+ $anchorclose .= "\n$anchoropen{$msg}</a>";
+ }
} else {
- $url = $full_url;
- $showLink = $this->img->mustRender();
+ $url = $this->img->getViewURL();
+ $showLink = true;
}
$wgOut->addHTML( '<div class="fullImageLink" id="file">' . $anchoropen .
"<img border=\"0\" src=\"{$url}\" width=\"{$width}\" height=\"{$height}\" alt=\"" .
$icon->toHtml() .
'</a></div>' );
}
-
+
$showLink = true;
}
$info = wfMsg( 'fileinfo',
ceil($this->img->getSize()/1024.0),
$this->img->getMimeType() );
-
+
if (!$this->img->isSafeFile()) {
$warning = wfMsg( 'mediawarning' );
$wgOut->addWikiText( <<<END
global $wgRepositoryBaseUrl, $wgFetchCommonsDescriptions, $wgOut, $wgUser;
$url = $wgRepositoryBaseUrl . urlencode($this->mTitle->getDBkey());
- $sharedtext = "<div class='sharedUploadNotice'>" . wfMsg("sharedupload");
+ $sharedtext = "<div class='sharedUploadNotice'>" . wfMsgWikiHtml("sharedupload");
if ($wgRepositoryBaseUrl && !$wgFetchCommonsDescriptions) {
$sk = $wgUser->getSkin();
$title = Title::makeTitle( NS_SPECIAL, 'Upload' );
$link = $sk->makeKnownLinkObj($title, wfMsgHtml('shareduploadwiki-linktext'),
array( 'wpDestFile' => urlencode( $this->img->getName() )));
- $sharedtext .= " " . wfMsgHtml('shareduploadwiki', $link);
+ $sharedtext .= " " . wfMsgWikiHtml('shareduploadwiki', $link);
}
$sharedtext .= "</div>";
$wgOut->addHTML($sharedtext);
return;
$sk = $wgUser->getSkin();
- $wgOut->addHTML( '<br /><ul><li>' );
- $wgOut->addWikiText( '<div>'. wfMsg( 'uploadnewversion', $this->getUploadUrl() ) .'</div>' );
- $wgOut->addHTML( '</li><li>' );
+ $wgOut->addHTML( '<br /><ul>' );
+ if( $wgUser->isAllowed( 'reupload' ) ) {
+ $wgOut->addWikiText( "<li>\n<div>". wfMsg( 'uploadnewversion', $this->getUploadUrl() ) ."</div>\n</li>\n" );
+ }
+ $wgOut->addHTML( '<li>' );
$wgOut->addHTML( $sk->makeKnownLinkObj( $this->mTitle,
wfMsg( 'edit-externally' ), "action=edit&externaledit=true&mode=file" ) );
$wgOut->addWikiText( '<div>' . wfMsg('edit-externally-help') . '</div>' );
$s = $list->beginImageHistoryList() .
$list->imageHistoryLine( true, wfTimestamp(TS_MW, $line->img_timestamp),
$this->mTitle->getDBkey(), $line->img_user,
- $line->img_user_text, $line->img_size, $line->img_description );
+ $line->img_user_text, $line->img_size, $line->img_description,
+ $line->img_width, $line->img_height
+ );
while ( $line = $this->img->nextHistoryLine() ) {
$s .= $list->imageHistoryLine( false, $line->img_timestamp,
- $line->oi_archive_name, $line->img_user,
- $line->img_user_text, $line->img_size, $line->img_description );
+ $line->oi_archive_name, $line->img_user,
+ $line->img_user_text, $line->img_size, $line->img_description,
+ $line->img_width, $line->img_height
+ );
}
$s .= $list->endImageHistoryList();
} else { $s=''; }
{
global $wgUser, $wgOut, $wgRequest;
- $confirm = $wgRequest->getBool( 'wpConfirmB' );
+ $confirm = $wgRequest->wasPosted();
$image = $wgRequest->getVal( 'image' );
$oldimage = $wgRequest->getVal( 'oldimage' );
return $this->confirmDelete( $q, $wgRequest->getText( 'wpReason' ) );
}
- function doDelete()
- {
- global $wgOut, $wgUser, $wgContLang, $wgRequest;
- global $wgUseSquid, $wgInternalServer, $wgPostCommitUpdateList;
+ function doDelete() {
+ global $wgOut, $wgUser, $wgRequest, $wgUseSquid, $wgInternalServer;
+ global $wgPostCommitUpdateList;
+
$fname = 'ImagePage::doDelete';
$reason = $wgRequest->getVal( 'wpReason' );
}
}
- function revert()
- {
- global $wgOut, $wgRequest, $wgUser;
- global $wgUseSquid, $wgInternalServer, $wgDeferredUpdateList;
+ function revert() {
+ global $wgOut, $wgRequest, $wgUser, $wgUseSquid, $wgInternalServer;
$oldimage = $wgRequest->getText( 'oldimage' );
if ( strlen( $oldimage ) < 16 ) {
return $s;
}
- function imageHistoryLine( $iscur, $timestamp, $img, $user, $usertext, $size, $description ) {
- global $wgUser, $wgLang, $wgContLang, $wgTitle;
+ function imageHistoryLine( $iscur, $timestamp, $img, $user, $usertext, $size, $description, $width, $height ) {
+ global $wgUser, $wgLang, $wgTitle;
$datetime = $wgLang->timeanddate( $timestamp, true );
$del = wfMsg( 'deleteimg' );
$usertext );
}
$nbytes = wfMsg( 'nbytes', $size );
+ $widthheight = wfMsg( 'widthheight', $width, $height );
$style = $this->skin->getInternalLinkAttributes( $url, $datetime );
- $s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a>"
- . " . . {$userlink} ({$nbytes})";
+ $s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a> . . {$userlink} . . {$widthheight} ({$nbytes})";
$s .= $this->skin->commentBlock( $description, $wgTitle );
$s .= "</li>\n";
dépôts / lhc / web / wiklou.git / blobdiff