Commit f14447c4 authored by Robert Lyon's avatar Robert Lyon

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

to test - add both image and non image files to a 'files to download'
block.
On view page click on the 'details' link.
- Non image files go directly to a page showing meta information and
download link.

- Image files go to same page but show just the image + another
'details' link that takes you to the metadata page

Patch changes the initial link name from 'details' to 'view' for image
artefacts.

Change-Id: I6ca52cf5eecbc533948447133fb4f7e51de4c9c3
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 8689321f
...@@ -62,7 +62,7 @@ class PluginBlocktypeFiledownload extends PluginBlocktype { ...@@ -62,7 +62,7 @@ class PluginBlocktypeFiledownload extends PluginBlocktype {
else if ($artefact instanceof ArtefactTypeFile) { else if ($artefact instanceof ArtefactTypeFile) {
$file['downloadurl'] .= 'artefact/file/download.php?file=' . $artefactid . '&view=' . $viewid; $file['downloadurl'] .= 'artefact/file/download.php?file=' . $artefactid . '&view=' . $viewid;
} }
$file['is_image'] = ($artefact instanceof ArtefactTypeImage) ? true : false;
$files[] = $file; $files[] = $file;
} }
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<h3 class="title"><a href="{$file.downloadurl}" target="_blank">{$file.title}</a></h3> <h3 class="title"><a href="{$file.downloadurl}" target="_blank">{$file.title}</a></h3>
{if $file.description}<p>{$file.description}</p>{/if} {if $file.description}<p>{$file.description}</p>{/if}
<div class="description">{$file.size|display_size} | {$file.ctime|format_date:'strftimedaydate'} <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>
</div> </div>
{/foreach} {/foreach}
...@@ -67,6 +67,7 @@ $string['deletefolder?'] = 'Are you sure you want to delete this folder?'; ...@@ -67,6 +67,7 @@ $string['deletefolder?'] = 'Are you sure you want to delete this folder?';
$string['Description'] = 'Description'; $string['Description'] = 'Description';
$string['destination'] = 'Destination'; $string['destination'] = 'Destination';
$string['Details'] = 'Details'; $string['Details'] = 'Details';
$string['View'] = 'View';
$string['Download'] = 'Download'; $string['Download'] = 'Download';
$string['downloadfile'] = 'Download %s'; $string['downloadfile'] = 'Download %s';
$string['downloadoriginalversion'] = 'Download the original version'; $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