diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb index 6627cc60..fb930ba7 100644 --- a/app/views/dmsf/show.html.erb +++ b/app/views/dmsf/show.html.erb @@ -1,78 +1,78 @@ <% -# encoding: utf-8 -# -# Redmine plugin for Document Management System "Features" -# -# Copyright (C) 2011 Vít Jonáš -# Copyright (C) 2012 Daniel Munn -# Copyright (C) 2011-17 Karel Pičman -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + # encoding: utf-8 + # + # Redmine plugin for Document Management System "Features" + # + # Copyright (C) 2011 Vít Jonáš + # Copyright (C) 2012 Daniel Munn + # Copyright (C) 2011-17 Karel Pičman + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 + # of the License, or (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> <% html_title l(:dmsf) %>
<% if @folder_manipulation_allowed && !@system_folder %> - <% if @folder.nil? %> - <%= link_to(l(:button_edit), edit_root_dmsf_path(:id => @project), - :title => l(:link_edit, :title => l(:link_documents)), - :class => 'icon icon-edit') %> - <% elsif !@locked_for_user %> - <%= link_to(l(:button_edit), - edit_dmsf_path(:id => @project, :folder_id => @folder), - :title => l(:link_edit, :title => h(@folder.title)), - :class => 'icon icon-edit') %> - <% end %> - <% if @folder && (!@locked_for_user || User.current.allowed_to?(:force_file_unlock, @project)) %> - <% if @folder.locked? %> - <%= link_to_if(@folder.unlockable?, l(:button_unlock), - unlock_dmsf_path(:id => @project, :folder_id => @folder, :current => request.url), - :title => l(:title_unlock_folder), :class => 'icon icon-unlock') %> - <% else %> - <%= link_to(l(:button_lock), - lock_dmsf_path(:id => @project, :folder_id => @folder, :current => request.url), - :title => l(:title_lock_folder), :class => 'icon icon-lock') %> + <% if @folder.nil? %> + <%= link_to(l(:button_edit), edit_root_dmsf_path(:id => @project), + :title => l(:link_edit, :title => l(:link_documents)), + :class => 'icon icon-edit') %> + <% elsif !@locked_for_user %> + <%= link_to(l(:button_edit), + edit_dmsf_path(:id => @project, :folder_id => @folder), + :title => l(:link_edit, :title => h(@folder.title)), + :class => 'icon icon-edit') %> <% end %> - <% end %> - <% if !@locked_for_user && ((@folder && @folder.notification) || (!@folder && @project.dmsf_notification)) %> - <%= link_to(l(:label_notifications_off), - notify_deactivate_dmsf_path(:id => @project, :folder_id => @folder), - :title => l(:title_notifications_active_deactivate), - :class => 'icon icon-email') %> - <% else %> - <%= link_to(l(:label_notifications_on), - notify_activate_dmsf_path(:id => @project, :folder_id => @folder), - :title => l(:title_notifications_not_active_activate), - :class => 'icon icon-email-add') %> - <% end %> - <% if @file_manipulation_allowed && !@locked_for_user %> - <%= link_to(l(:label_link_from), - new_dmsf_link_path(:project_id => @project.id, :dmsf_folder_id => @folder ? @folder.id : @folder, :type => 'link_from'), - :title => l(:title_create_link), :class => 'icon icon-link') %> - <% end %> - <%= link_to(l(:link_create_folder), - new_dmsf_path(:id => @project, :parent_id => @folder), - :title => l(:link_create_folder), - :class => 'icon icon-add') unless @locked_for_user %> + <% if @folder && (!@locked_for_user || User.current.allowed_to?(:force_file_unlock, @project)) %> + <% if @folder.locked? %> + <%= link_to_if(@folder.unlockable?, l(:button_unlock), + unlock_dmsf_path(:id => @project, :folder_id => @folder, :current => request.url), + :title => l(:title_unlock_folder), :class => 'icon icon-unlock') %> + <% else %> + <%= link_to(l(:button_lock), + lock_dmsf_path(:id => @project, :folder_id => @folder, :current => request.url), + :title => l(:title_lock_folder), :class => 'icon icon-lock') %> + <% end %> + <% end %> + <% if !@locked_for_user && ((@folder && @folder.notification) || (!@folder && @project.dmsf_notification)) %> + <%= link_to(l(:label_notifications_off), + notify_deactivate_dmsf_path(:id => @project, :folder_id => @folder), + :title => l(:title_notifications_active_deactivate), + :class => 'icon icon-email') %> + <% else %> + <%= link_to(l(:label_notifications_on), + notify_activate_dmsf_path(:id => @project, :folder_id => @folder), + :title => l(:title_notifications_not_active_activate), + :class => 'icon icon-email-add') %> + <% end %> + <% if @file_manipulation_allowed && !@locked_for_user %> + <%= link_to(l(:label_link_from), + new_dmsf_link_path(:project_id => @project.id, :dmsf_folder_id => @folder ? @folder.id : @folder, :type => 'link_from'), + :title => l(:title_create_link), :class => 'icon icon-link') %> + <% end %> + <%= link_to(l(:link_create_folder), + new_dmsf_path(:id => @project, :parent_id => @folder), + :title => l(:link_create_folder), + :class => 'icon icon-add') unless @locked_for_user %> <% end %> <%= link_to_if(@trash_enabled, l(:link_trash_bin), trash_dmsf_path(@project), - :title => l(:link_trash_bin), :class => 'icon icon-del') if @trash_visible %> + :title => l(:link_trash_bin), :class => 'icon icon-del') if @trash_visible %>
<%= render(:partial => 'path', - :locals => {:folder => @folder, :filename => nil, :title => nil}) %> + :locals => {:folder => @folder, :filename => nil, :title => nil}) %>
@@ -83,140 +83,145 @@ <%= error_messages_for('dmsf_workflow') %> <%= form_tag({:action => :entries_operation, :id => @project, :folder_id => @folder}, :method => :post, - :class => 'dmsf_entries', :id => 'entries_form') do %> - <%= hidden_field_tag('action') %> -
- <%= submit_tag(l(:button_download), :title => l(:title_download_checked), :name => 'download_entries') if @file_view_allowed %> - <%= submit_tag(l(:field_mail), :title => l(:title_send_checked_by_email), :name => 'email_entries') if (@file_view_allowed && User.current.allowed_to?(:email_documents, @project)) %> - <% if @file_delete_allowed%> - <%= submit_tag(l(:button_delete), :title => l(:title_delete_checked), :name => 'delete_entries') if @file_delete_allowed %> + :class => 'dmsf_entries', :id => 'entries_form') do %> + <%= hidden_field_tag('action') %> +
+ <%= submit_tag(l(:button_download), :title => l(:title_download_checked), :name => 'download_entries') if @file_view_allowed %> + <%= submit_tag(l(:field_mail), :title => l(:title_send_checked_by_email), :name => 'email_entries') if (@file_view_allowed && User.current.allowed_to?(:email_documents, @project)) %> + <% if @file_delete_allowed%> + <%= submit_tag(l(:button_delete), :title => l(:title_delete_checked), :name => 'delete_entries') if @file_delete_allowed %> + <% end %> +
+ <% unless @system_folder %> + <% values = @folder ? @folder.custom_field_values : DmsfFolder.new.custom_field_values %> + <% unless values.empty? %> +
+ <% custom_value = values.first %> + <% custom_value.custom_field.is_required = false %> + <% custom_value.value = params[:custom_value].present? ? params[: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') %> +
+ <% end %> <% end %> -
- <% unless @system_folder %> - <% values = @folder ? @folder.custom_field_values : DmsfFolder.new.custom_field_values %> - <% unless values.empty? %> -
- <% 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) %> -
- <% end %> - <% end %> -
- <% if @tree_view %> - <%= render(:partial => 'tree_view') %> - <% else %> - <%= render(:partial => 'list_view') %> - <% end %> -
+
+ <% if @tree_view %> + <%= render(:partial => 'tree_view') %> + <% else %> + <%= render(:partial => 'list_view') %> + <% end %> +
<% end %> <% content_for :header_tags do %> - <%= javascript_include_tag 'bowser.min.js', :plugin => 'redmine_dmsf' %> - <%= stylesheet_link_tag 'jquery.dataTables/jquery-ui.dataTables.css', :plugin => 'redmine_dmsf' %> - <%= javascript_include_tag 'jquery.dataTables/jquery.dataTables.min.js', :plugin => 'redmine_dmsf' %> + <%= javascript_include_tag 'bowser.min.js', :plugin => 'redmine_dmsf' %> + <%= stylesheet_link_tag 'jquery.dataTables/jquery-ui.dataTables.css', :plugin => 'redmine_dmsf' %> + <%= javascript_include_tag 'jquery.dataTables/jquery.dataTables.min.js', :plugin => 'redmine_dmsf' %> - <% title = DmsfFolder.get_column_position('title') %> - <% position = DmsfFolder.get_column_position('position') %> - <% commands = DmsfFolder.get_column_position('commands') %> - <% position = DmsfFolder.get_column_position('position') %> - <% version = DmsfFolder.get_column_position('version') %> - <% size_calculated = DmsfFolder.get_column_position('size_calculated') %> - <% modified_calculated = DmsfFolder.get_column_position('modified_calculated') %> - <% version_calculated = DmsfFolder.get_column_position('version_calculated') %> - <% size = DmsfFolder.get_column_position('size') %> - <% modified = DmsfFolder.get_column_position('modified') %> + <% title = DmsfFolder.get_column_position('title') %> + <% position = DmsfFolder.get_column_position('position') %> + <% commands = DmsfFolder.get_column_position('commands') %> + <% position = DmsfFolder.get_column_position('position') %> + <% version = DmsfFolder.get_column_position('version') %> + <% size_calculated = DmsfFolder.get_column_position('size_calculated') %> + <% modified_calculated = DmsfFolder.get_column_position('modified_calculated') %> + <% version_calculated = DmsfFolder.get_column_position('version_calculated') %> + <% size = DmsfFolder.get_column_position('size') %> + <% modified = DmsfFolder.get_column_position('modified') %> - + $('#entries_form').submit(function () { + $(this).removeAttr('data-submitted'); + }); + }); + <% end %> <% if (@file_manipulation_allowed && !@locked_for_user && !@system_folder) %> - <%= render(:partial => 'dmsf_upload/multi_upload') %> + <%= render(:partial => 'dmsf_upload/multi_upload') %> <% end %> <% unless @system_folder %> - <% other_formats_links do |f| %> - <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '350px'); return false;" %> - <% end %> + <% other_formats_links do |f| %> + <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '350px'); return false;" %> + <% end %> <% end %>

