From 03cbd57f4a56fb71d86df1ed16f375be824f3966 Mon Sep 17 00:00:00 2001 From: Felix Gliesche Date: Tue, 4 Sep 2018 14:34:19 +0200 Subject: [PATCH 4/4] Let pagination always be visible --- app/views/layouts/_file.html.erb | 4 +++- public/javascripts/application.js | 20 ++++++++++++++++++++ public/stylesheets/application.css | 11 +++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/_file.html.erb b/app/views/layouts/_file.html.erb index 5c1478b9c..4a17bacd7 100644 --- a/app/views/layouts/_file.html.erb +++ b/app/views/layouts/_file.html.erb @@ -10,7 +10,9 @@

<%= "#{@attachment.description} - " unless @attachment.description.blank? %> <%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %>

-<%= yield %> +
+ <%= yield %> +
<%= render_pagination %> diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 3998cd130..434e94024 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -892,8 +892,28 @@ $(function ($) { }).change(); }); +function setFilecontentContainerHeight() { + var $filecontainer = $('.filecontent-container'); + var fileTypeSelectors = ['.image', 'video']; + + if($filecontainer.length > 0 && $filecontainer.find(fileTypeSelectors.join(',')).length === 1) { + var containerOffsetTop = $filecontainer.offset().top; + var containerMarginBottom = parseInt($filecontainer.css('marginBottom')); + var paginationHeight = $filecontainer.next('.pagination').height(); + var diff = containerOffsetTop + containerMarginBottom + paginationHeight; + + $filecontainer.css('height', 'calc(100vh - ' + diff + 'px)') + } +} + +function setupAttachmentDetail() { + setFilecontentContainerHeight(); + $(window).resize(setFilecontentContainerHeight); +} + $(document).ready(setupAjaxIndicator); $(document).ready(hideOnLoad); $(document).ready(addFormObserversForDoubleSubmit); $(document).ready(defaultFocus); +$(document).ready(setupAttachmentDetail); $(document).ready(setupTabs); diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 060de9abb..6bcad0d13 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1521,3 +1521,14 @@ img.filecontent.image {background-image: url(../images/transparent.png);} img { image-orientation: from-image; } + +.filecontent-container { + position: relative; + margin-bottom: 20px; + min-height: 200px; +} +.filecontent-container > .filecontent { + position: absolute; + max-height: 100%; + max-width: 100%; +} -- 2.15.1