# HG changeset patch
# User Chris Cannam
# Date 1300198380 0
# Node ID 022181ffa51dad99b3f116632fbf98174724950c
# Parent  09c503c81902f450e78ce290caa4f12bb57b55a3# Parent  255fcd5f5a4e51c99dadcf6ea61cffd0d4182716
Merge from branch "feature_88"

diff -r 09c503c81902 -r 022181ffa51d app/views/files/index.html.erb
--- a/app/views/files/index.html.erb	Tue Mar 15 13:46:29 2011 +0000
+++ b/app/views/files/index.html.erb	Tue Mar 15 14:13:00 2011 +0000
@@ -29,7 +29,7 @@
 	</tr>
 	<% end -%>
   <% container.attachments.each do |file| %>		
-  <tr class="file <%= cycle("odd", "even") %>">
+  <tr class="file <%= cycle("odd", "even") %> <%= "active" if file.active? %>">
     <td class="active">
       <% have_file = true %>
       <% if active_change_allowed
@@ -44,7 +44,12 @@
         <%= image_tag('fav.png') if file.active? %>
       <% end -%>
     </td>
-    <td class="filename <%= "active" if file.active? %>"><%= link_to_attachment file, :download => true, :title => file.description %></td>
+    <% if file.active? %>
+      <td class="filename active"><%= link_to_attachment file, :download => true %><br><span class="description"><%= h(file.description) %></span></td>
+    <% else %>
+      <td class="filename"><%= link_to_attachment file, :download => true, :title => file.description %>
+    <% end %>
+    </td>
     <td class="created_on"><%= format_time(file.created_on) %></td>
     <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
     <td class="downloads"><%= file.downloads %></td>
diff -r 09c503c81902 -r 022181ffa51d public/themes/soundsoftware/stylesheets/application.css
--- a/public/themes/soundsoftware/stylesheets/application.css	Tue Mar 15 13:46:29 2011 +0000
+++ b/public/themes/soundsoftware/stylesheets/application.css	Tue Mar 15 14:13:00 2011 +0000
@@ -106,6 +106,10 @@
 
 ul.projects .public, ul.projects .private { padding-left: 0.5em; color: #3e442c; font-size: 0.95em }
 
+table.files tr.active td { padding-top: 0.5em; padding-bottom: 0.5em; }
+table.files .file .active { font-weight: bold; }
+table.files .file .description { font-weight: normal; color: #3e442c; }
+
 #top-menu { position: absolute; top: 0; z-index: 1; left: 0px; width: 100%; font-size: 90%; /* height: 2em; */ margin: 0; padding: 0; padding-top: 0.5em; background-color: #3e442c; }
 #top-menu ul { margin-left: 10px; }
 #top-menu a { font-weight: bold; }
@@ -166,8 +170,6 @@
 #top-menu a.administration { background-image: url(../images/wrench.png); }
 #top-menu a.help { background-image: url(../../../images/help.png); }
 
-.file .active { font-weight: bold; }
-
 /* for Javadoc in Embedded context: */
 
 .TableHeadingColor { background-color: #fdf7e4; color: #3e442c; border: 0px solid #fff; }