implement use of previews in sharing app

remotes/origin/stable6
Georg Ehrke 12 years ago
parent 06eca985ce
commit 53830f2f75
  1. 1
      apps/files/index.php
  2. 9
      apps/files/templates/part.list.php
  3. 3
      apps/files_sharing/public.php
  4. 4
      lib/helper.php
  5. 10
      lib/public/template.php
  6. 4
      lib/template.php

@ -95,6 +95,7 @@ $list->assign('files', $files);
$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
$list->assign('disableSharing', false);
$list->assign('isPublic', false);
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');

@ -30,7 +30,14 @@ $totalsize = 0; ?>
<?php if($file['type'] == 'dir'): ?>
style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
<?php else: ?>
style="background-image:url(<?php print_unescaped(OCP\preview_icon($relativePath)); ?>)"
<?php if($_['isPublic']): ?>
<?php
$relativePath = substr($relativePath, strlen($_['sharingroot']));
?>
style="background-image:url(<?php print_unescaped(OCP\publicPreview_icon($relativePath, $_['sharingtoken'])); ?>)"
<?php else: ?>
style="background-image:url(<?php print_unescaped(OCP\preview_icon($relativePath)); ?>)"
<?php endif; ?>
<?php endif; ?>
>
<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>

@ -191,6 +191,9 @@ if (isset($path)) {
$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');
$list->assign('downloadURL',
OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=');
$list->assign('isPublic', true);
$list->assign('sharingtoken', $token);
$list->assign('sharingroot', ($path));
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=');

@ -234,6 +234,10 @@ class OC_Helper {
return self::linkToRoute( 'core_ajax_preview', array('x' => 44, 'y' => 44, 'file' => urlencode($path) ));
}
public static function publicPreview_icon( $path, $token ) {
return self::linkToRoute( 'core_ajax_public_preview', array('x' => 44, 'y' => 44, 'file' => urlencode($path), 't' => $token));
}
/**
* @brief Make a human file size
* @param int $bytes file size in bytes

@ -64,6 +64,16 @@ function preview_icon( $path ) {
return(\preview_icon( $path ));
}
/**
* @brief make publicpreview_icon available as a simple function
* Returns the path to the preview of the image.
* @param $path path of file
* @returns link to the preview
*/
function publicPreview_icon ( $path, $token ) {
return(\publicPreview_icon( $path, $token ));
}
/**
* @brief make OC_Helper::humanFileSize available as a simple function
* Makes 2048 to 2 kB.

@ -74,6 +74,10 @@ function preview_icon( $path ) {
return OC_Helper::previewIcon( $path );
}
function publicPreview_icon ( $path, $token ) {
return OC_Helper::publicPreview_icon( $path, $token );
}
/**
* @brief make OC_Helper::mimetypeIcon available as a simple function
* @param string $mimetype mimetype

Loading…
Cancel
Save