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

This commit is contained in:
daiao 2017-03-29 15:41:43 +08:00
commit 34dd39e5c3
2 changed files with 5 additions and 2 deletions

View File

@ -41,7 +41,7 @@
</div>
</div>
</div>
<%= render :partial => 'games/repository' %>
<%= render :partial => 'games/repository' %>
</div>
<%= render :partial => 'games/exec_results' %>
<%#= render :partial => 'games/desc_full_show' %>

View File

@ -1,8 +1,11 @@
<%= javascript_include_tag 'baiduTemplate', 'jquery.datetimepicker.js' %>
<%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %>
<%= stylesheet_link_tag "/assets/codemirror/codemirror" %>
<div id="content_list" class="CELL _FLEX ROWS">
<%= render :partial => "game_show" %>
</div>
<%= render :partial => "game_show" %>
<script type="text/javascript" language="javascript">
// contents_h 是中间左侧内容页的高度,不同浏览器的得到高度不一致