jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into szzh

This commit is contained in:
yanxd 2014-05-30 10:59:29 +08:00
parent b33ee17343 325bb85cc5
commit 8c33cf0afb
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/open_source_projects/_show_topics.html.erb
View File

@ -55,7 +55,7 @@
<img src="/images/version_marker.png" alt="Tags"> <img src="/images/version_marker.png" alt="Tags">
</span> </span>
<span class="tag_fouse">聚焦:</span> <span class="tag_fouse">聚焦:</span>
<div id="tag">Heartblood</div> <div id="tag">Heartbleed</div>
<div id="tag">致命漏洞</div> <div id="tag">致命漏洞</div>
</div> </div>
@ -70,10 +70,7 @@
<div id="tag">信息泄露</div> <div id="tag">信息泄露</div>
</div> </div>
<%end if %> <%end%>
<div class="fixed"></div> <div class="fixed"></div>
<div class="li_list" style="margin-top:10px;margin-left:10px"> <div class="li_list" style="margin-top:10px;margin-left:10px">

2
lib/redmine.rb
View File

@ -292,7 +292,7 @@ Redmine::MenuManager.map :contest_menu do |menu|
#menu.push :project, :show_project_contest_path, :caption => :label_contest_project #menu.push :project, :show_project_contest_path, :caption => :label_contest_project
#menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application #menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application
menu.push :attendingcontest, {:controller => 'contests', :action => 'show_attendingcontest'}, :caption => :label_attending_contest menu.push :attendingcontest, {:controller => 'contests', :action => 'show_attendingcontest'}, :caption => :label_attending_contest
menu.push :contestnotification, {:controller => 'contests', :action => 'show_notification'}, :caption => :label_contest_notification # menu.push :contestnotification, {:controller => 'contests', :action => 'show_notification'}, :caption => :label_contest_notification
# menu.push :attendingcontest, :show_attendingcontest_contest_path, :caption => :label_attendin,g_contest # menu.push :attendingcontest, :show_attendingcontest_contest_path, :caption => :label_attendin,g_contest
# menu.push :result, { :controller => 'bids', :action => 'show_results' }, # menu.push :result, { :controller => 'bids', :action => 'show_results' },
# :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p } # :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p }