qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove .bundle from ignored file list

This commit is contained in:
huangjingquan 2013-08-01 11:08:59 +08:00
parent eb2fce200d
commit bf1f9b8e19
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,4 @@
log/*
.bundle
tmp/pids/server.pid
.project
.svn/

6
app/views/layouts/base_users.html.erb
View File

@ -60,13 +60,13 @@
<div class="inf_user_context">
<table style="font-family:微软雅黑">
<tr>
<th>加入时间：</th><td><%= format_date(@user.created_on) %></td>
<td class="font_lighter_sidebar">加入时间：</td><td><%= format_date(@user.created_on) %></td>
</tr>
<tr>
<th>最近登录：</th><td><%= format_date(@user.last_login_on) %></td>
<td class="font_lighter_sidebar">最近登录：</td><td><%= format_date(@user.last_login_on) %></td>
</tr>
<tr>
<th>邮件地址：</th><td><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
<td class="font_lighter_sidebar">邮件地址：</td><td><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
</tr>
</table>
</div>

10
lib/redmine.rb
View File

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

8
public/stylesheets/application.css
View File

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