# HG changeset patch
# User Chris Cannam
# Date 1299251014 0
# Node ID 1d51c9df069ba4df1642e062a6a8c2dcbc25b108
# Parent  7cec015f07ce4a03f4928f1dcf11dc26da6369ac# Parent  847add61573b92a976e731f149c74eebd6b84896
Merge from branch "feature_80"

diff -r 7cec015f07ce -r 1d51c9df069b app/controllers/attachments_controller.rb
--- a/app/controllers/attachments_controller.rb	Tue Feb 22 16:48:15 2011 +0000
+++ b/app/controllers/attachments_controller.rb	Fri Mar 04 15:03:34 2011 +0000
@@ -16,9 +16,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AttachmentsController < ApplicationController
+
   before_filter :find_project
   before_filter :file_readable, :read_authorize, :except => :destroy
   before_filter :delete_authorize, :only => :destroy
+  before_filter :active_authorize, :only => :toggle_active
   
   verify :method => :post, :only => :destroy
   
@@ -54,6 +56,12 @@
     redirect_to :controller => 'projects', :action => 'show', :id => @project
   end
   
+  def toggle_active
+    @attachment.active = !@attachment.active?
+    @attachment.save!
+    render :layout => false
+  end
+
 private
   def find_project
     @attachment = Attachment.find(params[:id])
@@ -77,6 +85,10 @@
     @attachment.deletable? ? true : deny_access
   end
   
+  def active_authorize
+    true
+  end
+
   def detect_content_type(attachment)
     content_type = attachment.content_type
     if content_type.blank?
diff -r 7cec015f07ce -r 1d51c9df069b app/controllers/files_controller.rb
--- a/app/controllers/files_controller.rb	Tue Feb 22 16:48:15 2011 +0000
+++ b/app/controllers/files_controller.rb	Fri Mar 04 15:03:34 2011 +0000
@@ -10,6 +10,7 @@
   def index
     sort_init 'filename', 'asc'
     sort_update 'filename' => "#{Attachment.table_name}.filename",
+		'active' => "#{Attachment.table_name}.active",
                 'created_on' => "#{Attachment.table_name}.created_on",
                 'size' => "#{Attachment.table_name}.filesize",
                 'downloads' => "#{Attachment.table_name}.downloads"
@@ -33,4 +34,5 @@
     end
     redirect_to project_files_path(@project)
   end
+
 end
diff -r 7cec015f07ce -r 1d51c9df069b app/views/attachments/toggle_active.rhtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/attachments/toggle_active.rhtml	Fri Mar 04 15:03:34 2011 +0000
@@ -0,0 +1,7 @@
+<%=
+file = Attachment.find(params[:id])
+active_id = "active-" + file.id.to_s
+link_to_remote image_tag(file.active? ? 'fav.png' : 'fav_off.png'),
+  :url => {:controller => 'attachments', :action => 'toggle_active', :project_id => @project.id, :id => file},
+  :update => active_id
+%>
diff -r 7cec015f07ce -r 1d51c9df069b app/views/files/index.html.erb
--- a/app/views/files/index.html.erb	Tue Feb 22 16:48:15 2011 +0000
+++ b/app/views/files/index.html.erb	Fri Mar 04 15:03:34 2011 +0000
@@ -5,29 +5,46 @@
 <h2><%=l(:label_attachment_plural)%></h2>
 
 <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
+<% active_change_allowed = delete_allowed %>
 
 <table class="list files">
   <thead><tr>
+    <%= sort_header_tag('active', :caption => l(:field_active)) %>
     <%= sort_header_tag('filename', :caption => l(:field_filename)) %>
     <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %>
     <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %>
-    <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
+    <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc') %>
     <th>MD5</th>
     <th></th>
   </tr></thead>
   <tbody>
+<% have_file = false %>
 <% @containers.each do |container| %>	
   <% next if container.attachments.empty? -%>
 	<% if container.is_a?(Version) -%>
   <tr>
