Uniffied design

app/views/dmsf/show.html.erb

@@ -99,9 +99,14 @@
               <% custom_value = values.first %>
               <% custom_value.custom_field.is_required = false %>
               <% custom_value.value = params[:custom_value].present? ? params[:custom_value] : '' %>
-        <% name = :dmsf_folder %>
-        <%= content_tag('label', custom_field_name_tag(custom_value.custom_field),
-              :for => "#{name}_custom_field_values_#{custom_value.custom_field.id}") + ': ' + custom_field_tag(name, custom_value) %>
+              <%= h(custom_value.custom_field.name) %>:
+              <%#= custom_field_tag(:dmsf_folder, custom_value, :style => 'width: auto') %>
+              <%= custom_value.custom_field.format.edit_tag(self,
+                custom_field_tag_id(:dmsf_folder, custom_value.custom_field),
+                custom_field_tag_name(:dmsf_folder, custom_value.custom_field),
+                custom_value,
+                :class => "#{custom_value.custom_field.field_format}_cf",
+                :style => 'width: auto') %>
             </div>
         <% end %>
     <% end %>

app/views/dmsf_files/_file_new_revision.html.erb

@@ -82,7 +82,7 @@
           </p>
         </div>
         <p>          
-          <%= f.text_area(:comment, :rows => 2, :label => l(:label_comment)) %>
+          <%= f.text_area(:comment, :rows => 2, :label => l(:label_comment), :class => 'wiki-edit') %>
         </p>          
         <%= f.submit l(:submit_create) %>
       <% end %>

app/views/dmsf_upload/_form.html.erb

