From b17691a9abc89ead340e655168fc4ad6e090a431 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 30 Sep 2017 10:00:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=8A=A0=E4=BD=9C=E4=B8=9A=E6=88=90=E7=BB=A9=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/courses/settings/_student_table.html.erb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/views/courses/settings/_student_table.html.erb b/app/views/courses/settings/_student_table.html.erb
index 015b25486..a822f7de7 100644
--- a/app/views/courses/settings/_student_table.html.erb
+++ b/app/views/courses/settings/_student_table.html.erb
@@ -15,6 +15,7 @@
| 姓名 |
学号 |
分班 |
+ 作业成绩 |
发布资源 |
发布帖子 |
回复评论 |
@@ -40,6 +41,7 @@
<%= link_to user.show_real_name, user_path(user), :class => 'edu-txt-w140 task-hide mt5 alink-name', :target => '_blank' %> |
<%= user.user_extensions ? user.user_extensions.student_id : '' %> |
<%= member.course_group_id == 0 ? '未分班' : member.course_group.name %> |
+ <%#= student_course_resource_num @course, user %> |
<%= student_course_resource_num @course, user %> |
<%= student_course_message_num @course, user %> |
<%= student_course_reply_num @course, user %> |
From 7c23cd9948f48743f70f479a9ed9cb6824e1c39c Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 30 Sep 2017 10:29:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=96=B0=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../courses/_course_activity_content.html.erb | 16 ++++++++--------
public/stylesheets/css/structure.css | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/views/courses/_course_activity_content.html.erb b/app/views/courses/_course_activity_content.html.erb
index 9bf55b04b..0c6d0f764 100644
--- a/app/views/courses/_course_activity_content.html.erb
+++ b/app/views/courses/_course_activity_content.html.erb
@@ -23,20 +23,20 @@
<% end %>
- 新建
-
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index dadcc6cf0..5624baf34 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -535,7 +535,7 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
.flex-cell_homepage:hover{ background-color:#3b94d6;}
.feedback_error p{display: inline;}
-.activities_btn .activities_item,.activities_btn div{float: left;text-align: center;border-radius: 4px;border: 1px solid #FF7500;padding: 1px 16px;}
+.activities_btn .activities_item,.activities_btn div{float: left;text-align: center;border-radius: 4px;border: 1px solid #FF7500;padding: 1px 10px;}
.activities_btn .activities_item:hover{color:#fff!important;background: #FF7500;}
.activities_btn .activities_item:hover .color-orange03{color: #fff!important;}
.activities_btn .activities_item .edu-cir-orange{color: #fff!important;}
From d29ffa7f4705cb39a6bb38372483ef5c6357f122 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 30 Sep 2017 15:35:23 +0800
Subject: [PATCH 3/4] =?UTF-8?q?TPI=E4=B8=AD=E7=9A=84=E5=85=A8=E9=83=A8?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=8A=80=E8=83=BD=E6=A0=87=E7=AD=BE?=
=?UTF-8?q?=20+=EF=BC=90=E3=80=80=E6=9B=B4=E6=8D=A2=E6=88=90=E2=80=9C?=
=?UTF-8?q?=E6=97=A0=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/games/_games_list.html.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/games/_games_list.html.erb b/app/views/games/_games_list.html.erb
index ed0ac1851..f64b8914d 100644
--- a/app/views/games/_games_list.html.erb
+++ b/app/views/games/_games_list.html.erb
@@ -52,7 +52,7 @@
<% gold_score = @myshixun.shixun.status <= 1 ? 0 : (game.answer_open? ? -challenge.score.to_i : game.final_score.to_i) %>
经验值+<%= final_score %>
金币 ml5"><%= gold_score < 0 ? gold_score : "+"+gold_score.to_s %>
- 技能标签+<%= (game.answer_open? || @myshixun.shixun.status <= 1) ? 0 : challenge.challenge_tags.count %>
+ 技能标签 ml5"><%= (game.answer_open? || @myshixun.shixun.status <= 1) ? "无" : "+"+challenge.challenge_tags.count.to_s %>
<% end %>
From 5ee2755dd2beef31d306e38f8569a2e860e97cd0 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 30 Sep 2017 16:45:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=95=E5=8D=B7?=
=?UTF-8?q?=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/courses/_course_activity_content.html.erb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app/views/courses/_course_activity_content.html.erb b/app/views/courses/_course_activity_content.html.erb
index 0c6d0f764..5b7d02b73 100644
--- a/app/views/courses/_course_activity_content.html.erb
+++ b/app/views/courses/_course_activity_content.html.erb
@@ -31,6 +31,9 @@
<%= link_to '实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-grey", :remote => true %>
+
+ 试 卷
+
资 源