From d0a89f700181772888092a01e2d8af8f4f277e84 Mon Sep 17 00:00:00 2001
From: "vit.jonas@gmail.com"
 <vit.jonas@gmail.com@5e329b0b-a2ee-ea63-e329-299493fc886d>
Date: Thu, 2 Jun 2011 06:18:58 +0000
Subject: [PATCH] * fixed Issue 64: Related with the R112 change * translation
 cleanup

git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@118 5e329b0b-a2ee-ea63-e329-299493fc886d
---
 app/views/dmsf/_multi_upload.html.erb |  2 -
 app/views/dmsf/show.html.erb          | 55 +++++++++++------------
 app/views/dmsf_files/show.html.erb    | 64 +++++++++++++--------------
 config/locales/cs.yml                 |  2 +-
 config/locales/de.yml                 |  2 +-
 config/locales/en-GB.yml              |  2 +-
 config/locales/en.yml                 |  2 +-
 config/locales/es.yml                 |  2 +-
 config/locales/fr.yml                 |  2 +-
 config/locales/ja.yml                 |  2 +-
 config/locales/ru.yml                 |  2 +-
 11 files changed, 65 insertions(+), 72 deletions(-)

diff --git a/app/views/dmsf/_multi_upload.html.erb b/app/views/dmsf/_multi_upload.html.erb
index 57a811cd..8444872d 100644
--- a/app/views/dmsf/_multi_upload.html.erb
+++ b/app/views/dmsf/_multi_upload.html.erb
@@ -77,8 +77,6 @@
 	<% end %>
 	
 	<script type="text/javascript">
