Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_cs' into develop

This commit is contained in:
cxt 2017-08-28 16:28:28 +08:00
parent baa512e4d7 41290a726c
commit ead24fad89
3 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/challenges/edit.html.erb
View File

@ -84,3 +84,6 @@
<% end %>
</div>
</div>
<div class="save-tip">
<div class="save-tip-content">已保存</div>
</div>

71
app/views/managements/shixuns.html.erb
View File

@ -24,6 +24,77 @@
<%= render :partial => "managements/shixun_list" %>
</div>
</div>
<div class="edu-class-container">
<%= form_tag(url_for(shixuns_managements_path), :id => "managements_shixuns_search", :method => "post", :remote => true ) do %>
<div class="edu-con-top clearfix mb20">
<input class="fl task-form-20 task-height-30 ml25" id="shixun_Look_name" name="search" maxlength="" placeholder="输入实训名称关键字进行搜索" type="text" style="height: 21px;">
<li class="fl ml10">
<a href="javascript:void(0)" class="task-btn task-btn-blue" onclick="$('#managements_shixuns_search').submit();">搜索</a>
<a href="javascript:clearSearchCondition();" class="task-btn mr10">清除</a>
</li>
<% end %>
</div>
<div class="ex_container" id="management_shixun_list">
<table class="edu-pop-table edu-txt-center" cellspacing="0" cellpadding="0" style="table-layout: fixed;">
<thead>
<th width="5%">序号</th>
<th width="25%" style="text-align: left">实训名称</th>
<th width="40%" style="text-align: left">评论内容</th>
<th width="10%">评论者</th>
<th width="10%">评论时间</th>
<th width="10%"></th>
<!--<i class="fa <%#= @sx_order == "desc" ? "fa-long-arrow-down" : "fa-long-arrow-up" %> color-light-green ml5" title="功能完善中，敬请期待"></i>-->
</thead>
<tbody>
<tr>
<td>1</td>
<td><span class="table_Name_text"><a>非常棒非常棒非常棒</a></span></td>
<td style="text-align: left">非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒v非常棒非常棒</td>
<td>胡莎莎</td>
<td>2017-08-28 10:14</td>
<td>
<a>回复</a>
<a>删除</a>
</td>
</tr>
<tr>
<td>1</td>
<td><span class="table_Name_text"><a>非常棒非常棒非常棒</a></span></td>
<td>非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒v非常棒非常棒</td>
<td>胡莎莎</td>
<td>2017-08-28 10:14</td>
<td>
<a>回复</a>
<a>删除</a>
</td>
</tr>
<tr>
<td>1</td>
<td><span class="table_Name_text"><a>非常棒非常棒非常棒</a></span></td>
<td>非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒v非常棒非常棒</td>
<td>胡莎莎</td>
<td>2017-08-28 10:14</td>
<td>
<a>回复</a>
<a>删除</a>
</td>
</tr>
<tr>
<td>1</td>
<td><span class="table_Name_text"><a>非常棒非常棒非常棒</a></span></td>
<td>非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒非常棒v非常棒非常棒</td>
<td>胡莎莎</td>
<td>2017-08-28 10:14</td>
<td>
<a>回复</a>
<a>删除</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<script>
//导航条的点击事件
$(".all_shixun_Item li").on("click",function(){

3
public/stylesheets/css/taskstyle.css
View File

@ -404,5 +404,6 @@ html>body #ajax-indicator-base { position: fixed; }
z-index:999;
}
.save-tip{display:none;position: fixed;top:0px;left: 0px;width: 100%;height: 100%;}
.save-tip-content{position: absolute;top:50%;left: 50%;margin-left: -36px;margin-top:-19px;background: rgba(0,0,0,0.7);color:#fff;padding:5px 15px;border-radius: 4px}