From 417e80bbcf4c086665f8bae240da25733673fda4 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Wed, 9 Mar 2016 14:53:09 +0100 Subject: [PATCH] CCS Redmine style --- app/controllers/dmsf_files_copy_controller.rb | 12 +- app/controllers/dmsf_links_controller.rb | 6 +- app/models/dmsf_link.rb | 12 +- app/views/dmsf/_custom_fields.html.erb | 19 ++- app/views/dmsf/_dir.html.erb | 10 +- app/views/dmsf/_dir_trash.html.erb | 10 +- app/views/dmsf/_file.html.erb | 10 +- app/views/dmsf/_file_trash.html.erb | 10 +- app/views/dmsf/_path.html.erb | 10 +- app/views/dmsf/_url.html.erb | 10 +- app/views/dmsf/_url_trash.html.erb | 12 +- app/views/dmsf/edit.html.erb | 54 +++---- app/views/dmsf/edit_root.html.erb | 26 ++-- app/views/dmsf/email_entries.html.erb | 53 ++++--- app/views/dmsf/show.html.erb | 15 +- app/views/dmsf/trash.html.erb | 18 +-- .../dmsf_files/_file_new_revision.html.erb | 142 ++++++++---------- .../dmsf_files/_revision_access.html.erb | 18 ++- app/views/dmsf_files/show.html.erb | 117 ++++++++------- app/views/dmsf_files_copy/new.html.erb | 42 +++--- app/views/dmsf_folders_copy/new.html.erb | 23 +-- app/views/dmsf_links/_form.html.erb | 68 +++++---- app/views/dmsf_upload/_upload_file.html.erb | 79 +++++----- .../dmsf_upload/_upload_file_locked.html.erb | 65 ++++---- app/views/dmsf_upload/upload_files.html.erb | 13 +- app/views/dmsf_workflows/_main.html.erb | 7 +- app/views/dmsf_workflows/new.html.erb | 4 +- assets/stylesheets/dmsf.css | 120 +++------------ test/unit/dmsf_link_test.rb | 21 ++- 29 files changed, 497 insertions(+), 509 deletions(-) diff --git a/app/controllers/dmsf_files_copy_controller.rb b/app/controllers/dmsf_files_copy_controller.rb index 5213e3ff..85b8af9b 100644 --- a/app/controllers/dmsf_files_copy_controller.rb +++ b/app/controllers/dmsf_files_copy_controller.rb @@ -40,15 +40,15 @@ class DmsfFilesCopyController < ApplicationController render :layout => !request.xhr? end - + def create @target_project = DmsfFile.allowed_target_projects_on_copy.detect {|p| p.id.to_s == params[:target_project_id]} if params[:target_project_id] unless @target_project render_403 return end - @target_folder = DmsfFolder.visible.find(params[:target_folder_id]) unless params[:target_folder_id].blank? - if !@target_folder.nil? && @target_folder.project != @target_project + @target_folder = DmsfFolder.visible.find_by_id(params[:target_folder_id]) unless params[:target_folder_id].blank? + if @target_folder && (@target_folder.project != @target_project) raise DmsfAccessError, l(:error_entry_project_does_not_match_current_project) end @@ -103,10 +103,10 @@ class DmsfFilesCopyController < ApplicationController log_activity(@file, 'was moved (is copy)') redirect_to dmsf_file_path(@file) - end - - private + end +private + def log_activity(file, action) Rails.logger.info "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} #{User.current.login}@#{request.remote_ip}/#{request.env['HTTP_X_FORWARDED_FOR']}: #{action} dmsf://#{file.project.identifier}/#{file.id}/#{file.last_revision.id}" end diff --git a/app/controllers/dmsf_links_controller.rb b/app/controllers/dmsf_links_controller.rb index 9a9a5d8e..ca03b680 100644 --- a/app/controllers/dmsf_links_controller.rb +++ b/app/controllers/dmsf_links_controller.rb @@ -2,7 +2,7 @@ # # Redmine plugin for Document Management System "Features" # -# Copyright (C) 2011-15 Karel Pičman +# Copyright (C) 2011-16 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 @@ -31,8 +31,8 @@ class DmsfLinksController < ApplicationController @dmsf_link.project_id = params[:project_id] if params[:dmsf_link].present? - # Reload - @dmsf_link.dmsf_folder_id = params[:dmsf_link][:dmsf_folder_id] # TODO: Add stuff in here for external links so that if error occurs, repopulate the same + # Reload + @dmsf_link.dmsf_folder_id = params[:dmsf_link][:dmsf_folder_id] @dmsf_file_id = params[:dmsf_link][:dmsf_file_id] @type = params[:dmsf_link][:type] @link_external = (@type == 'link_from') && (params[:external_link] == 'true') diff --git a/app/models/dmsf_link.rb b/app/models/dmsf_link.rb index 897f9697..d0fa4152 100644 --- a/app/models/dmsf_link.rb +++ b/app/models/dmsf_link.rb @@ -34,8 +34,12 @@ class DmsfLink < ActiveRecord::Base def validate_url if self.target_type == 'DmsfUrl' - begin - URI.parse self.external_url + begin + if self.external_url.present? + URI.parse self.external_url + else + errors.add :external_url, :invalid + end rescue URI::InvalidURIError errors.add :external_url, :invalid end @@ -124,7 +128,7 @@ class DmsfLink < ActiveRecord::Base else self.deleted = STATUS_DELETED self.deleted_by_user = User.current - save + save(:validate => false) end end @@ -135,7 +139,7 @@ class DmsfLink < ActiveRecord::Base end self.deleted = STATUS_ACTIVE self.deleted_by_user = nil - save + save(:validate => false) end end \ No newline at end of file diff --git a/app/views/dmsf/_custom_fields.html.erb b/app/views/dmsf/_custom_fields.html.erb index 35db5d05..0222e6a7 100644 --- a/app/views/dmsf/_custom_fields.html.erb +++ b/app/views/dmsf/_custom_fields.html.erb @@ -1,7 +1,11 @@ -<%# Redmine plugin for Document Management System "Features" +<% +# encoding: utf-8 # -# Copyright (C) 2011 Vít Jonáš -# Copyright (C) 2012 Daniel Munn +# Redmine plugin for Document Management System "Features" +# +# Copyright (C) 2011 Vít Jonáš +# Copyright (C) 2012 Daniel Munn +# Copyright (C) 2011-16 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 @@ -18,11 +22,12 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.%> <% if object %> -
+
<% object.show_custom_field_values.each do |custom_value| %> -
- <%= label_tag('', "#{h(custom_value.custom_field.name)}:") %> <%= show_value(custom_value) %> -
+

