[Pkg-owncloud-commits] [owncloud] 53/145: adjust file type icon placement for when no preview can be generated
David Prévot
taffit at moszumanska.debian.org
Wed Feb 26 16:27:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 0f97d9555c4c4fd970179c7c8491445ec0ae3520
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date: Wed Feb 5 11:37:23 2014 +0100
adjust file type icon placement for when no preview can be generated
---
apps/files_sharing/css/mobile.css | 6 +++++-
apps/files_sharing/css/public.css | 5 +++++
apps/files_sharing/templates/public.php | 3 ++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/apps/files_sharing/css/mobile.css b/apps/files_sharing/css/mobile.css
index 8310fb8..3312983 100644
--- a/apps/files_sharing/css/mobile.css
+++ b/apps/files_sharing/css/mobile.css
@@ -20,6 +20,10 @@ table td.filename .nametext {
padding: 0;
margin-bottom: 35px;
}
+/* some margin for the file type icon */
+#imgframe .publicpreview {
+ margin-top: 32px;
+}
/* always show actions on mobile */
#fileList a.action {
@@ -38,4 +42,4 @@ table td.filename .nametext {
}
-}
\ No newline at end of file
+}
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 4851f93..5f1cc52 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -71,6 +71,11 @@ p.info a {
max-width:100%;
}
+/* some margin for the file type icon */
+#imgframe .publicpreview {
+ margin-top: 10%;
+}
+
thead {
padding-left: 0 !important; /* fixes multiselect bar offset on shared page */
}
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 652cd74..1888b76 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -34,7 +34,8 @@
</div>
<?php else: ?>
<div id="imgframe">
- <img src="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => 500, 'y' => 500, 'file' => urlencode($_['directory_path']), 't' => $_['dirToken']))); ?>" class="publicpreview"/>
+ <?php $size = \OC\Preview::isMimeSupported($_['mimetype']) ? 500 : 128 ?>
+ <img src="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => $size, 'y' => $size, 'file' => urlencode($_['directory_path']), 't' => $_['dirToken']))); ?>" class="publicpreview"/>
</div>
<?php endif; ?>
<div class="directDownload">
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list