- <%= f.text_area(:comment, :rows => 2, :label => l(:label_comment)) %> + <%= f.text_area(:comment, :rows => 2, :label => l(:label_comment), :class => 'wiki-edit') %>

<%= f.submit l(:submit_create) %> <% end %> diff --git a/app/views/dmsf_upload/_form.html.erb b/app/views/dmsf_upload/_form.html.erb index 3adc3b16..5066ab01 100644 --- a/app/views/dmsf_upload/_form.html.erb +++ b/app/views/dmsf_upload/_form.html.erb @@ -26,7 +26,7 @@ <%= 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(' '.html_safe, dmsf_attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %> + link_to(' '.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}" %> <% end %> diff --git a/app/views/dmsf_upload/_upload_file.html.erb b/app/views/dmsf_upload/_upload_file.html.erb index a11061ce..2311378f 100644 --- a/app/views/dmsf_upload/_upload_file.html.erb +++ b/app/views/dmsf_upload/_upload_file.html.erb @@ -1,28 +1,28 @@ <% -# encoding: utf-8 -# -# Redmine plugin for Document Management System "Features" -# -# Copyright (C) 2011 Vít Jonáš -# Copyright (C) 2012 Daniel Munn -# Copyright (C) 2011-17 Karel Pičman -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + # encoding: utf-8 + # + # Redmine plugin for Document Management System "Features" + # + # Copyright (C) 2011 Vít Jonáš + # Copyright (C) 2012 Daniel Munn + # Copyright (C) 2011-17 Karel Pičman + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 + # of the License, or (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> -
+
<%= 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,20 +31,20 @@

<%= 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) %>

