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

Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project

This commit is contained in:
huang 2017-03-24 14:42:32 +08:00
parent b3141348b0 93e67e5dbc
commit 27c34985ca
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/games/_desc_full_show.html.erb
View File

@ -19,19 +19,19 @@
</ul> </ul>
<div class="cl"></div> <div class="cl"></div>
<div id="big_tab_con_1" class="tab-info" > <div id="big_tab_con_1" class="tab-info" >
<p class="big-tab-info-inner"> <div class="big-tab-info-inner">
<%= h @game.task_pass.try(:html_safe) %> <%= h @game.task_pass.try(:html_safe) %>
</p> </div>
</div> </div>
<div id="big_tab_con_2" class="undis tab-info" > <div id="big_tab_con_2" class="undis tab-info" >
<p class="big-tab-info-inner"> <div class="big-tab-info-inner">
<%= h @game.ready_knowledge.try(:html_safe) %> <%= h @game.ready_knowledge.try(:html_safe) %>
</p> </div>
</div> </div>
<div id="big_tab_con_3" class="undis tab-info" > <div id="big_tab_con_3" class="undis tab-info" >
<p class="big-tab-info-inner"> <div class="big-tab-info-inner">
<%= h @game.answer.try(:html_safe) %> <%= h @game.answer.try(:html_safe) %>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

1
app/views/games/_exec_results.html.erb
View File

@ -70,6 +70,7 @@
<h3 >操作</h3> <h3 >操作</h3>
</div> </div>
<div class="content-submitbox"> <div class="content-submitbox">
<a href="javascript:void(0)" class="task-btn mb10" onclick="file_edit_submit()">保存修改</a>
<! if(status == 0){ !> <! if(status == 0){ !>
<div id="game_commit"> <div id="game_commit">
<a href="javascript:void(0)" class="task-btn task-btn-green" onclick="training_task_submmit();">提交评测</a> <a href="javascript:void(0)" class="task-btn task-btn-green" onclick="training_task_submmit();">提交评测</a>

8
app/views/games/_game_show.html.erb
View File

@ -26,15 +26,15 @@
</ul> </ul>
<div class="cl"></div> <div class="cl"></div>
<div id="tab_con_1" class="tab-info" > <div id="tab_con_1" class="tab-info" >
<p class="tab-info-inner"> <div class="tab-info-inner">
<%= h @game.task_pass.try(:html_safe) %> <%= h @game.task_pass.try(:html_safe) %>
</p> </div>
</div> </div>
<div id="tab_con_2" class="undis tab-info"> <div id="tab_con_2" class="undis tab-info">
<p class="tab-info-inner"><%= h @game.ready_knowledge.try(:html_safe) %></p> <div class="tab-info-inner"><%= h @game.ready_knowledge.try(:html_safe) %></div>
</div> </div>
<div id="tab_con_3" class="undis tab-info"> <div id="tab_con_3" class="undis tab-info">
<p class="tab-info-inner"><%= h @game.answer.try(:html_safe) %></p> <div class="tab-info-inner"><%= h @game.answer.try(:html_safe) %></div>
</div> </div>
</div> </div>
</div> </div>