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

将contest主页中通知公告的颜色改成蓝色 

Signed-off-by: alan <547533434@qq.com>
This commit is contained in:
alan 2014-09-11 00:33:12 +08:00
parent 70b079041c
commit 64eb4d362c
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/helpers/application_helper.rb
View File

@ -679,15 +679,15 @@ module ApplicationHelper
def textilizable(*args) def textilizable(*args)
options = args.last.is_a?(Hash) ? args.pop : {} options = args.last.is_a?(Hash) ? args.pop : {}
case args.size case args.size
when 1 when 1
obj = options[:object] obj = options[:object]
text = args.shift text = args.shift
when 2 when 2
obj = args.shift obj = args.shift
attr = args.shift attr = args.shift
text = obj.send(attr).to_s text = obj.send(attr).to_s
else else
raise ArgumentError, 'invalid arguments to textilizable' raise ArgumentError, 'invalid arguments to textilizable'
end end
return '' if text.blank? return '' if text.blank?
project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil) project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)

4
app/helpers/contests_helper.rb
View File

@ -100,10 +100,10 @@ module ContestsHelper
def count_contest_project def count_contest_project
contests = Contest.find(:id) contests = Contest.find(:id)
@projects = [] @projects = []
# Modified by alan # Modified by longjun
# for contest in contests # for contest in contests
contests.each do |contest| contests.each do |contest|
# end alan # end longjun
@projects += contest.contesting_projects @projects += contest.contesting_projects
end end
@projects.count @projects.count

2
app/views/welcome/contest.html.erb
View File

@ -191,7 +191,7 @@
<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;"> <div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
<h3 style="margin-left: 5px; color: #e8770d;"> <h3 style="margin-left: 5px; color: rgb(21, 188, 207);">
<strong><%=l(:label_notification)%></strong> <strong><%=l(:label_notification)%></strong>
</h3> </h3>

2
config/routes.rb
View File

@ -161,7 +161,7 @@ RedmineApp::Application.routes.draw do
#end #end
root :to => 'welcome#index', :as => 'home' root :to => 'welcome#index', :as => 'home'
match 'welcome/contest', :to => 'welcome#contest', :via => :get
#added by baiyu #added by baiyu
match 'git_usage/ch_usage', :controller => 'git_usage', :action => 'ch_usage', :via => :get, :as => 'ch_usage' match 'git_usage/ch_usage', :controller => 'git_usage', :action => 'ch_usage', :via => :get, :as => 'ch_usage'
match 'git_usage/en_usage', :controller => 'git_usage', :action => 'en_usage', :via => :get, :as => 'en_usage' match 'git_usage/en_usage', :controller => 'git_usage', :action => 'en_usage', :via => :get, :as => 'en_usage'