diff --git a/app/views/dmsf_files/_revision_access.html.erb b/app/views/dmsf_files/_revision_access.html.erb index 13667eab..16f3d29e 100644 --- a/app/views/dmsf_files/_revision_access.html.erb +++ b/app/views/dmsf_files/_revision_access.html.erb @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> - +
diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb index 9a3ea5eb..45857274 100644 --- a/app/views/dmsf_files/show.html.erb +++ b/app/views/dmsf_files/show.html.erb @@ -28,75 +28,74 @@ <% if @file_manipulation_allowed %> <% if @file.locked_for_user? %> <% if User.current.allowed_to?(:force_file_unlock, @project) %> - <%= link_to_if(@file.unlockable?, l(:button_unlock), unlock_dmsf_files_path(:id => @file), - :title => l(:title_unlock_file), :class => 'icon icon-unlock')%> + <%= link_to_if(@file.unlockable?, l(:button_unlock), unlock_dmsf_files_path(id: @file), + title: l(:title_unlock_file), class: 'icon icon-unlock')%> <% end %> <% else %> <% if @file.locked? %> - <%= link_to_if(@file.unlockable?, l(:button_unlock), unlock_dmsf_files_path(:id => @file), - :title => l(:title_unlock_file), :class => 'icon icon-unlock') %> + <%= link_to_if(@file.unlockable?, l(:button_unlock), unlock_dmsf_files_path(id: @file), + title: l(:title_unlock_file), class: 'icon icon-unlock') %> <% else %> - <%= link_to(l(:button_lock), lock_dmsf_files_path(:id => @file), - :title => l(:title_lock_file), :class => 'icon icon-lock') %> + <%= link_to(l(:button_lock), lock_dmsf_files_path(id: @file), + title: l(:title_lock_file), class: 'icon icon-lock') %> <% end %> <% if @file.notification %> <%= link_to(l(:label_notifications_off), - notify_deactivate_dmsf_files_path(:id => @file), - :title => l(:title_notifications_active_deactivate), - :class => 'icon icon-email') %> + notify_deactivate_dmsf_files_path(id: @file), + title: l(:title_notifications_active_deactivate), + class: 'icon icon-email') %> <% else %> <%= link_to(l(:label_notifications_on), - notify_activate_dmsf_files_path(:id => @file), - :title => l(:title_notifications_not_active_activate), - :class => 'icon icon-email-add') %> + notify_activate_dmsf_files_path(id: @file), + title: l(:title_notifications_not_active_activate), + class: 'icon icon-email-add') %> <% end %> <%= link_to(l(:label_link_to), - new_dmsf_link_path(:project_id => @project.id, :dmsf_folder_id => @file.dmsf_folder ? @file.dmsf_folder.id : nil, :dmsf_file_id => @file.id, :type => 'link_to'), - :title => l(:title_create_link), - :class => 'icon icon-link') %> - <%= link_to("#{l(:button_copy)}/#{l(:button_move)}", copy_file_path(:id => @file), - :title => l(:title_copy), :class => 'icon icon-copy') %> - <%= delete_link(dmsf_file_path(:id => @file, :details => true)) if @file_delete_allowed %> + new_dmsf_link_path(project_id: @project.id, dmsf_folder_id: @file.dmsf_folder ? @file.dmsf_folder.id : nil, dmsf_file_id: @file.id, type: 'link_to'), + title: l(:title_create_link), + class: 'icon icon-link') %> + <%= link_to("#{l(:button_copy)}/#{l(:button_move)}", copy_file_path(id: @file), + title: l(:title_copy), class: 'icon icon-copy') %> + <%= delete_link(dmsf_file_path(id: @file, details: true)) if @file_delete_allowed %> <% end %> <% end %> -<%= render(:partial => '/dmsf/path', - :locals => {:folder => @file.dmsf_folder, :filename => @file.title, :title => nil}) %> +<%= render(partial: '/dmsf/path', locals: { folder: @file.dmsf_folder, filename: @file.title, title: nil}) %> <% if @file_manipulation_allowed && !@file.locked_for_user? %> <%= error_messages_for('file') %> <%= error_messages_for('revision') %> - <%= render(:partial => 'file_new_revision') %> + <%= render(partial: 'file_new_revision') %> <% end %> -
- <%= label_tag('', l(:label_document)) %> - <%= "##{@file.id}" %> +
+ <%= label_tag('', l(:label_document)) %> + #<%= "#{@file.id}" %>

