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

新建课堂实训页面拖拽部分的bug 

班级页面所有模块加阴影
This commit is contained in:
caishi 2017-07-14 20:50:37 +08:00
parent ef44a119c7
commit ca6f9c2089
22 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/courses/_courseList.html.erb
View File

@ -52,7 +52,7 @@
</div>
</div>
<% else %>
<div class="edu-tab-con-box">
<div class="edu-tab-con-box edu-tab-con-box">
<img src="../images/bigdata/edu-class/edu-nodata.png" class="edu-nodata-img">
<p class="edu-nodata-p mb30">没有数据可以显示！</p>
</div>

4
app/views/courses/settings.html.erb
View File

@ -1,11 +1,11 @@
<%= javascript_include_tag 'jquery.datetimepicker.js' %>
<div class="stud-class-set">
<div class="set-top mb15 clearfix">
<div class="set-top mb15 clearfix user_bg_shadow">
<span class="fl pl20 font-16">设置</span>
<%= link_to '返回', course_path(@course), :class => 'fr mr15 link-color-grey' %>
</div>
<div class="news">
<div class="news user_bg_shadow">
<div class="nav clearfix">
<p class="fl font-16 sheet" data-option="basic">
基本信息<i class="fa fa-caret-down color-blue font-12" aria-hidden="true"></i>

2
app/views/courses/show.html.erb
View File

@ -8,7 +8,7 @@
<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
<div class="homepageRight mt0 " style="width:85%; float:left;">
<div class="homepageRightBanner" style="width:973px;">
<div class="homepageRightBanner user_bg_shadow" style="width:973px;">
<div class="NewsBannerName">
<%= get_acts_list_type @type %></div>
<ul class="resourcesSelect">

4
app/views/files/_course_file.html.erb
View File

@ -70,7 +70,7 @@
</script>
<div class="homepageRight mt0 ml10">
<div class="homepageRightBanner">
<div class="homepageRightBanner user_bg_shadow">
<div class="NewsBannerName">资源库</div>
<ul class="resourcesSelect">
<li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
@ -94,7 +94,7 @@
</p>
</div>
<% end %>
<div class="resources mt10 pr" style="padding-bottom:5px;">
<div class="resources mt10 pr user_bg_shadow" style="padding-bottom:5px;">
<div class="reTop mb5">
<%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %>
<%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>

2
app/views/files/_course_list.html.erb
View File

@ -13,7 +13,7 @@
<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true%>
</ul>
<% else %>
<div class="mt10" style="background-color: #fff;padding-bottom: 10px; margin-left: 7px;">
<div class="mt10 user_bg_shadow" style="background-color: #fff;padding-bottom: 10px; margin-left: 7px;">
<%= render :partial => "welcome/no_data" %>
</div>
<% end %>

2
app/views/files/_resource_detail.html.erb
View File

@ -1,5 +1,5 @@
<% delete_allowed = User.current.allowed_to?(:manage_files, @course) %>
<div class="resources mt10"><!--资源库内容开始--->
<div class="resources mt10 user_bg_shadow"><!--资源库内容开始--->
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>

2
app/views/homework_common/index.html.erb
View File

@ -1,5 +1,5 @@
<div class="with85 fl">
<div class="ml15">
<div class="ml15 user_bg_shadow">
<div class="edu-con-top clearfix">
<p class="ml15 color-grey fl">作业列表</p>
<% if @is_teacher %>

2
app/views/layouts/_course_base_info.html.erb
View File

@ -20,7 +20,7 @@
</div>
<div class="edu-class-box">
<div class="edu-class-top clearfix mb20 pr">
<div class="edu-class-top clearfix mb20 pr user_bg_shadow">
<!-- <div class="edu-class-img fl">
<%= image_tag(url_to_avatar(@course),width:"178", height: "100", :id=>'nh_source_tx') %>
</div>

6
app/views/layouts/base_courses.html.erb
View File

@ -57,15 +57,15 @@
<i class="fa fa-map-marker mr5 color-grey" ></i>
<%= link_to User.current.show_name, user_path(User.current) %> >
<%= link_to '课堂教学', courses_path %> >
<%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> >
<%= link_to @course.name, course_path(@course), :title => '班级' %>
<%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> ><%= @course.name%>
<%#= link_to @course.name, course_path(@course), :title => '班级' %>
</p>
<div id="course_info_<%= @course.id %>">
<%= render :partial => 'layouts/course_base_info' %>
</div>
<div class="edu-class-inner mb20 clearfix">
<div class="with15 fl ">
<div class="mb10">
<div class="mb10 user_bg_shadow">
<ul class="edu-class-leftnav">
<li class="clearfix" id="sy_01">
<a href="<%= course_path(@course) %>" class="fl ml15">动态</a>

6
app/views/layouts/base_edu_course.html.erb
View File

@ -27,13 +27,13 @@
<i class="fa fa-map-marker mr5 color-grey" ></i>
<%= link_to User.current.show_name, user_path(User.current) %> >
<%= link_to '课堂教学', courses_path %> >
<%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> >
<%= link_to @course.name, course_path(@course), :title => '班级' %>
<%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> ><%= @course.name%>
<%#= link_to @course.name, course_path(@course), :title => '班级' %>
</p>
<% else %>
<p class="mb10">
<i class="fa fa-map-marker mr5 color-grey" ></i>
<%= link_to @course.name, course_path(@course) %> > <span class="color-dark-grey"><%= @curr_page %></span>
<%= link_to @course.name, course_path(@course) %> > <span><%= @curr_page %></span>
</p>
<% end %>
<% if params[:action] != "settings" %>

