diff options
| author | Bartek Przybylski <bart.p.pl@gmail.com> | 2012-06-05 18:32:42 +0200 |
|---|---|---|
| committer | Bartek Przybylski <bart.p.pl@gmail.com> | 2012-06-06 22:13:49 +0200 |
| commit | 671fe4980939841d15c642bad4957c223931aa1f (patch) | |
| tree | 57bdff2766692a3f0881d2c3cdbf28904cc09dc0 /apps | |
| parent | 76e7e361aef51badd048727db7ffc104e19e231a (diff) | |
| download | nextcloud-server-671fe4980939841d15c642bad4957c223931aa1f.tar.gz nextcloud-server-671fe4980939841d15c642bad4957c223931aa1f.zip | |
use fancybox to display image preview
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gallery/lib/tiles.php | 4 | ||||
| -rw-r--r-- | apps/gallery/templates/index.php | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php index 26ff3cbb9f8..c2d7fede786 100644 --- a/apps/gallery/lib/tiles.php +++ b/apps/gallery/lib/tiles.php @@ -96,7 +96,7 @@ class TileSingle extends TileBase { } public function get($extra = '') { - return '<img src="'.GET_THUMBNAIL_PATH.urlencode($this->getPath()).'" '.$extra.'>'; + return '<a rel="images" href="?app=files&getfile=download.php?file='.urlencode($this->getPath()).'"><img rel="images" src="'.GET_THUMBNAIL_PATH.urlencode($this->getPath()).'" '.$extra.'></a>'; } public function getMiniatureSrc() { @@ -108,7 +108,7 @@ class TileSingle extends TileBase { } public function getOnClickAction() { - return 'javascript:openFile(\''.$this->file_path.'\');'; + return '';//'javascript:openFile(\''.$this->file_path.'\');'; } private $file_path; diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php index d3b281a2c38..3dc722f0666 100644 --- a/apps/gallery/templates/index.php +++ b/apps/gallery/templates/index.php @@ -1,8 +1,4 @@ <?php -OCP\Util::addStyle('files', 'files'); -OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack'); -OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack'); -OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' ); $l = OC_L10N::get('gallery'); ?> @@ -15,7 +11,6 @@ div.gallery_div img.shrinker {width:80px !important;} div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; left:5px; height:auto; padding: 5px; width: 140px; background-color: black; color: white; -webkit-transition: opacity 0.5s; z-index:1000; border-radius: 7px} div.visible { opacity: 0.8;} </style> -<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script> <script type="text/javascript"> var root = "<?php echo !empty($_GET['root']) ? $_GET['root'] : '/'; ?>"; @@ -52,11 +47,11 @@ function openNewGal(album_name) { window.location = url; } -function openFile(file_path) { - var url = window.location.toString().replace(window.location.search, ''); - url = url + "?app=files&getfile=download.php?file="+file_path; - window.location = url; -} +$(document).ready(function() { + $("a[rel=images]").fancybox({ + 'titlePosition': 'inside' + }); +}); </script> |