<%= l(:heading_revisions) %>

<% @file.dmsf_file_revisions.visible[@revision_pages.offset, @revision_pages.per_page].each do |revision| %> -
+
<%= link_to_function image_tag('group.png'), "$('#revision_access-#{revision.id}').toggle()", - :title => l(:title_download_entries) %> + title: l(:title_download_entries) %> <%= link_to image_tag('download.png'), - view_dmsf_file_path(@file, :download => revision), - :title => l(:title_title_version_version_download, :title => h(revision.title), :version => revision.version) %> + view_dmsf_file_path(@file, download: revision), + title: l(:title_title_version_version_download, title: h(revision.title), version: revision.version) %> <%= link_to image_tag('close_hl.png'), obsolete_revision_path(revision), - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:title_obsolete_revision) if @file_manipulation_allowed && (revision.workflow == DmsfWorkflow::STATE_APPROVED) %> + data: { confirm: l(:text_are_you_sure) }, + title: l(:title_obsolete_revision) if @file_manipulation_allowed && (revision.workflow == DmsfWorkflow::STATE_APPROVED) %> <%= link_to image_tag('delete.png'), delete_revision_path(revision), - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:title_delete_revision) if @file_delete_allowed && (@file.dmsf_file_revisions.visible.count > 1) %> + data: { confirm: l(:text_are_you_sure) }, + title: l(:title_delete_revision) if @file_delete_allowed && (@file.dmsf_file_revisions.visible.count > 1) %>
- <%= l(:info_revision, :rev => revision.id) %> + <%= l(:info_revision, rev: revision.id) %> <%= (revision.source_revision.nil? ? l(:label_created) : l(:label_changed)).downcase %> <%= l(:info_changed_by_user, :changed => format_time(revision.updated_at)) %> <%= link_to(revision.user.name, user_path(revision.user)) if revision.user %> @@ -106,69 +105,69 @@
- <%= content_tag :div, l(:label_title), :class => 'label' %> - <%= content_tag :div, h(revision.title), :class => 'value' %> + <%= content_tag :div, l(:label_title), class: 'label' %> + <%= content_tag :div, h(revision.title), class: 'value' %>
<% if revision.description.present? %>
- <%= content_tag :div, l(:label_description), :class => 'label' %> + <%= content_tag :div, l(:label_description), class: 'label' %> <% text = clean_wiki_text(textilizable(h revision.description)) %> - <%= content_tag :div, text.html_safe, :class => 'value wiki' %> + <%= content_tag :div, text.html_safe, class: 'value wiki' %>
<% end %>
- <%= content_tag :div, l(:label_dmsf_version), :class => 'label' %> - <%= content_tag :div, "#{revision.version}", :class => 'value' %> + <%= content_tag :div, l(:label_dmsf_version), class: 'label' %> + <%= content_tag :div, "#{revision.version}", class: 'value' %>
- <%= content_tag :div, l(:label_size), :class => 'label' %> - <%= content_tag :div, number_to_human_size(revision.size), :class => 'value' %> + <%= content_tag :div, l(:label_size), class: 'label' %> + <%= content_tag :div, number_to_human_size(revision.size), class: 'value' %>
<% wf = DmsfWorkflow.find_by(id: revision.dmsf_workflow_id) %> <% if wf %>
- <%= content_tag :div, l(:label_workflow), :class => 'label' %> + <%= content_tag :div, l(:label_workflow), class: 'label' %>
<%= "#{wf.name} - " %> <%= link_to(revision.workflow_str(false), - log_dmsf_workflow_path(:project_id => @project.id, - :id => wf.id, :dmsf_file_revision_id => revision.id), - :title => revision.workflow_tooltip, - :remote => true) %> + log_dmsf_workflow_path(project_id: @project.id, + id: wf.id, dmsf_file_revision_id: revision.id), + title: revision.workflow_tooltip, + remote: true) %>
<% end %> <% if revision.comment.present? %>
- <%= content_tag :div, l(:label_comment), :class => 'label' %> + <%= content_tag :div, l(:label_comment), class: 'label' %> <% text = clean_wiki_text(textilizable(h revision.comment)) %> - <%= content_tag :div, text.html_safe, :class => 'value wiki' %> + <%= content_tag :div, text.html_safe, class: 'value wiki' %>
<% end %>
- <%= content_tag :div, l(:label_file), :class => 'label' %> + <%= content_tag :div, l(:label_file), class: 'label' %>
<% path = "#{revision.dmsf_file.dmsf_folder.dmsf_path_str}/" if revision.dmsf_file.dmsf_folder %> <%= h("#{path}#{revision.name}") %>
- <%= content_tag :div, l(:label_mime), :class => 'label' %> - <%= content_tag :div, revision.mime_type, :class => 'value' %> + <%= content_tag :div, l(:label_mime), class: 'label' %> + <%= content_tag :div, revision.mime_type, class: 'value' %>
<% if revision.digest.present? %>
- <%= content_tag :div, l(:field_digest), :class => 'label' %> - <%= content_tag :div, "#{revision.digest_type}: #{revision.digest}", :class => 'value wiki' %> + <%= content_tag :div, l(:field_digest), class: 'label' %> + <%= content_tag :div, "#{revision.digest_type}: #{revision.digest}", class: 'value wiki' %>
<% end %> - <%= render 'dmsf/custom_fields', :object => revision %> + <%= render 'dmsf/custom_fields', object: revision %>
" style="display:none"> - <%= render(:partial => 'revision_access', :locals => {:revision => revision}) if @file_manipulation_allowed %> + <%= render(:partial => 'revision_access', locals: { revision: revision }) if @file_manipulation_allowed %>
@@ -178,6 +177,8 @@ <%= pagination_links_full @revision_pages, @file.dmsf_file_revisions.visible.count %> <%= late_javascript_tag do %> + $('.dmsf_controls').show(); + $('#browser').show(); $('a.delete-revision').click(function(event) { if(!window.confirm('<%= l(:text_are_you_sure) %>')) { event.preventDefault(); @@ -207,6 +208,9 @@ $('.dmsf_list').dataTable({ language: { url: "<%= plugin_asset_path(:redmine_dmsf, 'javascripts', json_url) %>" + }, + oLanguage: { + sSearch: "<%= l(:description_filter) %>:" } }); <% end %> @@ -218,6 +222,6 @@ <% end %> <% content_for :header_tags do %> - <%= stylesheet_link_tag 'jquery.dataTables/datatables.min.css', :plugin => :redmine_dmsf %> - <%= javascript_include_tag 'jquery.dataTables/datatables.min.js', :plugin => :redmine_dmsf, defer: true %> + <%= stylesheet_link_tag 'jquery.dataTables/datatables.min.css', plugin: :redmine_dmsf %> + <%= javascript_include_tag 'jquery.dataTables/datatables.min.js', plugin: :redmine_dmsf, defer: true %> <% end %> diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css index 26916d68..a63dbef3 100644 --- a/assets/stylesheets/redmine_dmsf.css +++ b/assets/stylesheets/redmine_dmsf.css @@ -102,11 +102,6 @@ table.display thead th div.DataTables_sort_wrapper span { display: block; } -/* Move 10-25-50-100 entries in Download entries data table to the visible area */ -div.dataTables_length label { - margin-left: -24px; -} - /* Comptibility with Easy SW: sorting icons are not visible do */ .ui-state-default .ui-icon, .ui-icon-circle-plus, @@ -131,6 +126,14 @@ div.dataTables_length label { font-size: 0.9em; } +/* Revision's downloads box */ +.dmsf_revision_box .dataTables_length label, +.dmsf_revision_box .dataTables_length select, +.dmsf_revision_box .dataTables_filter label, +.dmsf_revision_box .dataTables_filter input { + font-weight: normal; +} + #dmsf_buttons.dmsf_controls { float: left } @@ -223,16 +226,12 @@ div.dmsf_revision_inner_box .attribute .label { .dmsf_id_box { float: right; white-space: nowrap; - line-height: 1.5em; + line-height: 24px; color: #505050; margin-top: 5px; padding-left: 10px; } -.dmsf_revision_box .ui-widget-header { - font-weight: normal; -} - .dmsf_log_header_box{ padding:6px; margin-bottom: 10px;
<%= l(:field_user) %>