Admin info cleanup.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3200 e93f8b46-1217-0410-a6f0-8f06a7374b81

Admin info cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3200 e93f8b46-1217-0410-a6f0-8f06a7374b81
4398386c · Jean-Philippe Lang · 503d6134 · 4398386c · 4398386c
Commit 4398386c authored Dec 19, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 10 deletions

admin_controller.rb app/controllers/admin_controller.rb +6 -6

info.rhtml app/views/admin/info.rhtml +6 -4

No files found.
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -76,11 +76,11 @@ class AdminController < ApplicationController
  def info
    @db_adapter_name = ActiveRecord::Base.connection.adapter_name
-    @flags = {
+    @checklist = [
-      :default_admin_changed => User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?,
+      [:text_default_administrator_account_changed, User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?],
-      :file_repository_writable => File.writable?(Attachment.storage_path),
+      [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
-      :plugin_assets_writable => File.writable?(Engines.public_directory),
+      [:text_plugin_assets_writable, File.writable?(Engines.public_directory)],
-      :rmagick_available => Object.const_defined?(:Magick)
+      [:text_rmagick_available, Object.const_defined?(:Magick)]
-    }
+    ]
  end  
 end
--- a/app/views/admin/info.rhtml
+++ b/app/views/admin/info.rhtml
@@ -3,10 +3,12 @@
 <p><strong><%= Redmine::Info.versioned_name %></strong> (<%= @db_adapter_name %>)</p>
 <table class="list">
-<tr class="odd"><td><%= l(:text_default_administrator_account_changed) %></td><td><%= image_tag (@flags[:default_admin_changed] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
+<% @checklist.each do |label, result| %>
-<tr class="even"><td><%= l(:text_file_repository_writable) %> (<%= Attachment.storage_path %>)</td><td><%= image_tag (@flags[:file_repository_writable] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
+	<tr class="<%= cycle 'odd', 'even' %>">
-<tr class="odd"><td><%= l(:text_plugin_assets_writable) %> (<%= Engines.public_directory %>)</td><td><%= image_tag (@flags[:plugin_assets_writable] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
+		<td><%= l(label) %></td>
-<tr class="even"><td><%= l(:text_rmagick_available) %></td><td><%= image_tag (@flags[:rmagick_available] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
+		<td width="30px"><%= image_tag((result ? 'true.png' : 'exclamation.png'), :style => "vertical-align:bottom;") %></td>
+	</tr>
+<% end %>
 </table>
 <% html_title(l(:label_information_plural)) -%>