From aae721d21b6ae5b69c3dcc88724b4e2e7df70d3d Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Tue, 7 Feb 2017 15:20:30 +0100
Subject: [PATCH] Position of a document custom fields unified

---
 app/views/dmsf_files/_file_new_revision.html.erb   |  2 +-
 app/views/dmsf_upload/_upload_file.html.erb        | 14 +++++++++-----
 app/views/dmsf_upload/_upload_file_locked.html.erb | 14 ++++++++++++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/views/dmsf_files/_file_new_revision.html.erb b/app/views/dmsf_files/_file_new_revision.html.erb
index 99cff30a..82ef2ee7 100644
--- a/app/views/dmsf_files/_file_new_revision.html.erb
+++ b/app/views/dmsf_files/_file_new_revision.html.erb
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2011    Vít Jonáš <vit.jonas@gmail.com>
 # Copyright (C) 2012    Daniel Munn <dan.munn@munnster.co.uk>
-# Copyright (C) 2011-16 Karel Pičman <karel.picman@kontron.com>
+# Copyright (C) 2011-17 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/app/views/dmsf_upload/_upload_file.html.erb b/app/views/dmsf_upload/_upload_file.html.erb
index 9af33a30..64aa3825 100644
--- a/app/views/dmsf_upload/_upload_file.html.erb
+++ b/app/views/dmsf_upload/_upload_file.html.erb
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2011    Vít Jonáš <vit.jonas@gmail.com>
 # Copyright (C) 2012    Daniel Munn <dan.munn@munnster.co.uk>
-# Copyright (C) 2011-16 Karel Pičman <karel.picman@kontron.com>
+# Copyright (C) 2011-17 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -44,6 +44,13 @@
     <%= text_area_tag("commited_files[#{i}][description]", upload.description, :rows => 6, :class => 'wiki-edit') %>        
   </p>
   <div class="clear">
+    <div class="splitcontentright">
+      <div class="custom_fields">
+        <% upload.custom_values.each do |value| %>
+            <p><%= custom_field_tag_with_label("commited_files[#{i}][dmsf_file_revision]", value) %></p>
+        <% end %>
+      </div>
+    </div>
     <div class="splitcontentleft">
       <p>
         <%= label_tag("commited_files[#{i}][version]_minor", l(:label_dmsf_version)) %>
@@ -70,13 +77,10 @@
       </p>
     </div>  
   </div>
-  <% upload.custom_values.each do |value| %>
-    <p><%= custom_field_tag_with_label("commited_files[#{i}][dmsf_file_revision]", value) %></p>
-  <% end %>
   <p>
     <%= label_tag("commited_files[#{i}][comment]", l(:label_comment)) %>      
     <%= text_area_tag("commited_files[#{i}][comment]", upload.comment, :rows => 2) %>    
   </p>
 </div>
 
-<%= wikitoolbar_for "commited_files_#{i}_description" %>
\ No newline at end of file
+<%= wikitoolbar_for "commited_files_#{i}_description" %>
diff --git a/app/views/dmsf_upload/_upload_file_locked.html.erb b/app/views/dmsf_upload/_upload_file_locked.html.erb
index 97a52432..c424e623 100644
--- a/app/views/dmsf_upload/_upload_file_locked.html.erb
+++ b/app/views/dmsf_upload/_upload_file_locked.html.erb
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2011   Vít Jonáš <vit.jonas@gmail.com>
 # Copyright (C) 2012   Daniel Munn  <dan.munn@munnster.co.uk>
-# Copyright (C) 2011-16 Karel Pičman <karel.picman@kontron.com>
+# Copyright (C) 2011-17 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -49,6 +49,16 @@
     </p>
   <% end %>
   <div class="clear">
+    <div class="splitcontentright">
+      <div class="custom_fields">
+        <% upload.custom_values.each do |value| %>
+            <p>
+              <%= label_tag('', h(value.custom_field.name)) %>
+              <%= h(value) %>
+            </p>
+        <% end %>
+      </div>
+    </div>
     <div class="splitcontentleft">
       <p>
         <%= label_tag('', l(:label_dmsf_version)) %>
@@ -72,4 +82,4 @@
       <div class="wiki"><%= textilizable(upload.comment) %></div>	     	           
     </p>
   <% end %>
-</div>
\ No newline at end of file
+</div>