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

diff --git a/.gitignore b/.gitignore
index 557709a962df0fdc02abf6ad3f6f83558609c051..bba0ec275ac71f4a0de5c6bb6dc104481bdc6820 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@
 /plugins/*
 !/plugins/README
 /public/dispatch.*
-/public/plugin_assets
+/public/plugin_assets/*
 /public/themes/*
 !/public/themes/alternate
 !/public/themes/classic

diff --git a/.hgignore b/.hgignore
index 953ecf8aec73325ba0b9806fb9b8ca62252c50d3..a95140d48b584162cd6e80f2a75f74a6f7397b94 100644 (file)
--- a/.hgignore
+++ b/.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/*

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index c2d464d42e7c97c568d6cb5d05c8e26b43502413..7147f629acdb536b221643efd6243b84e024d2cd 100644 (file)
--- a/app/controllers/admin_controller.rb
+++ b/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?]
     ]

diff --git a/app/views/admin/info.html.erb b/app/views/admin/info.html.erb
index 3205a00ebcc0b7f4d291771ac67ca6e41170dbdb..14d33bab0918e5915050810081cef472a7a8cf3f 100644 (file)
--- a/app/views/admin/info.html.erb
+++ b/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>

diff --git a/public/plugin_assets/empty b/public/plugin_assets/empty
new file mode 100644 (file)
index 0000000..e69de29