Merge "Show full filenames"

htdocs/artefact/file/blocktype/filedownload/theme/raw/filedownload.tpl

@@ -2,7 +2,7 @@
 <div class="filedownload-item" title="{$file.title}">
   <div class="fl"><a href="{$file.downloadurl}" target="_blank"><img src="{$file.iconsrc}" alt=""></a></div>
   <div style="margin-left: 30px;">
-    <h3 class="title"><a href="{$file.downloadurl}" target="_blank">{$file.title|str_shorten_text:20}</a></h3>
+    <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>

htdocs/artefact/file/lib.php

@@ -1652,9 +1652,6 @@ class ArtefactTypeFolder extends ArtefactTypeFileBase {
             foreach ($childrecords as &$child) {
                 $c = artefact_instance_from_id($child->id);
                 $child->title = $child->hovertitle = $c->get('title');
-                if (!empty($options['simpledisplay'])) {
-                    $child->title = str_shorten_text($child->title, 20);
-                }
                 $child->date = format_date(strtotime($child->mtime), 'strfdaymonthyearshort');
                 $child->iconsrc = call_static_method(generate_artefact_class_name($child->artefacttype), 'get_icon', array('id' => $child->id, 'viewid' => isset($options['viewid']) ? $options['viewid'] : 0));
             }

htdocs/artefact/file/theme/raw/form/filelist.tpl

@@ -36,7 +36,7 @@
     {/if}
     </td>
     <td class="filename">
-    {assign var=displaytitle value=$file->title|str_shorten_text:34|safe}
+    {assign var=displaytitle value=$file->title|safe}
     {if $file->artefacttype == 'folder'}
       <a href="{$querybase|safe}folder={$file->id}{if $owner}&owner={$owner}{if $ownerid}&ownerid={$ownerid}{/if}{/if}" class="changefolder" title="{str tag=gotofolder section=artefact.file arg1=$displaytitle}">{if !$file->isparent}{$displaytitle}{/if}</a>
     {elseif !$publishable}