From c7051d82ec438acab1c4783bb3eb2f9a9df86300 Mon Sep 17 00:00:00 2001
From: "vit.jonas@gmail.com"
 <vit.jonas@gmail.com@5e329b0b-a2ee-ea63-e329-299493fc886d>
Date: Sun, 15 May 2011 15:23:12 +0000
Subject: [PATCH] * redesigned file detail revision list

git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@42 5e329b0b-a2ee-ea63-e329-299493fc886d
---
 app/views/dmsf_detail/file_detail.html.erb | 50 ++++++++++++++--------
 assets/stylesheets/dmsf.css                | 17 ++++++++
 init.rb                                    |  2 +-
 3 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/app/views/dmsf_detail/file_detail.html.erb b/app/views/dmsf_detail/file_detail.html.erb
index 1f436738..43dbd574 100644
--- a/app/views/dmsf_detail/file_detail.html.erb
+++ b/app/views/dmsf_detail/file_detail.html.erb
@@ -1,4 +1,4 @@
-<% html_title("DMSF") %>
+<% html_title(l(:dmsf)) %>
 
 <div class="contextual">
 </div>
@@ -25,22 +25,35 @@
 <h3>Revisions</h3>
 <% @file.revisions.each do |revision| %>
 <div class="box dmsf_detail">
-	<fieldset class="tabular">
+	<fieldset>
 		<legend>
 			<%= revision.source_revision.nil? ? "Created:" : "Changed:" %>
 			<%= revision.updated_at.strftime("%Y-%m-%d %H:%M:%S") %>
 			by
 			<%= h(revision.user) %>
 		</legend>
+		<div class="clear">
+			<div class="splitcontentleft">
+				<p>
+					<%= label_tag("", "Title:") %>
+					<%= h(revision.title) %>
+				</p>
+			</div>
+			<div class="splitcontentright">
+				<p>
+					<%= label_tag("", "Filename:") %>
+					<%= h(revision.name) %>
+				</p>
+			</div>
+		</div>
+		<p class="no-ident">
+			<%= label_tag("", "Description:") %><br class="clear" />
+		</p>
+		<div class="wiki">
+			<%= textilizable(revision.description) %>
+		</div>
+		
 		<div class="splitcontentleft">
-			<p>
-				<%= label_tag("", "Title:") %>
-				<%= h(revision.title) %>
-			</p>
-			<p>
-				<%= label_tag("", "Description:") %>
-				<%= h(revision.description) %>
-			</p>
 			<p>
 				<%= label_tag("", "Version:") %>
 				<%= revision.major_version %>.<%= revision.minor_version %>
@@ -54,11 +67,7 @@
 					end %>
 			</p>
 		</div>
-		<div class="splitcontentright">
-			<p>
-				<%= label_tag("", "Comment:") %>
-				<%= h(revision.comment) %>
-			</p>
+		<div class="splitcontentright clear">
 			<p>
 				<%= label_tag("", "Mime:") %>
 				<%= h(revision.mime_type) %>
@@ -68,7 +77,10 @@
 				<%= number_to_human_size(revision.size) %>
 			</p>
 		</div>
-		<br style="clear: both;" />
+		<p class="clear">
+			<%= label_tag("", "Comment:") %>
+			<%= h(revision.comment) %>
+		</p>
 		<div>
 			<%=  link_to("Download",
 	          {:controller=>"dmsf", :action => "download_revision", :id => @project, :revision_id => revision}) %>
@@ -84,7 +96,7 @@
 
 <% content_for :header_tags do %>
 	<%= stylesheet_link_tag "dmsf", :plugin => "redmine_dmsf" %>
-	<%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js" %>
+	<%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js" %>
 	<script type="text/javascript">
 		jQuery.noConflict();
 		
@@ -95,9 +107,9 @@
 			
 			jQuery("#fileFileUpload").change(function() {
 				if(jQuery("input[name=\"file[version]\"]:checked").val() == "same") {
-					jQuery("#fileMinorVersionRadio").attr("checked", true); 
+					jQuery("#fileMinorVersionRadio").prop("checked", true); 
 				}
-				jQuery("#fileSameVersionRadio").attr("disabled", "disabled"); 
+				jQuery("#fileSameVersionRadio").prop("disabled", true); 
 			});
 			
 			jQuery("#newRevisionFormContentToggle").toggle(function() {
diff --git a/assets/stylesheets/dmsf.css b/assets/stylesheets/dmsf.css
index 3d072ed7..2a3164e4 100644
--- a/assets/stylesheets/dmsf.css
+++ b/assets/stylesheets/dmsf.css
@@ -113,6 +113,23 @@ div.right_icon_box img.detail_icon {
 	padding: 4px 4px 4px 30px;
 }
 
+.dmsf_detail label {
+	font-weight: bold;
+	width: 100px;
+	float: left;
+}
+
+.dmsf_detail .wiki {
+	background-color: white;
+	border: 1px solid #E4E4E4;
+	padding-left: 5px;
+}
+
+p.no-ident {
+	margin-bottom: 0;
+	margin-top: 0;
+}
+
 fieldset {
 	padding-top: 4px;
 	padding-right: 8px;
diff --git a/init.rb b/init.rb
index 502c11b6..d72d8b8d 100644
--- a/init.rb
+++ b/init.rb
@@ -38,7 +38,7 @@ Redmine::Plugin.register :redmine_dmsf do
               "dmsf_stemming_strategy" => "STEM_NONE"
             }
   
-  menu :project_menu, :dmsf, { :controller => 'dmsf', :action => 'index' }, :caption => 'DMSF', :after => :activity, :param => :id
+  menu :project_menu, :dmsf, { :controller => "dmsf", :action => "index" }, :caption => :dmsf, :after => :activity, :param => :id
   #delete_menu_item :project_menu, :documents
   
   activity_provider :dmsf_files, :class_name => "DmsfFileRevision", :default => true