+ <%= label_tag('', h(custom_value.custom_field.name)) %> + <%= show_value custom_value %> +

<% end %>
<% end %> \ No newline at end of file diff --git a/app/views/dmsf/_dir.html.erb b/app/views/dmsf/_dir.html.erb index 94e1f721..0c543231 100644 --- a/app/views/dmsf/_dir.html.erb +++ b/app/views/dmsf/_dir.html.erb @@ -1,4 +1,4 @@ -<%#= +<% # encoding: utf-8 # # Redmine plugin for Document Management System "Features" @@ -23,9 +23,9 @@ <% locked_for_user = subfolder && subfolder.locked_for_user? %> <% locked = subfolder && subfolder.locked? %> -<%= check_box_tag(name, id, false, +<%= check_box_tag(name, id, false, :title => l(:title_check_for_zip_download_or_email), :id => "subfolder_#{id}") %> - + <%= link_to(h(title), dmsf_folder_path(:id => project, :folder_id => subfolder), :class => 'icon icon-folder') %> @@ -36,7 +36,7 @@ <% end %> -<%= format_time(subfolder.modified) if subfolder %> +<%= format_time(subfolder.modified) if subfolder %> <% if locked_for_user %> <% if subfolder.lock.reverse[0].user %> <%= link_to(image_tag(link ? 'locked_gray.png' : 'locked.png', :plugin => 'redmine_dmsf'), @@ -54,7 +54,7 @@ <%= h(subfolder.user) if subfolder %> - + <% if @folder_manipulation_allowed %> <% unless locked_for_user %> <%= link_to(image_tag('edit.png'), diff --git a/app/views/dmsf/_dir_trash.html.erb b/app/views/dmsf/_dir_trash.html.erb index 3867abbf..6abda6b2 100644 --- a/app/views/dmsf/_dir_trash.html.erb +++ b/app/views/dmsf/_dir_trash.html.erb @@ -1,4 +1,4 @@ -<%#= +<% # encoding: utf-8 # # Redmine plugin for Document Management System "Features" @@ -20,9 +20,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> -<%= check_box_tag(name, id, false, +<%= check_box_tag(name, id, false, :title => l(:title_check_for_restore_or_delete), :id => "subfolder_#{id}") %> - + <%= content_tag(:span, h(title), :title => h(title), :class => 'icon icon-folder') %> @@ -33,13 +33,13 @@ <% end %> - + <%= format_time(subfolder.modified) if subfolder %> <%= h(subfolder.user) %> - + <% if @folder_manipulation_allowed %> <%= link_to(image_tag('restore.png', :plugin => 'redmine_dmsf'), restore_dmsf_path(:id => project, :folder_id => subfolder), diff --git a/app/views/dmsf/_file.html.erb b/app/views/dmsf/_file.html.erb index f822b055..e4e36679 100644 --- a/app/views/dmsf/_file.html.erb +++ b/app/views/dmsf/_file.html.erb @@ -1,4 +1,4 @@ -<%#= +<% # encode: utf-8 # # Redmine plugin for Document Management System "Features" @@ -22,9 +22,9 @@ <% wf = DmsfWorkflow.find_by_id(file.last_revision.dmsf_workflow_id) %> -<%= check_box_tag(name, id, false, +<%= check_box_tag(name, id, false, :title => l(:title_check_for_zip_download_or_email), :id => "file_#{id}") %> - + <% file_view_url = url_for({:controller => :dmsf_files, :action => 'view', :id => file}) %> <%= link_to(h(title), file_view_url, @@ -35,7 +35,7 @@
<%= h(link ? link.path : file.display_name) %>
<%= number_to_human_size(file.last_revision.size) %> - + <%= format_time(file.last_revision.updated_at) %> <% if file.locked_for_user? %> <% if file.lock.reverse[0].user %> @@ -67,7 +67,7 @@ <% end %> <%= h(file.last_revision.user) %> - + <% if @file_manipulation_allowed %> <%= link_to(image_tag('filedetails.png', :plugin => 'redmine_dmsf'), dmsf_file_path(:id => file), diff --git a/app/views/dmsf/_file_trash.html.erb b/app/views/dmsf/_file_trash.html.erb index 3f0c9687..3a7f2d41 100644 --- a/app/views/dmsf/_file_trash.html.erb +++ b/app/views/dmsf/_file_trash.html.erb @@ -1,4 +1,4 @@ -<%#= +<% # encoding: utf-8 # # Redmine plugin for Document Management System "Features" @@ -20,16 +20,16 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> -<%= check_box_tag(name, id, false, +<%= check_box_tag(name, id, false, :title => l(:title_check_for_restore_or_delete), :id => "file_#{id}") %> - + <%= content_tag(:span, h(title), :title => h(title), :class => "icon icon-file #{DmsfHelper.filetype_css(file.name)}") %>
<%= h(link ? link.path : file.display_name) %>
<%= number_to_human_size(file.last_revision.size) %> - + <%= format_time(file.last_revision.updated_at) %> <%= file.last_revision.version %> @@ -37,7 +37,7 @@ <%= file.last_revision.workflow_str(false) %> <%= h(file.last_revision.user) %> - + <% if @file_manipulation_allowed %> <% if link %> <%= link_to(image_tag('restore.png', :plugin => 'redmine_dmsf'), diff --git a/app/views/dmsf/_path.html.erb b/app/views/dmsf/_path.html.erb index 1534f402..0b19ba3d 100644 --- a/app/views/dmsf/_path.html.erb +++ b/app/views/dmsf/_path.html.erb @@ -17,14 +17,15 @@ # # 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.%> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +%>

<% if folder %> <%= link_to l(:link_documents), dmsf_folder_path(:id => @project) %> <% folder.dmsf_path.each do |path_element| %> / - <% if !filename && path_element == folder.dmsf_path.last %> + <% if filename.blank? && (path_element == folder.dmsf_path.last) %> <%= h(path_element.title) %> <% else %> <%= link_to h(path_element.title), dmsf_folder_path(:id => @project, :folder_id => path_element) %> @@ -37,4 +38,7 @@ / <%= h(filename) %> <% end %> -

+ <% if title %> + » <%= title %> + <% end %> + \ No newline at end of file diff --git a/app/views/dmsf/_url.html.erb b/app/views/dmsf/_url.html.erb index 28bfd7e9..921a51d6 100644 --- a/app/views/dmsf/_url.html.erb +++ b/app/views/dmsf/_url.html.erb @@ -1,4 +1,4 @@ -<%#= +<% # encoding: utf-8 # # Redmine plugin for Document Management System "Features" @@ -20,8 +20,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> - - + + <%= link_to(h(title), link.external_url, :target => '_blank', @@ -31,11 +31,11 @@
-<%= format_time(link.updated_at) %> +<%= format_time(link.updated_at) %> <%= h(link.user) %> - + diff --git a/app/views/dmsf/_url_trash.html.erb b/app/views/dmsf/_url_trash.html.erb index 926e9bf7..02cab0a8 100644 --- a/app/views/dmsf/_url_trash.html.erb +++ b/app/views/dmsf/_url_trash.html.erb @@ -1,9 +1,9 @@ -<%#= +<% # encoding: utf-8 # # Redmine plugin for Document Management System "Features" # -# Copyright (C) 2011-15 Karel Pičman +# Copyright (C) 2011-16 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 @@ -20,9 +20,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> -<%= check_box_tag(name, id, false, +<%= check_box_tag(name, id, false, :title => l(:title_check_for_restore_or_delete)) %> - + <%= link_to(h(title), link.external_url, :target => "_blank", @@ -30,11 +30,11 @@
<%= link.external_url %>
-<%= format_time(link.updated_at) %> +<%= format_time(link.updated_at) %> <%= h(link.user) %> - + <% if @file_manipulation_allowed %> <%= link_to(image_tag('restore.png', :plugin => 'redmine_dmsf'), restore_dmsf_link_path(:id => link), diff --git a/app/views/dmsf/edit.html.erb b/app/views/dmsf/edit.html.erb index 300e2c15..a3e336a9 100644 --- a/app/views/dmsf/edit.html.erb +++ b/app/views/dmsf/edit.html.erb @@ -1,4 +1,4 @@ -<%# +<% # encoding: utf-8 # # Redmine plugin for Document Management System "Features" @@ -19,7 +19,8 @@ # # 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.%> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +%> <% html_title(l(:dmsf)) %> @@ -64,41 +65,34 @@ <% create = @pathfolder == @parent %> -<%= render(:partial => 'path', :locals => {:folder => @pathfolder, :filename => create ? l(:heading_new_folder) : nil}) %> +<%= render(:partial => 'path', + :locals => {:folder => @pathfolder, :filename => create ? l(:heading_new_folder) : nil, :title => nil}) %> <%= form_for(@folder, :url => {:action => create ? 'create' : 'save', :id => @project, :folder_id => @folder, :parent_id => @parent}, :html => {:method=>:post}) do |f| %> <%= error_messages_for(@folder) %> -
-
-
-

- <%= label_tag('dmsf_folder_title', "#{l(:label_title)}:") %> - <%= f.text_field(:title, :size => '32', :required => true) %> -

-
-
-

- <%= label_tag('', "#{l(:field_folder)}:") %> - <%= f.select(:dmsf_folder_id, - options_for_select(DmsfFolder.directory_tree(@project, @folder), - :selected => @parent? @parent.id : (@pathfolder.id if @pathfolder))) - %> -

-
-
-

- <%= label_tag('dmsf_folder_description', "#{l(:label_description)}:") %> +

+

+ + <%= f.text_field(:title, :size => '32', :required => true) %> +

+

+ <%= label_tag('', l(:field_folder)) %> + <%= f.select(:dmsf_folder_id, + options_for_select(DmsfFolder.directory_tree(@project, @folder), + :selected => @parent? @parent.id : (@pathfolder.id if @pathfolder))) + %> +

+

+ <%= label_tag('dmsf_folder_description', l(:label_description)) %> + <%= f.text_area :description, :rows => 8, :class => 'wiki-edit' %>

-
- <%= f.text_area(:description, :rows => 15, :class => 'wiki-edit') %> -
<% values = @folder ? @folder.custom_field_values : @parent ? @parent.custom_field_values : DmsfFolder.new(:project => @project).custom_field_values %> <% values.each do |value| %>

<%= custom_field_tag_with_label(:dmsf_folder, value) %>

- <% end %> -
- <%= submit_tag(create ? l(:submit_create) : l(:submit_save)) %> + <% end %> +
+

<%= submit_tag(create ? l(:submit_create) : l(:submit_save)) %>

<% end %> -<%= wikitoolbar_for 'dmsf_folder_description' %> +<%= wikitoolbar_for 'dmsf_folder_description' %> \ No newline at end of file diff --git a/app/views/dmsf/edit_root.html.erb b/app/views/dmsf/edit_root.html.erb index c16163be..3a6ec4a5 100644 --- a/app/views/dmsf/edit_root.html.erb +++ b/app/views/dmsf/edit_root.html.erb @@ -1,7 +1,11 @@ -<%# Redmine plugin for Document Management System "Features" +<% +# encoding: utf-8 # -# Copyright (C) 2011 Vít Jonáš -# Copyright (C) 2012 Daniel Munn +# Redmine plugin for Document Management System "Features" +# +# Copyright (C) 2011 Vít Jonáš +# Copyright (C) 2012 Daniel Munn +# Copyright (C) 2011-16 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 @@ -15,7 +19,8 @@ # # 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.%> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +%> <% html_title(l(:dmsf)) %> @@ -35,17 +40,16 @@ <% end %> -<%= render(:partial => 'path', :locals => {:folder => nil, :filename => nil}) %> +<%= render(:partial => 'path', + :locals => {:folder => nil, :filename => nil, :title => nil}) %> <%= form_for(@project, :url => {:action => 'save_root', :id => @project}, :html => {:method=>:post}) do |f| %> -
-

- <%= label_tag('project_dmsf_description', "#{l(:label_description)}:") %> +

+

+ <%= label_tag('project_dmsf_description', l(:label_description)) %> + <%= f.text_area(:dmsf_description, :rows => 8, :class => 'wiki-edit') %>

-
- <%= f.text_area(:dmsf_description, :rows => 15, :class => 'wiki-edit') %> -
<%= submit_tag(l(:submit_save)) %> <% end %> diff --git a/app/views/dmsf/email_entries.html.erb b/app/views/dmsf/email_entries.html.erb index a4b180e0..ada3a4b9 100644 --- a/app/views/dmsf/email_entries.html.erb +++ b/app/views/dmsf/email_entries.html.erb @@ -1,8 +1,11 @@ -<%# Redmine plugin for Document Management System "Features" +<% +# encoding: utf-8 +# +# Redmine plugin for Document Management System "Features" # # Copyright (C) 2011 Vít Jonáš # Copyright (C) 2012 Daniel Munn -# Copyright (C) 2011-14 Karel Pičman +# Copyright (C) 2011-16 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 @@ -16,50 +19,50 @@ # # 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.%> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +%> <% html_title(l(:dmsf)) %> -
-
+<%= render(:partial => 'path', + :locals => {:folder => @folder, :filename => nil, :title => l(:heading_send_documents_by_email)}) %> -<%= render(:partial => 'path', :locals => {:folder => @folder, :filename => nil}) %> - -

<%= l(:heading_send_documents_by_email) %>

- -<%= form_tag({:action => 'entries_email', :id => @project, :folder_id => @folder}, - { :method=>:post, :class => 'tabular'}) do %> +<%= form_tag({ :action => 'entries_email', :id => @project, :folder_id => @folder }, + { :method => :post }) do %> <%= hidden_field_tag('email[zipped_content]', @email_params[:zipped_content]) %> <%= hidden_field_tag('email[folders]', @email_params[:folders].to_json) %> <%= hidden_field_tag('email[files]', @email_params[:files].to_json) %> -
+

- <%= label_tag('', "#{l(:label_email_from)}:") %> - <%= h(Setting.mail_from) %> + <%= label_tag('', l(:label_email_from)) %> + <%= text_field_tag('email[from]', h(Setting.mail_from), :style => 'width: 90%;', :disabled => true) %>

- <%= label_tag('email[to]', "#{l(:label_email_to)}:") %> + <%= label_tag('email[to]', l(:label_email_to)) %> <%= text_field_tag('email[to]', @email_params['to'], :style => 'width: 90%;') %>

- <%= label_tag('email[cc]', "#{l(:label_email_cc)}:") %> + <%= label_tag('email[cc]', l(:label_email_cc)) %> <%= text_field_tag('email[cc]', @email_params['cc'], :style => 'width: 90%;') %>

- <%= label_tag('email[subject]', "#{l(:label_email_subject)}:") %> + <%= label_tag('email[subject]', l(:label_email_subject)) %> <%= text_field_tag('email[subject]', @email_params['subject'], :style => 'width: 90%;') %>

- <%= label_tag('', "#{l(:label_email_documents)}:") %> - <%= link_to 'Documents.zip', download_email_entries_path(:id => @project, :folder_id => @folder, :path => @email_params[:zipped_content]) %> - <%= l(:label_or) %> <%= check_box_tag('email[links_only]') %> <%= l(:label_links_only) %> + <%= label_tag('', l(:label_email_documents)) %> + + <%= link_to 'Documents.zip', download_email_entries_path(:id => @project, :folder_id => @folder, :path => @email_params[:zipped_content]) %> + <%= l(:label_or) %> + <%= check_box_tag('email[links_only]') %> <%= l(:label_links_only) %> +

- <%= label_tag('email[body]', "#{l(:label_email_body)}:") %> - <%= text_area_tag('email[body]', @email_params['body'], :rows=> '20', :style => 'width: 90%;') %> -

-

<%= submit_tag(l(:label_email_send)) %>

+ <%= label_tag('email[body]', l(:label_email_body)) %> + <%= text_area_tag('email[body]', @email_params['body'], :rows => '20', :style => 'width: 90%;') %> +

+

<%= submit_tag(l(:label_email_send)) %>

<% end %> -<%= wikitoolbar_for 'email_body' %> +<%= wikitoolbar_for 'email_body' %> \ No newline at end of file diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb index c1a44069..4a8c91ba 100644 --- a/app/views/dmsf/show.html.erb +++ b/app/views/dmsf/show.html.erb @@ -1,4 +1,4 @@ -<%#= +<% # encoding: utf-8 # # Redmine plugin for Document Management System "Features" @@ -71,7 +71,8 @@ :title => l(:link_trash_bin), :class => 'icon icon-del') if @trash_visible %>
-<%= render(:partial => 'path', :locals => {:folder => @folder, :filename => nil}) %> +<%= render(:partial => 'path', + :locals => {:folder => @folder, :filename => nil, :title => nil}) %>
@@ -98,11 +99,12 @@ :dmsf_folder, CustomValue.new(:custom_field_id => params[:custom_field_id].present? ? params[:custom_field_id] : values.first.custom_field_id, :value => params[:custom_value])) %>
- <% end %> - + <% end %> +
+
- @@ -189,7 +191,8 @@ <% end %> -
+ <%= l(:link_title) %>
+ +
<% end %>