From da74c97b7d975ed1b6701a14fa219e0b68bf9b46 Mon Sep 17 00:00:00 2001 From: xianbo Date: Tue, 17 Dec 2013 11:26:11 +0800 Subject: [PATCH] fix the show of manager web --- app/views/admin/index.html.erb | 4 ++-- lib/redmine.rb | 1 + lib/redmine/info.rb | 10 +++++----- lib/redmine/version.rb | 6 +++--- public/stylesheets/application.css | 4 ++++ 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb index eb2dcd0d0..f8447590c 100644 --- a/app/views/admin/index.html.erb +++ b/app/views/admin/index.html.erb @@ -1,6 +1,6 @@ -

<%=l(:label_administration)%>

- <%= render :partial => 'no_data' if @no_configuration_data %> +

<%=l(:label_administration)%>

+ <%= render :partial => 'menu' %>
diff --git a/lib/redmine.rb b/lib/redmine.rb index 327027da9..e5928d2e8 100644 --- a/lib/redmine.rb +++ b/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| diff --git a/lib/redmine/info.rb b/lib/redmine/info.rb index 98df8d20b..63c066da8 100644 --- a/lib/redmine/info.rb +++ b/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? diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb index a328db8af..d7e9c5fa4 100644 --- a/lib/redmine/version.rb +++ b/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 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 19f76b4db..9ae70566f 100644 --- a/public/stylesheets/application.css +++ b/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; +}