From ca6f9c2089db2e4fb90fa5bc5e32b8b131c5f08e Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 14 Jul 2017 20:50:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=BE=E5=A0=82=E5=AE=9E?= =?UTF-8?q?=E8=AE=AD=E9=A1=B5=E9=9D=A2=E6=8B=96=E6=8B=BD=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9A=84bug=20=E7=8F=AD=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=89=80?= =?UTF-8?q?=E6=9C=89=E6=A8=A1=E5=9D=97=E5=8A=A0=E9=98=B4=E5=BD=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_courseList.html.erb | 2 +- app/views/courses/settings.html.erb | 4 ++-- app/views/courses/show.html.erb | 2 +- app/views/files/_course_file.html.erb | 4 ++-- app/views/files/_course_list.html.erb | 2 +- app/views/files/_resource_detail.html.erb | 2 +- app/views/homework_common/index.html.erb | 2 +- app/views/layouts/_course_base_info.html.erb | 2 +- app/views/layouts/base_courses.html.erb | 6 +++--- app/views/layouts/base_edu_course.html.erb | 6 +++--- app/views/stages/edit.js.erb | 2 +- app/views/subjects/_subject_list.html.erb | 2 +- app/views/subjects/append_to_stage.js.erb | 2 +- app/views/subjects/show.html.erb | 4 ++-- app/views/users/_course_attachment.html.erb | 2 +- app/views/users/_course_create.html.erb | 2 +- app/views/users/_course_homework.html.erb | 2 +- app/views/users/_course_journalsformessage.html.erb | 2 +- app/views/users/_course_message.html.erb | 2 +- app/views/users/_course_news.html.erb | 2 +- app/views/users/_course_poll.html.erb | 2 +- public/stylesheets/css/edu-subject.css | 6 +++--- 22 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/views/courses/_courseList.html.erb b/app/views/courses/_courseList.html.erb index c0a5e22f4..7dbfdf14e 100644 --- a/app/views/courses/_courseList.html.erb +++ b/app/views/courses/_courseList.html.erb @@ -52,7 +52,7 @@ <% else %> -
+

没有数据可以显示！

diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb index 4357be0b4..3636383e6 100644 --- a/app/views/courses/settings.html.erb +++ b/app/views/courses/settings.html.erb @@ -1,11 +1,11 @@ <%= javascript_include_tag 'jquery.datetimepicker.js' %>
-
+
设置 <%= link_to '返回', course_path(@course), :class => 'fr mr15 link-color-grey' %>
-
+

基本信息 diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 6aeda492d..b23e5ae7b 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -8,7 +8,7 @@

-
+
<%= get_acts_list_type @type %>
    diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb index 6386d3fa7..515a530a6 100644 --- a/app/views/files/_course_file.html.erb +++ b/app/views/files/_course_file.html.erb @@ -70,7 +70,7 @@
    -
    +
    资源库
    • @@ -94,7 +94,7 @@

    <% end %> -
    +
    <%= 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"%> diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index d2f924cd5..2a1b5bbc8 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -13,7 +13,7 @@ <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true%>
<% else %> -
+
<%= render :partial => "welcome/no_data" %>
<% end %> diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb index 5f7abeea4..4fcc3d5e1 100644 --- a/app/views/files/_resource_detail.html.erb +++ b/app/views/files/_resource_detail.html.erb @@ -1,5 +1,5 @@ <% delete_allowed = User.current.allowed_to?(:manage_files, @course) %> -
+
<%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %> diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index cf10f9a0f..fbf55aa1f 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -1,5 +1,5 @@
-
+

作业列表

<% if @is_teacher %> diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index b67fa7739..ffdc2be16 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -20,7 +20,7 @@
-
+
diff --git a/public/stylesheets/css/edu-subject.css b/public/stylesheets/css/edu-subject.css index d33d52bdc..afc0aad1d 100644 --- a/public/stylesheets/css/edu-subject.css +++ b/public/stylesheets/css/edu-subject.css @@ -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;}