Commit 2108a457 authored by lindonb's avatar lindonb

iconset conversion for icons representing nonimage files in file galleries browse and upload pages

parent 72542c81
......@@ -175,10 +175,15 @@
{/if}
</a>
{else}
{if $key_type eq 'image/png' or $key_type eq 'image/jpeg'
or $key_type eq 'image/jpg' or $key_type eq 'image/gif'}
{$imagetypes = 'y'}
{else}
{$imagetypes = 'n'}
{/if}
<a {$link}
{if $prefs.feature_shadowbox eq 'y' && empty($filegals_manager)}
{if $key_type eq 'image/png' or $key_type eq 'image/jpeg'
or $key_type eq 'image/jpg' or $key_type eq 'image/gif'}
{if $imagetypes eq 'y' }
rel="box[g]"
{elseif $key_type eq 'text/html'}
rel="shadowbox[gallery];type=iframe"
......@@ -192,10 +197,14 @@
title="{if $files[changes].name neq ''}{$files[changes].name|escape}{/if}{if $files[changes].description neq ''}{$files[changes].description|escape}{/if}"
{/if}>
{if $key_type neq 'image/svg' and $key_type neq 'image/svg+xml'}
{if $view eq 'page'}
<img src="tiki-download_file.php?fileId={$files[changes].id}&preview" alt="" style="max-width:{$maxWidth}">
{if $imagetypes eq 'y' or $prefs.theme_iconset eq 'legacy'}
{if $view eq 'page'}
<img src="tiki-download_file.php?fileId={$files[changes].id}&preview" alt="" style="max-width:{$maxWidth}">
{else}
<img src="{$files[changes].id|sefurl:thumbnail}" alt="" style="max-height:{$thumbnailcontener_size}px">
{/if}
{else}
<img src="{$files[changes].id|sefurl:thumbnail}" alt="" style="max-height:{$thumbnailcontener_size}px">
{$files[changes].filename|iconify:$key_type:null:3}
{/if}
{else}
<object data="{$files[changes].id|sefurl:thumbnail}" alt="" style="width:{$thumbnail_size}px;height:{$thumbnailcontener_size}px;" type="{$key_type}"></object>
......@@ -293,7 +302,7 @@
</div>
<br clear="all">
<div>
{include file='tiki-upload_file_progress.tpl' fileId=$files[changes].id name=$files[changes].filename}
{include file='tiki-upload_file_progress.tpl' fileId=$files[changes].id name=$files[changes].filename filetype=$key_type}
</div>
{if isset($metarray) and $metarray|count gt 0}
<br>
......
......@@ -11,12 +11,22 @@
{/if}
<table border="0" cellspacing="4" cellpadding="4">
<tr>
{if $key_type eq 'image/png' or $key_type eq 'image/jpeg'
or $key_type eq 'image/jpg' or $key_type eq 'image/gif'}
{$imagetypes = 'y'}
{else}
{$imagetypes = 'n'}
{/if}
{if $view neq 'page'}
<td style="text-align: center">
{if !empty($filegals_manager)}
<a {$alink}><img src="{$fileId|sefurl:thumbnail}"><br><span class="thumbcaption">{tr}Click here to use the file{/tr}</span></a>
{if $imagetypes eq 'y' or $prefs.theme_iconset eq 'legacy'}
{if !empty($filegals_manager)}
<a {$alink}><img src="{$fileId|sefurl:thumbnail}"><br><span class="thumbcaption">{tr}Click here to use the file{/tr}</span></a>
{else}
<img src="{$fileId|sefurl:thumbnail}">
{/if}
{else}
<img src="{$fileId|sefurl:thumbnail}">
{$name|iconify:$key_type:null:3}
{/if}
</td>
<td>
......
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