From cb5d0c469d448e5e021197d62efeeeb8c7d25dab Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 22 Feb 2009 10:00:25 +0000
Subject: [PATCH] Merged r2487, r2488 and r2507 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2514 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/index.rhtml     | 2 +-
 app/views/settings/_issues.rhtml | 8 ++++----
 doc/CHANGELOG                    | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index 973f3eb25..1aeafea0b 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -42,6 +42,7 @@
 <% else %>
 <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
 <p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
+<% end %>
 
 <p class="other-formats">
 <%= l(:label_export_to) %>
@@ -50,7 +51,6 @@
 <span><%= link_to 'PDF', {:format => 'pdf'}, :class => 'pdf' %></span>
 </p>
 <% end %>
-<% end %>
 
 <% content_for :sidebar do %>
     <%= render :partial => 'issues/sidebar' %>
diff --git a/app/views/settings/_issues.rhtml b/app/views/settings/_issues.rhtml
index bbd7356fd..0703661e0 100644
--- a/app/views/settings/_issues.rhtml
+++ b/app/views/settings/_issues.rhtml
@@ -11,12 +11,12 @@
 <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
 </div>
 
-<fieldset class="box"><legend><%= l(:setting_issue_list_default_columns) %></legend>
+<fieldset class="box settings"><legend><%= l(:setting_issue_list_default_columns) %></legend>
 <%= hidden_field_tag 'settings[issue_list_default_columns][]', '' %>
-<p><% Query.new.available_columns.each do |column| %>
+<% Query.new.available_columns.each do |column| %>
   <label><%= check_box_tag 'settings[issue_list_default_columns][]', column.name, Setting.issue_list_default_columns.include?(column.name.to_s) %>
-  <%= column.caption %></label>
-<% end %></p>
+	<%= column.caption %></label><br />
+<% end %>
 </fieldset>
 
 <%= submit_tag l(:button_save) %>
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 0bd3b8a19..5eb13d4f8 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -10,8 +10,10 @@ http://www.redmine.org/
 * Send an email to the user when an administrator activates a registered user
 * Strip keywords from received email body
 * Footer updated to 2009
+* Show RSS-link even when no issues is found
 * Fixed: exporting an issue with attachments to PDF raises an error
 * Fixed: "too few arguments" error may occur on activerecord error translation
+* Fixed: "Default columns Displayed on the Issues list" setting is not easy to read
 
 
 == 2009-02-15 v0.8.1