2
app/views/stages/edit.js.erb
View File

@ -2,5 +2,5 @@ var element = document.createElement("div");
$(element).html("<%= j(render :partial => 'stages/edit') %>");
$(element).insertAfter($("#stage_div_<%= @stage.id %>"));
$("#stage_div_<%= @stage.id %>").hide();
$("#sortable").sortable();
$("#sortable").sortable({containment:".stage-item"});
$("#sortable").disableSelection();

2
app/views/subjects/_subject_list.html.erb
View File

@ -31,7 +31,7 @@
</div>
<p class="color-grey college task-text-center">
<% if !subject.user.user_extensions.school_id.blank? && subject.user.user_extensions.school %>
<%= subject.user.user_extensions.school.name %>&nbsp;&nbsp;
<%= subject.user.user_extensions.school.name %>
<% end %>
</p>
<p class="color-grey pl15 pr15 clearfix" style="text-align: center;">

2
app/views/subjects/append_to_stage.js.erb
View File

@ -21,6 +21,6 @@ var html= '<div class="task-index-list-box-all fl pr ui-state-default">' +
'</ul>' +
'</div>';
$("#sortable").append(html);
$("#sortable" ).sortable();
$("#sortable" ).sortable({containment:".stage-item"});
$("#sortable" ).disableSelection();
<% end %>

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

@ -13,7 +13,7 @@
<div class="task-index-list clearfix mb20">
<% stage.stage_shixuns.each_with_index do |stage_shixun, index| %>
<% shixun = stage_shixun.shixun %>
<div class="task-index-list-box fl pr">
<div class="task-index-list-box-all fl pr">
<div class="task-array"><%= index + 1 %></div>
<div class="task-index-list-box-top xy_box" style="cursor: pointer;" onclick="shixun_link('<%= shixun.identifier %>')">
<p class="task-index-list-title two_lines_show">
@ -77,7 +77,7 @@
<script>
$(function() {
//初始化拖拽层
$( "#sortable" ).sortable();
$( "#sortable" ).sortable({containment:".stage-item"});
$( "#sortable" ).disableSelection();
});
//编辑列表里右上角的删除icon，删除单个实训

2
app/views/users/_course_attachment.html.erb
View File

@ -1,4 +1,4 @@
<div class="resources mt10">
<div class="resources mt10 user_bg_shadow">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>

2
app/views/users/_course_create.html.erb
View File

@ -1,4 +1,4 @@
<div class="resources mt10">
<div class="resources mt10 user_bg_shadow">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.teacher), :width => "50", :height => "50"), user_path(activity.teacher), :alt => "用户头像" %>

2
app/views/users/_course_homework.html.erb
View File

@ -1,5 +1,5 @@
<% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %>
<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
<div class="resources mt10 user_bg_shadow" id="user_activity_<%= user_activity_id%>">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %>

2
app/views/users/_course_journalsformessage.html.erb
View File

@ -1,4 +1,4 @@
<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
<div class="resources mt10 user_bg_shadow" id="user_activity_<%= user_activity_id%>">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %>

2
app/views/users/_course_message.html.erb
View File

@ -1,4 +1,4 @@
<div class="resources mt10" id="user_activity_<%= user_activity_id%>" onmouseover="$('#message_setting_<%= user_activity_id%>').show();" onmouseout="$('#message_setting_<%= user_activity_id%>').hide();">
<div class="resources mt10 user_bg_shadow" id="user_activity_<%= user_activity_id%>" onmouseover="$('#message_setting_<%= user_activity_id%>').show();" onmouseout="$('#message_setting_<%= user_activity_id%>').hide();">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author, :host => Setting.host_user), :alt => "用户头像" %>

2
app/views/users/_course_news.html.erb
View File

@ -1,4 +1,4 @@
<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
<div class="resources mt10 user_bg_shadow" id="user_activity_<%= user_activity_id%>">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author), :alt => "用户头像" %>

2
app/views/users/_course_poll.html.erb
View File

@ -1,7 +1,7 @@
<% has_commit = has_commit_poll?(activity.id ,User.current)%>
<% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
<% if ( activity.polls_status==2) %>
<div class="resources mt10">
<div class="resources mt10 user_bg_shadow">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->

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

@ -45,14 +45,14 @@
.boxborder-dashed-orange{border: 1px dashed #ffbfaa;}
.click_add{text-align: center;height: 90px;line-height: 90px;}
.adding-stage-item{padding: 0px 10px;}
.adding-stage-item{padding: 0px 10px 10px 10px;position: relative}
.task-close-icon{position: absolute;right: -5px;top:-5px;z-index: 2;font-size: 18px!important;}
/*编辑部分的列表不用加浮动效果*/
.task-index-list-box-all{ width:23.7%;margin: 0 1.5% 1.5% 0px; border-radius:2px; border:1px solid #eee; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; }
.task-index-list-box-all{ width:23.7%;margin: 6px; border-radius:2px; border:1px solid #eee; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15); color:#666; position:relative; }
.task-index-list-box-all:nth-child(4n+0) {margin: 0 0 1.5% 0;}
.allback{background-color:#FFFFFF}
.last-all-count{width: 20%;text-align: right;}