# HG changeset patch
# User Chris Cannam
# Date 1300196789 0
# Node ID 09c503c81902f450e78ce290caa4f12bb57b55a3
# Parent  f4a7c5aebbb578d877d18e66a1299979806fd90a# Parent  9c5077177fd22c1ef2bb85c9386ac3bb2150dbd3
Merge from branch "bug_89"

diff -r 9c5077177fd2 -r 09c503c81902 app/controllers/files_controller.rb
--- a/app/controllers/files_controller.rb	Tue Mar 15 13:44:25 2011 +0000
+++ b/app/controllers/files_controller.rb	Tue Mar 15 13:46:29 2011 +0000
@@ -8,7 +8,7 @@
   include SortHelper
 
   def index
-    sort_init 'filename', 'asc'
+    sort_init 'active', 'asc'
     sort_update 'filename' => "#{Attachment.table_name}.filename",
 		'active' => "#{Attachment.table_name}.active",
                 'created_on' => "#{Attachment.table_name}.created_on",
diff -r 9c5077177fd2 -r 09c503c81902 config/locales/en-GB.yml
--- a/config/locales/en-GB.yml	Tue Mar 15 13:44:25 2011 +0000
+++ b/config/locales/en-GB.yml	Tue Mar 15 13:46:29 2011 +0000
@@ -899,6 +899,7 @@
   text_wiki_page_reassign_children: "Reassign child pages to this parent page"
   text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?"
   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; please check again in ten minutes.
+  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