From 15d94efa7d0a51f3958878e2ba211b158f1cafef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Wed, 29 Mar 2023 09:59:29 +0200
Subject: [PATCH] Easy facelift

---
 app/views/dmsf/_main.html.erb          |  4 ++-
 app/views/dmsf/trash.html.erb          |  4 ++-
 app/views/dmsf_files/show.html.erb     |  4 +--
 assets/stylesheets/easy_extensions.css | 40 ++++++++++++++++++++++++++
 assets/stylesheets/redmine_dmsf.css    |  2 +-
 5 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/app/views/dmsf/_main.html.erb b/app/views/dmsf/_main.html.erb
index 4f0a9a24..97ee2199 100644
--- a/app/views/dmsf/_main.html.erb
+++ b/app/views/dmsf/_main.html.erb
@@ -67,7 +67,9 @@
 <%= form_tag(@project ? dmsf_folder_path(id: @project, folder_id: @folder) : dmsf_index_path,
              method: :get, id: 'query_form', class: 'dmsf-query-form') do %>
   <%= hidden_field_tag('folder_id', @folder.id) if @folder %>
-  <%= render partial: 'queries/query_form' %>
+  <div id="dmsf-query-form">
+    <%= render partial: 'queries/query_form' %>
+  </div>
 <% end %>
 <% if @query.valid? %>
   <% if @dmsf_count == 0 %>
diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb
index d52a052a..14bce5c0 100644
--- a/app/views/dmsf/trash.html.erb
+++ b/app/views/dmsf/trash.html.erb
@@ -31,7 +31,9 @@
 <h2><%= l(:link_trash_bin) %></h2>
 
 <%= form_tag(trash_dmsf_path(id: @project), method: :get, id: 'query_form', class: 'dmsf-query-form') do %>
-  <%= render partial: 'queries/query_form' %>
+  <div id="dmsf-query-form">
+    <%= render partial: 'queries/query_form' %>
+  </div>
 <% end %>
 <%= render partial: 'query_list', locals: { query: @query, dmsf_pages: @dmsf_pages } %>
 <span class="pagination"><%= pagination_links_full @dmsf_pages, @dmsf_count %></span>
diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb
index b2175dea..7885ee94 100644
--- a/app/views/dmsf_files/show.html.erb
+++ b/app/views/dmsf_files/show.html.erb
@@ -65,8 +65,8 @@
 <% end %>
 
 <div class="dmsf-id-box">
-  <strong><%= label_tag('', l(:label_document)) %></strong>
-  #<%= "#{@file.id}" %>
+  <strong><%= label_tag '', l(:label_document) %></strong>
+  #<%= @file.id %>
 </div>
 
 <h3><%= l(:heading_revisions) %></h3>
diff --git a/assets/stylesheets/easy_extensions.css b/assets/stylesheets/easy_extensions.css
index 1f46f8d2..b4f71297 100644
--- a/assets/stylesheets/easy_extensions.css
+++ b/assets/stylesheets/easy_extensions.css
@@ -136,3 +136,43 @@ td.dmsf-title a.icon-folder::before {
     width: 0;
     height: 16px;
 }
+
+/* Revision box */
+div.dmsf-id-box label {
+    display: inline;
+}
+
+.dmsf-widget-header-text {
+    padding: 0 !important;
+}
+
+div.dmsf-controls.contextual {
+    padding-top: 2px;
+}
+
+div.autoscroll.dmsf-revision-access {
+    width: auto;
+}
+
+/* Filters */
+#dmsf-query-form .add-filter {
+    width: 35%;
+    float: right;
+    text-align: right;
+    vertical-align: top;
+    padding-right: 10px;
+}
+
+#dmsf-query-form div.add-filter label {
+    display: inline;
+}
+
+#dmsf-query-form table#filters-table {
+    width: 60%;
+    float: left;
+}
+
+#dmsf-query-form select#add_filter_select {
+    width: auto;
+    position: static;
+}
diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css
index 150ee8a1..0cca98f6 100644
--- a/assets/stylesheets/redmine_dmsf.css
+++ b/assets/stylesheets/redmine_dmsf.css
@@ -98,7 +98,7 @@ div.dmsf-revision-inner-box .attribute .label {
     float: left;
 }
 
-.dmsf-id-box {
+div.dmsf-id-box {
   float: right;
   white-space: nowrap;
   line-height: 24px;