Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/views/admin/index.html.erb

@@ -1,6 +1,6 @@
-<h3><%=l(:label_administration)%></h3>
 <div id="admin-index">
-  <%= render :partial => 'no_data' if @no_configuration_data %>
+<h3><%=l(:label_administration)%></h3>
+  <!-- <%= render :partial => 'no_data' if @no_configuration_data %> -->
   <%= render :partial => 'menu' %>
 </div>
 

lib/redmine.rb

@@ -296,6 +296,7 @@ Redmine::MenuManager.map :admin_menu do |menu|
             :html => {:class => 'server_authentication'}
   menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
   menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
+
 end
 #Modified by young
 Redmine::MenuManager.map :project_menu do |menu|

lib/redmine/info.rb

@@ -1,21 +1,21 @@
 module Redmine
   module Info
     class << self
-      def app_name; 'Redmine' end
-      def url; 'http://www.redmine.org/' end
-      def help_url; 'http://www.redmine.org/guide' end
+      def app_name; 'Trustie' end
+      def url; 'http://forge.trustie.net/' end
+      def help_url; 'http://forge.trustie.net/forums' end
       def versioned_name; "#{app_name} #{Redmine::VERSION}" end
 
       def environment
         s = "Environment:\n"
         s << [
-          ["Redmine version", Redmine::VERSION],
+          ["Trustie version", Redmine::VERSION],
           ["Ruby version", "#{RUBY_VERSION} (#{RUBY_PLATFORM})"],
           ["Rails version", Rails::VERSION::STRING],
           ["Environment", Rails.env],
           ["Database adapter", ActiveRecord::Base.connection.adapter_name]
         ].map {|info| "  %-40s %s" % info}.join("\n")
-        s << "\nRedmine plugins:\n"
+        s << "\nTrustie plugins:\n"
 
         plugins = Redmine::Plugin.all
         if plugins.any?

lib/redmine/version.rb

@@ -2,9 +2,9 @@ require 'rexml/document'
 
 module Redmine
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 1
+    MAJOR = 1
+    MINOR = 0
+    TINY  = 0
 
     # Branch values:
     # * official release: nil

public/stylesheets/application.css

@@ -2672,3 +2672,7 @@ div.repos_explain{
 	padding: 6px 10px;
 	font-family:  Consolas, 'Liberation Mono', Courier, monospace;
 	color: rgb(51, 51, 51);
+}
+#admin-index{
+	 margin-left: -220px;
+}