Merged r13486 to r13489 and r13492 (#8817).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13635 e93f8b46-1217-0410-a6f0-8f06a7374b81

.gitignore

@@ -20,7 +20,7 @@
 /plugins/*
 !/plugins/README
 /public/dispatch.*
-/public/plugin_assets
+/public/plugin_assets/*
 /public/themes/*
 !/public/themes/alternate
 !/public/themes/classic

.hgignore

@@ -20,7 +20,7 @@ lib/redmine/scm/adapters/mercurial/redminehelper.pyo
 log/*.log*
 log/mongrel_debug
 public/dispatch.*
-public/plugin_assets
+public/plugin_assets/*
 tmp/*
 tmp/cache/*
 tmp/pdf/*

app/controllers/admin_controller.rb

@@ -76,7 +76,7 @@ class AdminController < ApplicationController
     @checklist = [
       [:text_default_administrator_account_changed, User.default_admin_account_changed?],
       [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
-      [:text_plugin_assets_writable,   File.writable?(Redmine::Plugin.public_directory)],
+      ["#{l :text_plugin_assets_writable} (./public/plugin_assets)",   File.writable?(Redmine::Plugin.public_directory)],
       [:text_rmagick_available,        Object.const_defined?(:Magick)],
       [:text_convert_available,        Redmine::Thumbnail.convert_available?]
     ]

app/views/admin/info.html.erb

@@ -5,7 +5,7 @@
 <table class="list">
 <% @checklist.each do |label, result| %>
   <tr class="<%= cycle 'odd', 'even' %>">
-    <td class="name"><%= l(label) %></td>
+    <td class="name"><%= label.is_a?(Symbol) ? l(label) : label %></td>
     <td class="tick"><%= image_tag((result ? 'true.png' : 'exclamation.png'),
                                     :style => "vertical-align:bottom;") %></td>
   </tr>