diff --git a/.gitignore b/.gitignore index 718c0e763..44247461a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ log/* -.bundle tmp/pids/server.pid .project .svn/ diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index f9c4c8c2d..5621f8d39 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -60,13 +60,13 @@
- + - + - +
加入时间:<%= format_date(@user.created_on) %>加入时间:<%= format_date(@user.created_on) %>
最近登录:<%= format_date(@user.last_login_on) %>最近登录:<%= format_date(@user.last_login_on) %>
邮件地址:<%= mail_to(h(@user.mail), nil, :encode => 'javascript') %>邮件地址:<%= mail_to(h(@user.mail), nil, :encode => 'javascript') %>
diff --git a/lib/redmine.rb b/lib/redmine.rb index a2a9ba40b..3ff390676 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -201,11 +201,11 @@ Redmine::MenuManager.map :top_menu do |menu| menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural menu.push :requirement, {:controller => 'bids', :action => 'index'} menu.push :developer, {:controller => 'users', :action => 'index'} - menu.push :investor, :home_path - menu.push :theme, :home_path -# menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } -# menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true -# menu.push :help, Redmine::Info.help_url, :last => true + # menu.push :investor, :home_path + # menu.push :theme, :home_path + # menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? } + # menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true + # menu.push :help, Redmine::Info.help_url, :last => true end #end Redmine::MenuManager.map :account_menu do |menu| diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 704a0ac0e..fbc30bd05 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -81,13 +81,19 @@ ul.tool li{list-style-type:none; font-family:微软雅黑; font-weight:bold; font-size:18px; - color:#03a7dd; + color:#4d4d4d; } .font_lighter{ font-family:微软雅黑; color:#acaeb1; font-size:12px; } +.font_lighter_sidebar{ + font-family:微软雅黑; + color:#919294; + font-size:13px; + +} .font_description{ font-size:14px; line-height: 22px;