Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts: app/views/student_work/_student_work_list.html.erb
This commit is contained in:
commit
7f99e82181
|
@ -79,9 +79,7 @@
|
|||
|
||||
<script type="text/javascript">
|
||||
$(".student_work_<%= st.id%>").mouseenter(function(){
|
||||
if($("#about_hwork_<%= st.id%>").html().trim() == "") {
|
||||
$("#work_click_<%= st.id%>").show();
|
||||
}
|
||||
$("#work_click_<%= st.id%>").show();
|
||||
}).mouseleave(function(){
|
||||
$("#work_click_<%= st.id%>").hide();
|
||||
}).mouse;
|
||||
|
|
Loading…
Reference in New Issue