Commit e27460d5 authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review
Browse files

Merge "Details link in 'files to download' is inconsistent (bug 633658)"

parents 8ec40dfd f14447c4
......@@ -62,7 +62,7 @@ class PluginBlocktypeFiledownload extends PluginBlocktype {
else if ($artefact instanceof ArtefactTypeFile) {
$file['downloadurl'] .= 'artefact/file/download.php?file=' . $artefactid . '&view=' . $viewid;
}
$file['is_image'] = ($artefact instanceof ArtefactTypeImage) ? true : false;
$files[] = $file;
}
}
......
......@@ -5,7 +5,7 @@
<h3 class="title"><a href="{$file.downloadurl}" target="_blank">{$file.title}</a></h3>
{if $file.description}<p>{$file.description}</p>{/if}
<div class="description">{$file.size|display_size} | {$file.ctime|format_date:'strftimedaydate'}
| <a href="{$WWWROOT}view/artefact.php?artefact={$file.id}&view={$viewid}">{str tag=Details section=artefact.file}</a></div>
| <a href="{$WWWROOT}view/artefact.php?artefact={$file.id}&view={$viewid}">{if $file.is_image}{str tag=View section=artefact.file}{else}{str tag=Details section=artefact.file}{/if}</a></div>
</div>
</div>
{/foreach}
......@@ -67,6 +67,7 @@ $string['deletefolder?'] = 'Are you sure you want to delete this folder?';
$string['Description'] = 'Description';
$string['destination'] = 'Destination';
$string['Details'] = 'Details';
$string['View'] = 'View';
$string['Download'] = 'Download';
$string['downloadfile'] = 'Download %s';
$string['downloadoriginalversion'] = 'Download the original version';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment