From 8738b3e09d817fa84cc4e5871d9ce9b2db3fef1e Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 16 Dec 2016 15:44:47 +0100 Subject: [PATCH] Added image preview to Results [SCI-694] --- app/views/my_modules/results.html.erb | 3 +++ app/views/results/_result_asset.html.erb | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/my_modules/results.html.erb b/app/views/my_modules/results.html.erb index 8d90a8007..e9b572ad6 100644 --- a/app/views/my_modules/results.html.erb +++ b/app/views/my_modules/results.html.erb @@ -39,6 +39,8 @@
+<%= render partial: "shared/image_preview_modal.html.erb" %> +
@@ -53,6 +55,7 @@ <%= javascript_include_tag "results/result_texts" %> <%= javascript_include_tag "results/result_tables" %> <%= javascript_include_tag "results/result_assets" %> +<%= javascript_include_tag("my_modules/image_preview") %> <%= javascript_include_tag "lodash" %> diff --git a/app/views/results/_result_asset.html.erb b/app/views/results/_result_asset.html.erb index 992b08562..a0243759a 100644 --- a/app/views/results/_result_asset.html.erb +++ b/app/views/results/_result_asset.html.erb @@ -5,7 +5,10 @@ <%= image_tag 'medium/processing.gif' %> <% else %> - <%= link_to download_asset_path(result.asset), data: {no_turbolink: true} do %> + <%= link_to download_asset_path(result.asset), + class: 'image-preview-link', + id: "modal_link#{result.asset.id}", + data: {no_turbolink: true, description: "#{result.name}"} do %> <%= image_tag(preview_asset_path result.asset) if result.asset.is_image? %>

<%= truncate(result.asset.file_file_name, length: Constants::FILENAME_TRUNCATION_LENGTH) %>