Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
This commit is contained in:
commit
c97c2b7738
|
@ -63,7 +63,7 @@
|
||||||
<%= link_to( "",contest_boards_path(@contest, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") if is_admin %>
|
<%= link_to( "",contest_boards_path(@contest, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") if is_admin %>
|
||||||
</li>
|
</li>
|
||||||
<div id="board_children_list">
|
<div id="board_children_list">
|
||||||
<%= render :partial => 'layouts/contest_board_children_list', :locals => {:contest_board => contest_board} %>
|
<%= render :partial => 'layouts/contest_board_children_list', :locals => {:contest_board => contest_board} if contest_board %>
|
||||||
</div>
|
</div>
|
||||||
<li id="sy_05" class="sy_icons_news">
|
<li id="sy_05" class="sy_icons_news">
|
||||||
<%= link_to "通知<span>#{@contest.news.count}</span>".html_safe, contest_news_index_path(@contest), :class => "sy_icons_feedback" %>
|
<%= link_to "通知<span>#{@contest.news.count}</span>".html_safe, contest_news_index_path(@contest), :class => "sy_icons_feedback" %>
|
||||||
|
|
Loading…
Reference in New Issue