From 9980d26a9a9381e4cd2e8f6747a7625aa7fd6479 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Wed, 30 Mar 2016 08:59:28 +0200 Subject: [PATCH] A typing mistake --- app/views/dmsf/show.html.erb | 108 +++++++++++++++++----------------- app/views/dmsf/trash.html.erb | 82 +++++++++++++------------- assets/stylesheets/dmsf.css | 26 ++++---- 3 files changed, 108 insertions(+), 108 deletions(-) diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb index a1c7ab41..c218b2c8 100644 --- a/app/views/dmsf/show.html.erb +++ b/app/views/dmsf/show.html.erb @@ -24,28 +24,28 @@ <% html_title l(:dmsf) %>
- <% if @folder_manipulation_allowed %> - <% if @folder.nil? %> + <% if @folder_manipulation_allowed %> + <% if @folder.nil? %> <%= link_to(l(:button_edit), edit_root_dmsf_path(:id => @project), - :title => l(:link_edit, :title => l(:link_documents)), + :title => l(:link_edit, :title => l(:link_documents)), :class => 'icon icon-edit') %> - <% elsif !@locked_for_user %> - <%= link_to(l(:button_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)), + :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? %> + <% 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 dmsf_icon-unlock') %> + :title => l(:title_unlock_folder), :class => 'icon dmsf_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 dmsf_icon-lock') %> <% end %> - <% 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), @@ -56,34 +56,34 @@ notify_activate_dmsf_path(:id => @project, :folder_id => @folder), :title => l(:title_notifications_not_active_activate), :class => 'icon dmsf_icon-notification-off') %> - <% end %> + <% end %> <% if @file_manipulation_allowed && !@locked_for_user %> - <%= link_to(l(:label_link_from), + <%= 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 dmsf_icon-link') %> - <% end %> - <%= link_to(l(:link_create_folder), + <% end %> + <%= link_to(l(:link_create_folder), new_dmsf_path(:id => @project, :parent_id => @folder), - :title => l(:link_create_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 %>
-<%= render(:partial => 'path', +<%= render(:partial => 'path', :locals => {:folder => @folder, :filename => nil, :title => nil}) %>
<%= textilizable(@folder ? @folder.description : @project.dmsf_description) %> -
+
<%= error_messages_for('dmsf_workflow') %> <%= form_tag({:action => :entries_operation, :id => @project, :folder_id => @folder}, :method => :post, - :class => 'dmfs_entries', :id => 'entries_form') do %> + :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 %> @@ -94,11 +94,11 @@
<% values = @folder ? @folder.custom_field_values : @parent ? @parent.custom_field_values : DmsfFolder.new(:project => @project).custom_field_values %> <% unless values.empty? %> -
+
<%= custom_field_tag_with_label( - :dmsf_folder, + :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 %>
@@ -120,44 +120,44 @@ - - <% @subfolders.each do |subfolder| %> + + <% @subfolders.each do |subfolder| %> - <%= render(:partial => 'dir', - :locals => { - :project => @project, - :subfolder => subfolder, + <%= render(:partial => 'dir', + :locals => { + :project => @project, + :subfolder => subfolder, :link => nil, - :id => subfolder.id, - :name => 'subfolders[]', + :id => subfolder.id, + :name => 'subfolders[]', :title => subfolder.title }) %> - <% end %> + <% end %> <% @dir_links.each do |link| %> <% unless link.target_project %> <% Rails.logger.error "Error: dmsf_link id #{link.id} has no target!" %> <% next %> - <% end %> + <% end %> - <%= render(:partial => 'dir', - :locals => { - :project => link.target_project, - :subfolder => link.target_folder, + <%= render(:partial => 'dir', + :locals => { + :project => link.target_project, + :subfolder => link.target_folder, :link => link, - :id => link.id, - :name => 'dir_links[]', + :id => link.id, + :name => 'dir_links[]', :title => link.name }) %> - <% end %> + <% end %> <% @files.each do |file| %> - <% unless file.last_revision %> + <% unless file.last_revision %> <% Rails.logger.error "Error: dmsf_file id #{file.id} has no revision!" %> <% next %> - <% end %> + <% end %> - <%= render(:partial => 'file', :locals => { - :project => @project, - :file => file, + <%= render(:partial => 'file', :locals => { + :project => @project, + :file => file, :link => nil, :id => file.id, :name => 'files[]', @@ -193,37 +193,37 @@
-<% end %> +<% end %> -<% +<% sUrl = "jquery.dataTables/#{I18n.locale.to_s.downcase}.json" sUrl = 'jquery.dataTables/en.json' unless File.exist?(sUrl) %> -<% content_for :header_tags do %> +<% 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' %> + <%= stylesheet_link_tag 'jquery.dataTables/jquery-ui.dataTables.css', :plugin => 'redmine_dmsf' %> <%= javascript_include_tag 'jquery.dataTables/jquery.dataTables.min.js', :plugin => 'redmine_dmsf' %> - <% end %> diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb index b34082b4..9b9a232c 100644 --- a/app/views/dmsf/trash.html.erb +++ b/app/views/dmsf/trash.html.erb @@ -27,13 +27,13 @@
<%= textilizable(@folder ? @folder.description : @project.dmsf_description) %> -
+
<%= error_messages_for('dmsf_workflow') %> <%= form_tag({:action => :entries_operation, :id => @project, :folder_id => @folder}, :method => :post, - :class => 'dmfs_entries', :id => 'entries_form') do %> + :class => 'dmsf_entries', :id => 'entries_form') do %> <%= hidden_field_tag('action') %>
<% if @file_manipulation_allowed && @folder_manipulation_allowed %> @@ -41,7 +41,7 @@ <% if @file_delete_allowed%> <%= submit_tag(l(:button_delete), :title => l(:title_delete_checked), :name => 'destroy_entries') %> <% end %> - <% end %> + <% end %>
@@ -63,40 +63,40 @@ - - <% @subfolders.each do |subfolder| %> + + <% @subfolders.each do |subfolder| %> - <%= render(:partial => 'dir_trash', - :locals => { - :project => @project, - :subfolder => subfolder, + <%= render(:partial => 'dir_trash', + :locals => { + :project => @project, + :subfolder => subfolder, :link => nil, - :id => subfolder.id, - :name => 'subfolders[]', + :id => subfolder.id, + :name => 'subfolders[]', :title => subfolder.title }) %> - <% end %> - <% @dir_links.each do |link| %> + <% end %> + <% @dir_links.each do |link| %> - <%= render(:partial => 'dir_trash', - :locals => { - :project => link.target_project, - :subfolder => link.target_folder, + <%= render(:partial => 'dir_trash', + :locals => { + :project => link.target_project, + :subfolder => link.target_folder, :link => link, - :id => link.id, - :name => 'dir_links[]', + :id => link.id, + :name => 'dir_links[]', :title => link.name }) %> - <% end %> + <% end %> <% @files.each do |file| %> - <% unless file.last_revision %> + <% unless file.last_revision %> <% Rails.logger.error "Error: dmsf_file id #{file.id} has no revision!" %> <% next %> - <% end %> + <% end %> - <%= render(:partial => 'file_trash', :locals => { - :project => @project, - :file => file, + <%= render(:partial => 'file_trash', :locals => { + :project => @project, + :file => file, :link => nil, :id => file.id, :name => 'files[]', @@ -104,14 +104,14 @@ <% end %> <% @file_links.each do |link| %> - <% unless link.target_file.last_revision %> + <% unless link.target_file.last_revision %> <% Rails.logger.error "Error: dmsf_file id #{link.target_id} has no revision!" %> <% next %> - <% end %> + <% end %> - <%= render(:partial => 'file_trash', :locals => { - :project => link.target_project, - :file => link.target_file, + <%= render(:partial => 'file_trash', :locals => { + :project => link.target_project, + :file => link.target_file, :link => link, :id => link.id, :name => 'file_links[]', @@ -132,24 +132,24 @@
-<% end %> +<% end %> <% @@ -157,11 +157,11 @@ sUrl = 'jquery.dataTables/en.json' unless File.exist?(sUrl) %> -<% content_for :header_tags do %> - <%= stylesheet_link_tag 'jquery.dataTables/jquery-ui.dataTables.css', :plugin => 'redmine_dmsf' %> +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'jquery.dataTables/jquery-ui.dataTables.css', :plugin => 'redmine_dmsf' %> <%= javascript_include_tag 'jquery.dataTables/jquery.dataTables.min.js', :plugin => 'redmine_dmsf' %> - <% end %> \ No newline at end of file diff --git a/assets/stylesheets/dmsf.css b/assets/stylesheets/dmsf.css index e4a7c917..de445d49 100644 --- a/assets/stylesheets/dmsf.css +++ b/assets/stylesheets/dmsf.css @@ -48,9 +48,9 @@ table.list td.dmsf_buttons { } table.list th.dmsf_checkbox, -table.list td.dmsf_checkbox { - width: 15px; - padding: 2px 0 0 0; +table.list td.dmsf_checkbox { + width: 15px; + padding: 2px 0 0 0; } table.list th.dmsf_checkbox input { @@ -61,7 +61,7 @@ table.list th.dmsf_checkbox div.DataTables_sort_wrapper { padding: 0; } -form.dmfs_entries { +form.dmsf_entries { margin-bottom: 10px; display: block; } @@ -69,14 +69,14 @@ form.dmfs_entries { div.dmsf_controls, div.dmsf_controls input, div.dmsf_controls select, -form.dmfs_entries #browser_filter.dataTables_filter, -form.dmfs_entries #browser_filter.dataTables_filter input{ +form.dmsf_entries #browser_filter.dataTables_filter, +form.dmsf_entries #browser_filter.dataTables_filter input{ font-size: 0.9em; } div.dmsf_filename { - padding: 0 10px 0 10px; - float: right; + padding: 0 10px 0 10px; + float: right; font-size: 0.8em; white-space: nowrap; } @@ -110,7 +110,7 @@ td.dmsf_workflow { } div.dmsf_upload_select { - float: right; + float: right; font-size: 0.9em; } @@ -129,7 +129,7 @@ tr.dmsf_workflow.locked a { color: #aaa; } margin-bottom: 10px; background-color:#f6f6f6; color:#505050; - line-height:1.5em; + line-height:1.5em; } .dmsf_revision_inner_box { @@ -142,7 +142,7 @@ tr.dmsf_workflow.locked a { color: #aaa; } line-height: 1.5em; color: #505050; margin-top: 5px; - padding-left: 10px; + padding-left: 10px; } div.dmsf_revision_box .ui-widget-header { @@ -151,11 +151,11 @@ div.dmsf_revision_box .ui-widget-header { .dmsf_log_header_box{ padding:6px; - margin-bottom: 10px; + margin-bottom: 10px; } .dmsf_log_header_left { width: 50%; - float: left; + float: left; } .dmsf_log_header_box label{