@@ -26,7 +26,7 @@
     <span id="dmsf_attachments_p<%= i %>">
       <%= text_field_tag("dmsf_attachments[p#{i}][filename]", attachment.filename, :class => 'filename') +
               text_field_tag("dmsf_attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description') +
-              link_to('&nbsp;'.html_safe, dmsf_attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+              link_to('&nbsp;'.html_safe, dmsf_attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload icon icon-del') %>
       <%= hidden_field_tag "dmsf_attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>

app/views/dmsf_upload/_upload_file.html.erb

@@ -22,7 +22,7 @@
   # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<div class="box tabular">
+<div class="box tabular" style="padding-top: 10px">
   <%= hidden_field_tag("commited_files[#{i}][disk_filename]", upload.disk_filename) %>
   <%= hidden_field_tag("commited_files[#{i}][tempfile_path]", upload.tempfile_path) %>
   <%= hidden_field_tag("commited_files[#{i}][size]", upload.size) %>
@@ -31,13 +31,13 @@
     <div class="splitcontentleft">
       <p>
         <%= label_tag("commited_files[#{i}][title]", l(:label_title)) %>
-        <%= text_field_tag("commited_files[#{i}][title]", upload.title, :size => 32, :required => true) %>
+        <%= text_field_tag("commited_files[#{i}][title]", upload.title, :required => true) %>
       </p>
     </div>
     <div class="splitcontentright">
       <p>
         <%= label_tag('', l(:label_filename)) %>
-        <%= h(upload.name) %>
+        <%= text_field_tag(:name, h(upload.name), :readonly => true) %>
         <%= hidden_field_tag("commited_files[#{i}][name]", upload.name) %>
       </p>
     </div>
@@ -65,25 +65,31 @@
         <%= upload.major_version + 1 %>.0
         <%= l(:option_version_major) %><br/>
         <%= radio_button_tag("commited_files[#{i}][version]", 3) %>
-        <%= select_tag "commited_files[#{i}][custom_version_major]", options_for_select(0..99, upload.major_version + 2), :onchange => "$('#commited_files_#{i}_version_3').prop('checked', true)" %>.
-        <%= select_tag "commited_files[#{i}][custom_version_minor]", options_for_select(0..99, upload.minor_version + 1), :onchange => "$('#commited_files_#{i}_version_3').prop('checked', true)" %>
+        <%= select_tag "commited_files[#{i}][custom_version_major]",
+                       options_for_select(0..99, upload.major_version + 2),
+                       :onchange => "$('#commited_files_#{i}_version_3').prop('checked', true)",
+                       :class => 'dmsf_select_version'%>.
+        <%= select_tag "commited_files[#{i}][custom_version_minor]",
+                       options_for_select(0..99, upload.minor_version + 1),
+                       :onchange => "$('#commited_files_#{i}_version_3').prop('checked', true)",
+                       :class => 'dmsf_select_version' %>
         <%= l(:option_version_custom) %>
       </p>
     </div>
     <div class="splitcontentright">
       <p>
-        <%= label_tag('', l(:label_mime)) %>
-        <%= h(upload.mime_type) %>
+        <%= label_tag '', l(:label_mime) %>
+        <%= text_field_tag(:name, h(upload.mime_type), :readonly => true) %>
       </p>
       <p>
         <%= label_tag('', l(:label_size)) %>
-        <%= number_to_human_size(upload.size) %>
+        <%= text_field_tag(:name, number_to_human_size(upload.size), :readonly => true) %>
       </p>
     </div>
   </div>
   <p>
     <%= label_tag("commited_files[#{i}][comment]", l(:label_comment)) %>
-    <%= text_area_tag("commited_files[#{i}][comment]", upload.comment, :rows => 2) %>    
+    <%= text_area_tag("commited_files[#{i}][comment]", upload.comment, :rows => 2, :class => 'wiki-edit') %>
   </p>
 </div>
 

app/views/dmsf_upload/_upload_file_locked.html.erb

@@ -22,7 +22,7 @@
   # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<div class="box tabular">
+<div class="box tabular" style="padding-top: 10px">
   <%= hidden_field_tag("commited_files[#{i}][disk_filename]", upload.disk_filename) %>
   <%= hidden_field_tag("commited_files[#{i}][tempfile_path]", upload.tempfile_path) %>
   <%= hidden_field_tag("commited_files[#{i}][size]", upload.size) %>
@@ -33,13 +33,13 @@
     <div class="splitcontentleft">
       <p>
         <%= label_tag('', l(:label_title)) %>
-        <%= h(upload.title) %>
+        <%= text_field_tag(:name, h(upload.title), :readonly => true) %>
       </p>
     </div>
     <div class="splitcontentright">
       <p>
         <%= label_tag('', l(:label_filename)) %>
-        <%= h(upload.name) %>
+        <%= text_field_tag(:name, h(upload.name), :readonly => true) %>
       </p>
     </div>
   </div>
@@ -58,7 +58,7 @@
             <p>
               <%= label_tag('', h(value.custom_field.name)) %>
               <% value.value = nil if value.custom_field.dmsf_not_inheritable %>
-              <%= h(value.value) %>
+              <%= text_field_tag(:name, h(value.value), :readonly => true) %>
             </p>
         <% end %>
       </div>
@@ -66,17 +66,17 @@
     <div class="splitcontentleft">
       <p>
         <%= label_tag('', l(:label_dmsf_version)) %>
-        <%= upload.major_version %>.<%= upload.minor_version %>
+        <%= text_field_tag(:name, "#{upload.major_version}.#{upload.minor_version}", :readonly => true) %>
       </p>
     </div>
     <div class="splitcontentright">
       <p>
         <%= label_tag('', l(:label_mime)) %>
-        <%= h(upload.mime_type) %>
+        <%= text_field_tag(:name, h(upload.mime_type), :readonly => true) %>
       </p>
       <p>
         <%= label_tag('', l(:label_size)) %>
-        <%= number_to_human_size(upload.size) %>
+        <%= text_field_tag(:name, h(number_to_human_size(upload.size)), :readonly => true) %>
       </p>
     </div>
   </div>

app/views/dmsf_upload/upload_files.html.erb

@@ -42,5 +42,8 @@
       <%= render(:partial => 'upload_file', :locals => {:upload => upload, :i => i}) %>
     <% end %>
   <% end %>
-  <%= submit_tag l(:submit_commit) %>
+  <%#= submit_tag l(:submit_commit) %>
+  <div class="form-actions">
+    <%= submit_tag l(:submit_commit), :class => 'button-positive' %>
+  </div>
 <% end %>

app/views/dmsf_workflows/_new_step_modal.html.erb

@@ -27,6 +27,6 @@
   <p class="buttons">
     <%= f.submit l(:dmsf_and), :id => 'add-step-and' %>
     <%= f.submit l(:dmsf_or), :id => 'add-step-or' %>
-    <%= f.submit l(:button_cancel), :name => nil, :onclick => 'hideModal(this);', :type => 'button' %>    
+    <%= f.submit l(:button_cancel), :name => nil, :onclick => 'hideModal(this);', :type => 'button', :class => 'button' %>
   </p>
 <% end %>

assets/javascripts/attachments_dmsf.js

@@ -42,7 +42,7 @@ function dmsfAddFile(inputEl, file, eagerUpload) {
                     maxlength: 255,
                     placeholder: $(inputEl).data('description-placeholder')
                 }).toggle(!eagerUpload),
-                $('<a>&nbsp</a>').attr({href: "#", 'class': 'remove-upload'}).click(dmsfRemoveFile).toggle(!eagerUpload)
+                $('<a>&nbsp</a>').attr({href: "#", 'class': 'remove-upload icon icon-del'}).click(dmsfRemoveFile).toggle(!eagerUpload)
             ).appendTo('#dmsf_attachments_fields');
         }
         else{
@@ -234,3 +234,6 @@ function dmsfSetupFileDrop() {
 }
 
 $(document).ready(dmsfSetupFileDrop);
+$(document).on("erui_new_dom", function() {
+    dmsfSetupFileDrop();
+});

assets/stylesheets/redmine_dmsf.css

@@ -121,6 +121,11 @@
 	font-size: 0.9em;
 }
 
+.dmsf_uploader span[id*="dmsf_attachments"] .filename {
+    -webkit-box-shadow: none !important;
+    box-shadow: none !important;
+}
+
 /* Approval workflow */
 #admin-menu a.dmsf-approvalworkflows { background-image: url(../../../images/ticket_go.png); }
 #dmsf_users_for_delegate { height: 200px; overflow:auto; }