From dc292c2f39a33857c2128df552aa76ed5c8b705e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Thu, 26 Mar 2020 14:26:15 +0100
Subject: [PATCH] #1080 Revision access contect menu

---
 .../dmsf_context_menus/_revision_actions.html.erb    |  4 ++--
 app/views/dmsf_files/show.html.erb                   |  2 +-
 assets/stylesheets/redmine_dmsf.css                  | 12 ++++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/views/dmsf_context_menus/_revision_actions.html.erb b/app/views/dmsf_context_menus/_revision_actions.html.erb
index 6235c3b9..5196a7c4 100644
--- a/app/views/dmsf_context_menus/_revision_actions.html.erb
+++ b/app/views/dmsf_context_menus/_revision_actions.html.erb
@@ -21,7 +21,7 @@
 %>
 
 <%= link_to_function l(:title_download_entries),
-                     "$('#revision_access-#{revision.id}').toggle()",
+                     "$('#revision_access_#{revision.id}').toggle(); $('.drdn.expanded').removeClass('expanded');",
                      class: 'icon icon-group dmsf-revision-action-button' %>
 <%= link_to l(:title_download),
             view_dmsf_file_path(file, download: revision),
@@ -35,4 +35,4 @@
             delete_revision_path(revision),
             data: { confirm: l(:text_are_you_sure) },
             title: l(:title_delete_revision),
-            class: 'icon icon-del dmsf-revision-action-button' if file_delete_allowed && (file.dmsf_file_revisions.visible.count > 1) %>
\ No newline at end of file
+            class: 'icon icon-del dmsf-revision-action-button' if file_delete_allowed && (file.dmsf_file_revisions.visible.count > 1) %>
diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb
index 42c5c219..e0e7a9d5 100644
--- a/app/views/dmsf_files/show.html.erb
+++ b/app/views/dmsf_files/show.html.erb
@@ -154,7 +154,7 @@
           <%= render 'dmsf/custom_fields', object: revision %>
         </div>
       </div>
-      <div id="<%= "revision_access-#{revision.id}" %>" style="display:none">
+      <div id="<%= "revision_access_#{revision.id}" %>">
         <% if @file_manipulation_allowed %>
           <% revision_access_query = DmsfFileRevisionAccessQuery.new %>
           <% revision_access_query.revision_id = revision.id  %>
diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css
index 4c846b74..2bf66f35 100644
--- a/assets/stylesheets/redmine_dmsf.css
+++ b/assets/stylesheets/redmine_dmsf.css
@@ -19,6 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
+/* Main view */
 .list .dmsf-title {
 	width: 40%;
     text-align: left;
@@ -28,6 +29,13 @@
 	min-width: 18px;
 }
 
+/* Query form */
+.query-columns > span { /* EasyExtension */
+    display: inline-block;
+    height: 100%;
+    vertical-align: middle;
+}
+
 /* Revision's downloads box */
 #dmsf_buttons.dmsf-controls {
     float: left
@@ -120,6 +128,10 @@ div.dmsf-controls .dmsf-revision-action-button { /* EasyExtension */
     border-style: none;
 }
 
+div[id*="revision_access_"] {
+    display: none;
+}
+
 /* Command icons */
 .icon-link { background-image: url(../../../images/link.png); }
 .icon-approvalworkflows { background-image: url(../../../images/ticket_go.png); }