-  	<th colspan="6" align="left">
+  	<th colspan="7" align="left">
   		<%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
 		</th>
 	</tr>
 	<% end -%>
   <% container.attachments.each do |file| %>		
   <tr class="file <%= cycle("odd", "even") %>">
-    <td class="filename"><%= link_to_attachment file, :download => true, :title => file.description %></td>
+    <td class="active">
+      <% have_file = true %>
+      <% if active_change_allowed
+           active_id = "active-" + file.id.to_s -%>
+        <div id="<%= active_id %>">
+        <%= link_to_remote image_tag(file.active? ? 'fav.png' : 'fav_off.png'),
+              :url => {:controller => 'attachments', :action => 'toggle_active', :project_id => @project.id, :id => file},
+              :update => active_id
+        %>
+        </div>
+      <% else -%>
+        <%= 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>
     <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>
@@ -43,4 +60,6 @@
   </tbody>
 </table>
 
+<%= l(:text_files_active_change) if active_change_allowed and have_file %>
+
 <% html_title(l(:label_attachment_plural)) -%>
diff -r 7cec015f07ce -r 1d51c9df069b config/locales/en.yml
--- a/config/locales/en.yml	Tue Feb 22 16:48:15 2011 +0000
+++ b/config/locales/en.yml	Fri Mar 04 15:03:34 2011 +0000
@@ -859,6 +859,7 @@
   version_status_closed: closed
 
   field_active: Active
+  field_current: Current
   
   text_select_mail_notifications: Select actions for which email notifications should be sent.
   text_regexp_info: eg. ^[A-Z0-9]+$
@@ -924,7 +925,8 @@
   text_zoom_in: Zoom in
   text_zoom_out: Zoom out
   text_settings_repo_creation: The repository for a project should be set up automatically within a few minutes of the project being created.<br>You should not have to adjust any settings here.<br>Please check again in ten minutes, and <a href="/projects/soundsoftware-site/wiki/Help">contact us</a> if there is any problem.
-  
+  text_files_active_change: <br>Click the star to switch active status for a download on or off.<br>Active files will be shown more prominently in the download page.
+ 
   default_role_manager: Manager
   default_role_developer: Developer
   default_role_reporter: Reporter
diff -r 7cec015f07ce -r 1d51c9df069b db/migrate/20110303152903_add_active_column_to_attachments.rb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/migrate/20110303152903_add_active_column_to_attachments.rb	Fri Mar 04 15:03:34 2011 +0000
@@ -0,0 +1,9 @@
+class AddActiveColumnToAttachments < ActiveRecord::Migration
+  def self.up
+    add_column :attachments, :active, :boolean
+  end
+
+  def self.down
+    remove_column :attachments, :active
+  end
+end
diff -r 7cec015f07ce -r 1d51c9df069b public/stylesheets/application.css
--- a/public/stylesheets/application.css	Tue Feb 22 16:48:15 2011 +0000
+++ b/public/stylesheets/application.css	Fri Mar 04 15:03:34 2011 +0000
@@ -157,7 +157,7 @@
 tr.changeset td.committed_on { text-align: center; width: 15%; }
 
 table.files tr.file td { text-align: center; }
-table.files tr.file td.filename { text-align: left; padding-left: 24px; }
+table.files tr.file td.filename { text-align: left; }
 table.files tr.file td.digest { font-size: 80%; }
 
 table.members td.roles, table.memberships td.roles { width: 45%; }
diff -r 7cec015f07ce -r 1d51c9df069b public/themes/soundsoftware/stylesheets/application.css
--- a/public/themes/soundsoftware/stylesheets/application.css	Tue Feb 22 16:48:15 2011 +0000
+++ b/public/themes/soundsoftware/stylesheets/application.css	Fri Mar 04 15:03:34 2011 +0000
@@ -141,6 +141,8 @@
 #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; }