<%= 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) %>

- <%= label_tag("commited_files[#{i}][description]", l(:label_description)) %> - <%= text_area_tag("commited_files[#{i}][description]", upload.description, :rows => 6, :class => 'wiki-edit') %> + <%= label_tag("commited_files[#{i}][description]", l(:label_description)) %> + <%= text_area_tag("commited_files[#{i}][description]", upload.description, :rows => 6, :class => 'wiki-edit') %>

@@ -58,32 +58,38 @@

<%= label_tag("commited_files[#{i}][version]_minor", l(:label_dmsf_version)) %> - <%= radio_button_tag("commited_files[#{i}][version]", 1, true) %> + <%= radio_button_tag("commited_files[#{i}][version]", 1, true) %> <%= upload.major_version %>.<%= upload.minor_version + 1 %> <%= l(:option_version_minor) %>
- <%= radio_button_tag("commited_files[#{i}][version]", 2) %> - <%= upload.major_version + 1 %>.0 + <%= radio_button_tag("commited_files[#{i}][version]", 2) %> + <%= upload.major_version + 1 %>.0 <%= l(:option_version_major) %>
- <%= 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)" %> - <%= l(:option_version_custom) %> + <%= 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)", + :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) %>

- <%= label_tag('', l(:label_mime)) %> - <%= h(upload.mime_type) %> + <%= label_tag '', l(:label_mime) %> + <%= text_field_tag(:name, h(upload.mime_type), :readonly => true) %>

