From eb1216f9493c78a0c1a3e49058ac1a96cd3a5a5c Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Wed, 2 Oct 2013 15:23:51 +0200 Subject: [PATCH 1/4] add previews to versions dialog --- apps/files_versions/ajax/preview.php | 43 ++++++++++++++++++++++++++ apps/files_versions/appinfo/routes.php | 5 +++ apps/files_versions/css/versions.css | 6 +++- apps/files_versions/js/versions.js | 4 ++- apps/files_versions/lib/versions.php | 1 + 5 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 apps/files_versions/ajax/preview.php diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php new file mode 100644 index 0000000000..eec2d7c1e6 --- /dev/null +++ b/apps/files_versions/ajax/preview.php @@ -0,0 +1,43 @@ +setFile($file.'.v'.$version); + $preview->setMaxX($maxX); + $preview->setMaxY($maxY); + $preview->setScalingUp($scalingUp); + + $preview->showPreview(); +}catch(\Exception $e) { + \OC_Response::setStatus(500); + \OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG); +} \ No newline at end of file diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php index 38c288adf9..dc36b66f39 100644 --- a/apps/files_versions/appinfo/routes.php +++ b/apps/files_versions/appinfo/routes.php @@ -7,3 +7,8 @@ // Register with the capabilities API OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH); + +$this->create('core_ajax_versions_preview', '/preview.png')->action( +function() { + require_once __DIR__ . '/../ajax/preview.php'; +}); \ No newline at end of file diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css index 6a9b3a9569..d9a3c43d54 100644 --- a/apps/files_versions/css/versions.css +++ b/apps/files_versions/css/versions.css @@ -5,7 +5,7 @@ #found_versions li { width: 100%; cursor: default; - height: 36px; + height: 56px; float: left; border-bottom: 1px solid rgba(100,100,100,.1); } @@ -33,6 +33,10 @@ padding-right: 4px; } +#found_versions img.preview { + cursor: default; +} + #found_versions .versionDate { min-width: 100px; vertical-align: text-bottom; diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index f57e931bad..3f56a3eb69 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -129,6 +129,8 @@ function createVersionsDropdown(filename, files) { var path = OC.filePath('files_versions', '', 'download.php'); + var preview = ''; + var download =''; download+=''); version.attr('value', revision.version); - version.html(download + revert); + version.html(preview + download + revert); version.appendTo('#found_versions'); } diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 0b4699dc5c..fc8d0365c7 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -266,6 +266,7 @@ class Storage { $versions[$key]['version'] = $version; $versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($version); $versions[$key]['path'] = $filename; + $versions[$key]['preview'] = \OCP\Util::linkToRoute('core_ajax_versions_preview', array('file' => $filename, 'version' => $version)); $versions[$key]['size'] = $versions_fileview->filesize($filename.'.v'.$version); // if file with modified date exists, flag it in array as currently enabled version From b0a71bde15a9833dc7f1b84fea95bcd58bf73a66 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Wed, 2 Oct 2013 16:34:05 +0200 Subject: [PATCH 2/4] maxX and maxY should be a integer --- apps/files_versions/ajax/preview.php | 6 +++--- apps/files_versions/appinfo/routes.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php index eec2d7c1e6..c24134df53 100644 --- a/apps/files_versions/ajax/preview.php +++ b/apps/files_versions/ajax/preview.php @@ -12,8 +12,8 @@ if(!\OC_App::isEnabled('files_versions')){ } $file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : ''; -$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44'; -$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44'; +$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : 44; +$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : 44; $version = array_key_exists('version', $_GET) ? $_GET['version'] : ''; $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; @@ -40,4 +40,4 @@ try{ }catch(\Exception $e) { \OC_Response::setStatus(500); \OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG); -} \ No newline at end of file +} diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php index dc36b66f39..8d2abaa89e 100644 --- a/apps/files_versions/appinfo/routes.php +++ b/apps/files_versions/appinfo/routes.php @@ -11,4 +11,4 @@ OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabil $this->create('core_ajax_versions_preview', '/preview.png')->action( function() { require_once __DIR__ . '/../ajax/preview.php'; -}); \ No newline at end of file +}); From 2cfb5fb2d2553ee0e6eb1ae8f21dce94c862e594 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 4 Oct 2013 14:13:48 +0200 Subject: [PATCH 3/4] vertical align versions text --- apps/files_versions/css/versions.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css index d9a3c43d54..474ba98deb 100644 --- a/apps/files_versions/css/versions.css +++ b/apps/files_versions/css/versions.css @@ -1,5 +1,5 @@ #dropdown.drop-versions { - width:22em; + width:24em; } #found_versions li { @@ -21,6 +21,12 @@ filter: alpha(opacity=50); opacity: .5; } + +#found_versions li > a, +#found_versions li > span { + padding: 17px 7px; +} + #found_versions li > *:hover, #found_versions li > *:focus { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; From 54dd91b859404835c3598f259b1d3ff6d5ea0845 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 4 Oct 2013 15:13:05 +0200 Subject: [PATCH 4/4] remove hover effect from preview image --- apps/files_versions/css/versions.css | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css index 474ba98deb..c53935711c 100644 --- a/apps/files_versions/css/versions.css +++ b/apps/files_versions/css/versions.css @@ -41,6 +41,7 @@ #found_versions img.preview { cursor: default; + opacity: 1; } #found_versions .versionDate {