diff options
author | Florian Pritz <bluewind@xinu.at> | 2015-03-02 12:14:58 +0100 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2015-03-02 12:14:58 +0100 |
commit | e9e9e635b337dc46111cdf95ccb16b7d28deb849 (patch) | |
tree | c69c6e12c48f71306cf54640b24b8c133f793090 /application/views/file | |
parent | ea8471781ee26f79c3835e68b31353601e78d0a8 (diff) |
Add imagemagick support
Adds additional support for imagemagick if GD doesn't support a file
type and extends the files displayed as thumbnails to all images and
pdf files.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/views/file')
-rw-r--r-- | application/views/file/fragments/thumbnail.php | 2 | ||||
-rw-r--r-- | application/views/file/upload_history_thumbnails.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/application/views/file/fragments/thumbnail.php b/application/views/file/fragments/thumbnail.php index 4bdf5be80..603832d44 100644 --- a/application/views/file/fragments/thumbnail.php +++ b/application/views/file/fragments/thumbnail.php @@ -4,7 +4,7 @@ <div class="container container-wide"> <div class="upload_thumbnails"><!-- <?php foreach($items as $key => $item): ?> - --><a rel="gallery" class="colorbox" data-orientation="<?php echo $item["orientation"]; ?>" href="<?php echo site_url("/".$item["id"])."/"; ?>" title="<?php echo htmlentities($item["filename"]); ?>" data-content="<?php echo htmlentities($item["tooltip"]); ?>" data-id="<?php echo $item["id"]; ?>"><img class="thumb lazyload" data-original="<?php echo site_url("file/thumbnail/".$item["id"]); ?>"><noscript><img class="thumb" src="<?php echo site_url("file/thumbnail/".$item["id"]); ?>"></noscript></a><!-- + --><a <?php if (strpos($item["mimetype"], "image/") === 0) {?>rel="gallery" class="colorbox"<?php } ?> data-orientation="<?php echo $item["orientation"]; ?>" href="<?php echo site_url("/".$item["id"])."/"; ?>" title="<?php echo htmlentities($item["filename"]); ?>" data-content="<?php echo htmlentities($item["tooltip"]); ?>" data-id="<?php echo $item["id"]; ?>"><img class="thumb lazyload" data-original="<?php echo site_url("file/thumbnail/".$item["id"]); ?>"><noscript><img class="thumb" src="<?php echo site_url("file/thumbnail/".$item["id"]); ?>"></noscript></a><!-- <?php endforeach; ?> --> </div> diff --git a/application/views/file/upload_history_thumbnails.php b/application/views/file/upload_history_thumbnails.php index a061d9676..53ac762c2 100644 --- a/application/views/file/upload_history_thumbnails.php +++ b/application/views/file/upload_history_thumbnails.php @@ -12,7 +12,7 @@ <div class="span12 alert alert-block alert-info"> <h4 class="alert-heading">Notice!</h4> <p> - Currently only jpeg, png and gif images are displayed here. If you are + Currently only images and pdf files are displayed here. If you are looking for something else, please switch to the <a href="<?php echo site_url("file/upload_history"); ?>">list view</a> which contains your complete history. |