<%= label_tag('', l(:label_size)) %> - <%= number_to_human_size(upload.size) %> + <%= text_field_tag(:name, number_to_human_size(upload.size), :readonly => true) %>

-
+

- <%= label_tag("commited_files[#{i}][comment]", l(:label_comment)) %> - <%= text_area_tag("commited_files[#{i}][comment]", upload.comment, :rows => 2) %> + <%= label_tag("commited_files[#{i}][comment]", l(:label_comment)) %> + <%= text_area_tag("commited_files[#{i}][comment]", upload.comment, :rows => 2, :class => 'wiki-edit') %>

diff --git a/app/views/dmsf_upload/_upload_file_locked.html.erb b/app/views/dmsf_upload/_upload_file_locked.html.erb index c6ef86fc..61a533c1 100644 --- a/app/views/dmsf_upload/_upload_file_locked.html.erb +++ b/app/views/dmsf_upload/_upload_file_locked.html.erb @@ -1,28 +1,28 @@ <% -# encoding: utf-8 -# -# Redmine plugin for Document Management System "Features" -# -# Copyright (C) 2011 Vít Jonáš -# Copyright (C) 2012 Daniel Munn -# Copyright (C) 2011-17 Karel Pičman -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + # encoding: utf-8 + # + # Redmine plugin for Document Management System "Features" + # + # Copyright (C) 2011 Vít Jonáš + # Copyright (C) 2012 Daniel Munn + # Copyright (C) 2011-17 Karel Pičman + # + # This program is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # as published by the Free Software Foundation; either version 2 + # of the License, or (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> -
+
<%= 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,23 +33,23 @@

<%= label_tag('', l(:label_title)) %> - <%= h(upload.title) %> + <%= text_field_tag(:name, h(upload.title), :readonly => true) %>

<%= label_tag('', l(:label_filename)) %> - <%= h(upload.name) %> + <%= text_field_tag(:name, h(upload.name), :readonly => true) %>

<% if upload.description.present? %> -

- <%= label_tag('', l(:label_description)) %> +

+ <%= label_tag('', l(:label_description)) %>

<%= textilizable(upload.description) %>
-

+

<% end %>
@@ -58,7 +58,7 @@

<%= 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) %>

<% end %>
@@ -66,24 +66,24 @@

<%= label_tag('', l(:label_dmsf_version)) %> - <%= upload.major_version %>.<%= upload.minor_version %> -

+ <%= text_field_tag(:name, "#{upload.major_version}.#{upload.minor_version}", :readonly => true) %> +

<%= label_tag('', l(:label_mime)) %> - <%= h(upload.mime_type) %> + <%= text_field_tag(:name, h(upload.mime_type), :readonly => true) %>

<%= label_tag('', l(:label_size)) %> - <%= number_to_human_size(upload.size) %> + <%= text_field_tag(:name, h(number_to_human_size(upload.size)), :readonly => true) %>

-
-
+
+
<% if upload.comment.present? %> -

- <%= label_tag('', l(:label_comment)) %> -

<%= textilizable(upload.comment) %>
-

+

+ <%= label_tag('', l(:label_comment)) %> +

<%= textilizable(upload.comment) %>
+

<% end %>
diff --git a/app/views/dmsf_upload/upload_files.html.erb b/app/views/dmsf_upload/upload_files.html.erb index d178ea75..580070f5 100644 --- a/app/views/dmsf_upload/upload_files.html.erb +++ b/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) %> +
+ <%= submit_tag l(:submit_commit), :class => 'button-positive' %> +
<% end %> \ No newline at end of file diff --git a/app/views/dmsf_workflows/_new_step_modal.html.erb b/app/views/dmsf_workflows/_new_step_modal.html.erb index c282aba7..3efcc6be 100644 --- a/app/views/dmsf_workflows/_new_step_modal.html.erb +++ b/app/views/dmsf_workflows/_new_step_modal.html.erb @@ -27,6 +27,6 @@

<%= 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' %>

<% end %> diff --git a/assets/javascripts/attachments_dmsf.js b/assets/javascripts/attachments_dmsf.js index f72f8c33..79bd3f0b 100644 --- a/assets/javascripts/attachments_dmsf.js +++ b/assets/javascripts/attachments_dmsf.js @@ -42,7 +42,7 @@ function dmsfAddFile(inputEl, file, eagerUpload) { maxlength: 255, placeholder: $(inputEl).data('description-placeholder') }).toggle(!eagerUpload), - $(' ').attr({href: "#", 'class': 'remove-upload'}).click(dmsfRemoveFile).toggle(!eagerUpload) + $(' ').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(); +}); diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css index 8b698faa..316e0d71 100644 --- a/assets/stylesheets/redmine_dmsf.css +++ b/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; }