-		jQuery.noConflict();
-		
 		function initPlUploader(uploader) {
 			uploader.html("<div></div>");
 			uploader = jQuery("div",uploader);
diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb
index 565e6d9e..e489f81a 100644
--- a/app/views/dmsf/show.html.erb
+++ b/app/views/dmsf/show.html.erb
@@ -175,47 +175,44 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 			<button type="button" id="entries_delete_button" title="<%=l(:title_delete_checked)%>"><%=l(:button_delete)%></button>
 		<% end %>
 		<div style="float: right;">
-			<%= l(:label_number_of_folders)%>: <%= @subfolders.count %>, <%= l(:label_number_of_files)%>: <%= @files.count %>
+			<%= l(:label_number_of_folders)%>: <%= @subfolders.count %>, <%= l(:label_number_of_documents)%>: <%= @files.count %>
 		</div>
 	</div>
 	<br />
 <% end %>
 
+<script type="text/javascript">
+	jQuery("a.delete-link").click(function(event) {
+		if(!window.confirm("<%= l(:question_do_you_really_want_to_delete_this_entry) %>")) event.preventDefault();
+	})
+	
+	jQuery("#entries_delete_button").click(function(event) {
+		if(window.confirm("<%= l(:question_do_you_really_want_to_delete_entries) %>")) {
+			jQuery("#entries_form").attr("action", "<%= url_for(:action => 'delete_entries', :id => @project, :folder_id => @folder) %>");
+			jQuery("#entries_form").submit();
+		}
+	})
+	
+	jQuery("#check_all_entries").click(function(event) {
+		var $this = jQuery(this);
+		if($this.prop("checked")) {
+			jQuery("input[type=checkbox]", jQuery("#browser > tbody")).prop("checked", true);
+		} else {
+			jQuery("input[type=checkbox]", jQuery("#browser > tbody")).prop("checked", false);
+		}
+	})			
+</script>
+
 <% content_for :header_tags do %>
 	<%= stylesheet_link_tag "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.10/themes/base/jquery-ui.css" %>
 	<%= stylesheet_link_tag "plupload/jquery.ui.plupload.css", :plugin => "redmine_dmsf" %>
 	<%= stylesheet_link_tag "dmsf", :plugin => "redmine_dmsf" %>
 	
 	<%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js" %>
+	<script type="text/javascript">
+		jQuery.noConflict();
+	</script>
 <% end %>
 
 <%= render(:partial => "multi_upload") if User.current.allowed_to?(:file_manipulation, @project) %>
 <br />
-
-<% content_for :header_tags do %>
-	<script type="text/javascript">
-		jQuery.noConflict();
-		
-		jQuery(document).ready(function() {
-			jQuery("a.delete-link").click(function(event) {
-				if(!window.confirm("<%= l(:question_do_you_really_want_to_delete_this_entry) %>")) event.preventDefault();
-			})
-			
-			jQuery("#entries_delete_button").click(function(event) {
-				if(window.confirm("<%= l(:question_do_you_really_want_to_delete_entries) %>")) {
-					jQuery("#entries_form").attr("action", "<%= url_for(:action => 'delete_entries', :id => @project, :folder_id => @folder) %>");
-					jQuery("#entries_form").submit();
-				}
-			})
-			
-			jQuery("#check_all_entries").click(function(event) {
-				var $this = jQuery(this);
-				if($this.prop("checked")) {
-					jQuery("input[type=checkbox]", jQuery("#browser > tbody")).prop("checked", true);
-				} else {
-					jQuery("input[type=checkbox]", jQuery("#browser > tbody")).prop("checked", false);
-				}
-			})			
-		});
-	</script>
-<% end %>
\ No newline at end of file
diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb
index c2ef2483..09de1f8b 100644
--- a/app/views/dmsf_files/show.html.erb
+++ b/app/views/dmsf_files/show.html.erb
@@ -119,43 +119,41 @@
 
 <p class="pagination"><%= pagination_links_full @revision_pages, @file.revisions.count %></p>
 
+<script type="text/javascript">
+	jQuery("a.delete-revision").click(function(event) {
+		if(!window.confirm("<%= l(:question_do_you_really_want_to_delete_this_revision) %>")) event.preventDefault();
+	})
+	
+	jQuery("a.delete-entry").click(function(event) {
+		if(!window.confirm("<%= l(:question_do_you_really_want_to_delete_this_entry) %>")) event.preventDefault();
+	})
+	
+	jQuery("#file_upload").change(function() {
+		if(jQuery("input[name=\"version\"]:checked").val() == "0") {
+			jQuery("#fileMinorVersionRadio").prop("checked", true); 
+		}
+		jQuery("#fileSameVersionRadio").prop("disabled", true); 
+	});
+	
+	jQuery("#newRevisionFormContentToggle").toggle(function() {
+		jQuery("#newRevisionFormContentToggle").text("[-]");
+		jQuery("#newRevisionFormContent").show();
+	}, function() {
+		jQuery("#newRevisionFormContentToggle").text("[+]");
+		jQuery("#newRevisionFormContent").hide();
+	});
+</script>
+<% if @revision.valid? && @file.valid? %>
+<script type="text/javascript">
+	jQuery("#newRevisionFormContentToggle").text("[+]");
+	jQuery("#newRevisionFormContent").hide();
+</script>
+<% end %>
+
 <% content_for :header_tags do %>
 	<%= stylesheet_link_tag "dmsf", :plugin => "redmine_dmsf" %>
 	<%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js" %>
 	<script type="text/javascript">
 		jQuery.noConflict();
-		
-		jQuery(document).ready(function() {
-			jQuery("a.delete-revision").click(function(event) {
-				if(!window.confirm("<%= l(:question_do_you_really_want_to_delete_this_revision) %>")) event.preventDefault();
-			})
-			
-			jQuery("a.delete-entry").click(function(event) {
-				if(!window.confirm("<%= l(:question_do_you_really_want_to_delete_this_entry) %>")) event.preventDefault();
-			})
-			
-			jQuery("#file_upload").change(function() {
-				if(jQuery("input[name=\"version\"]:checked").val() == "0") {
-					jQuery("#fileMinorVersionRadio").prop("checked", true); 
-				}
-				jQuery("#fileSameVersionRadio").prop("disabled", true); 
-			});
-			
-			jQuery("#newRevisionFormContentToggle").toggle(function() {
-				jQuery("#newRevisionFormContentToggle").text("[-]");
-				jQuery("#newRevisionFormContent").show();
-			}, function() {
-				jQuery("#newRevisionFormContentToggle").text("[+]");
-				jQuery("#newRevisionFormContent").hide();
-			});
-		});
 	</script>
-	<% if @revision.valid? && @file.valid? %>
-	<script type="text/javascript">
-		jQuery(document).ready(function() {
-			jQuery("#newRevisionFormContentToggle").text("[+]");
-			jQuery("#newRevisionFormContent").hide();
-		});
-	</script>
-	<% end %>
 <% end %>
\ No newline at end of file
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 04849e09..ed039400 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -150,5 +150,5 @@ cs:
   :title_number_of_files_in_directory: "Number of files in directory"
   :title_filename_for_download: "Filename used for download or in Zip archive"
   :label_number_of_folders: "Folders"
-  :label_number_of_files: "Files"
+  :label_number_of_documents: "Documents"
   
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 1b9c319d..ff4589f2 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -146,5 +146,5 @@ de:
   :title_number_of_files_in_directory: "Number of files in directory"
   :title_filename_for_download: "Filename used for download or in Zip archive"
   :label_number_of_folders: "Folders"
-  :label_number_of_files: "Files"
+  :label_number_of_documents: "Documents"
   
\ No newline at end of file
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2ea6b4d9..683ad1b4 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -146,5 +146,5 @@ en-GB:
   :title_number_of_files_in_directory: "Number of files in directory"
   :title_filename_for_download: "Filename used for download or in Zip archive"
   :label_number_of_folders: "Folders"
-  :label_number_of_files: "Files"
+  :label_number_of_documents: "Documents"
   
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e8213671..2cb18243 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -150,5 +150,5 @@ en:
   :title_number_of_files_in_directory: "Number of files in directory"
   :title_filename_for_download: "Filename used for download or in Zip archive"
   :label_number_of_folders: "Folders"
-  :label_number_of_files: "Files"
+  :label_number_of_documents: "Documents"
   
\ No newline at end of file
diff --git a/config/locales/es.yml b/config/locales/es.yml
index bc6d0964..b007b511 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -148,5 +148,5 @@ es:
   :title_number_of_files_in_directory: "Number of files in directory"
   :title_filename_for_download: "Filename used for download or in Zip archive"
   :label_number_of_folders: "Folders"
-  :label_number_of_files: "Files"
+  :label_number_of_documents: "Documents"
   
\ No newline at end of file
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d0ab9d26..035ba982 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -146,5 +146,5 @@ fr:
   :title_number_of_files_in_directory: "Number of files in directory"
   :title_filename_for_download: "Filename used for download or in Zip archive"
   :label_number_of_folders: "Folders"
-  :label_number_of_files: "Files"
+  :label_number_of_documents: "Documents"
   
\ No newline at end of file
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e8213671..2cb18243 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -150,5 +150,5 @@ en:
   :title_number_of_files_in_directory: "Number of files in directory"
   :title_filename_for_download: "Filename used for download or in Zip archive"
   :label_number_of_folders: "Folders"
-  :label_number_of_files: "Files"
+  :label_number_of_documents: "Documents"
   
\ No newline at end of file
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6632804e..c3526da6 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -146,5 +146,5 @@ ru:
   :title_number_of_files_in_directory: "Number of files in directory"
   :title_filename_for_download: "Filename used for download or in Zip archive"
   :label_number_of_folders: "Folders"
-  :label_number_of_files: "Files"
+  :label_number_of_documents: "Documents"
   
\ No newline at end of file