jro_apps/redmine Commit - r13253:ebde5a5f90b7

Merged r13486 to r13489 and r13492 (#8817)....

Jean-Philippe Lang -

r13253:ebde5a5f90b7

parent child

Context file:

r13253:ebde5a5f90b7

public/plugin_assets/empty created 644 0 0

NO CONTENT: new file 100644

.gitignore +1 -1

             /plugins/*
             !/plugins/README
             /public/dispatch.*
-            /public/plugin_assets
+            /public/plugin_assets/*
             /public/themes/*
             !/public/themes/alternate
             !/public/themes/classic

.hgignore +1 -1

             log/*.log*
             log/mongrel_debug
             public/dispatch.*
-            public/plugin_assets
+            public/plugin_assets/*
             tmp/*
             tmp/cache/*
             tmp/pdf/*

app/controllers/admin_controller.rb +1 -1

                 @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 +1 -1

             <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>

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages