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

Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs

This commit is contained in:
cxt 2017-07-26 20:00:24 +08:00
parent f2da429849 248ab43b10
commit 3d2a03fe38
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/subjects/show.html.erb
View File

@ -60,7 +60,7 @@
<% stage.stage_shixuns.each_with_index do |stage_shixun, index| %>
<% shixun = stage_shixun.shixun %>
<div class="clearfix pt10 pb10 pl20 stage-info-line pr20" id="stage_shixun_<%= shixun.id %>" style="cursor: pointer;" onclick="shixun_link('<%= shixun.identifier %>')">
<li class="fl li-width55">
<li class="fl li-width63">
<i class="fa fa-gamepad color-light-green font-20"></i>
<span class="font-bd color-dark-grey"><%= shixun.name %></span>
</li>
@ -70,7 +70,7 @@
</li>
<li class="fl li-width15">
<i class="fa fa-viacoin color-light-green mr5"></i><span class="mr5"><%= shixun.shixun_score %></span></li>
<li class="fl li-width15">
<li class="fl li-width7">
<% if @subject.status == 0 && User.current.manager_of_subject?(@subject) %>
<span class="<%= shixun.shixun_status == '编辑中' ? 'color-grey' : (shixun.shixun_status == '审核中' ? 'color-orange' : (shixun.shixun_status == '已发布' ? 'color-light-green' : 'color-light-grey')) %>"><%= shixun.shixun_status %></span>
<span class="none ml10"><i class="fa fa-exclamation-circle color-red ml5 mr5"></i></span>

5
public/stylesheets/css/edu-subject.css
View File

@ -30,9 +30,10 @@
.lesson-saved-list-item{border:1px solid #EEEEEE}
.lesson-saved-list-item:hover .edit{color:#29bd8b!important;}
.lesson-saved-list-item:hover .delete{color:#29bd8b!important;}
li.li-width55{width: 55%;text-align: left}
li.li-width63{width: 63%;text-align: left}
li.li-width20{width: 20%;text-align: left}
li.li-width15{width: 15%;text-align: right}
li.li-width15{width: 15%;text-align: left}
li.li-width7{width: 7%;text-align: left}
.lesson-saved-list-item{background-color: #FFFFFF}
/*------课程实训首页---------*/