From 462a5b3cd62debef3ab37f42e0690bfd58188f63 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 21 Jul 2017 19:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=96=B0=E5=BB=BA=E5=AE=9E=E8=AE=AD=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/challenges/_skill_form.html.erb             | 2 +-
 app/views/challenges/edit.html.erb                    | 6 +++---
 app/views/courses/_member_all_student_list.html.erb   | 2 +-
 app/views/courses/_member_group_student_list.html.erb | 2 +-
 app/views/courses/settings.html.erb                   | 4 ++--
 app/views/courses/settings/_members.html.erb          | 2 +-
 app/views/shixuns/_shixun_list.html.erb               | 2 +-
 app/views/subjects/_subject_list.html.erb             | 6 +++---
 app/views/users/_user_journalsformessage.html.erb     | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/challenges/_skill_form.html.erb b/app/views/challenges/_skill_form.html.erb
index 012ae2ea9..b77e62c77 100644
--- a/app/views/challenges/_skill_form.html.erb
+++ b/app/views/challenges/_skill_form.html.erb
@@ -37,7 +37,7 @@
         var val = $(".task-tag-input").val().trim();
         if (val != ""){
             testLength = $(".task-tag-input").val().trim().length;
-            $("#add_knowledge").before("<div class='task-tag tag-grey mt5 mr10 fl' id='knowledge_" + num + "'>" +
+            $("#add_shixun_skill").before("<div class='task-tag tag-grey mt5 mr10 fl' id='knowledge_" + num + "'>" +
                     "<button data-dismiss='alert' class='close fr mt3 ml5' type='button' onclick='close_tag(this)'>×</button>" +
                     "<input style='width:"+ testLength*12 +"px' class='knowledge_frame' name='knowledge[input][]' value='" + val +"'>" +
                     " </div>");
diff --git a/app/views/challenges/edit.html.erb b/app/views/challenges/edit.html.erb
index 741f09a1f..aa5c57ddc 100644
--- a/app/views/challenges/edit.html.erb
+++ b/app/views/challenges/edit.html.erb
@@ -17,8 +17,8 @@
 
 <div class="task-pm-content mb20">
   <div class="task-pm-box mt20">
-    <div class="panel-header clearfix">
-      <h3 class="fl mt5">阶段编辑（第<%= @challenge.position %>关）</h3>
+    <div class="panel-header clearfix user_bg_shadow">
+      <h3 class="fl mt5">阶段详情（第<%= @challenge.position %>关）</h3>
       <% unless @next_challenge.blank? %>
           <a href="<%= edit_shixun_challenge_path(@next_challenge, :shixun_id => @shixun) %>" class="shixun-task-btn task-btn-green fr ml10">下一阶段</a>
       <% end %>
@@ -44,7 +44,7 @@
       <a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 5) %>" class="color-black">技能勋章</a>
     </li>
   </ul>
-  <div class="task-pm-box mh550">
+  <div class="task-pm-box mh550 user_bg_shadow">
     <% if @tab == 1 || @tab.blank? %>
         <%= render :partial => "edit_task_pass" %>
     <% elsif @tab == 2 %>
diff --git a/app/views/courses/_member_all_student_list.html.erb b/app/views/courses/_member_all_student_list.html.erb
index 6fb084325..1fd3ebb1c 100644
--- a/app/views/courses/_member_all_student_list.html.erb
+++ b/app/views/courses/_member_all_student_list.html.erb
@@ -41,7 +41,7 @@
         <%= link_to '学号排序', course_member_path(@course, :order => "student_id", :role => 'as', :sort => @sort), :class => "fl #{@order == 'student_id' ? 'color-blue' : ''}", :remote => true %>
         <span class="mr5 ml5 fl">|</span>
         <%= link_to '姓名排序', course_member_path(@course, :order => "lastname", :role => 'as', :sort => @sort), :class => "fl #{@order == 'lastname' ? 'color-blue' : ''}", :remote => true %>
-        <span class="fr right mt10" style=" height: 36px; line-height:36px;width:205px; margin-top:11px;"><input class="mr15 pl5 color-grey" style="width:160px;"  type="text" value="<%= @search %>" id="all_student_list_search" placeholder="输入姓名、学号进行搜索"/><i class="fa fa-search font-16 mt8 mr10" onclick="submit_member_all_student_list_search('<%= @course.id %>');" style="color:#ddd;"></i></span>
+        <span class="fr right mt10" style=" height: 36px; line-height:36px;width:205px; margin-top:11px;"><input class="mr15 pl5 color-grey" style="width:160px;"  type="text" value="<%= @search %>" id="all_student_list_search" placeholder="输入姓名、学号进行搜索"/><i class="fa fa-search font-16 mt8 mr10 color-grey" onclick="submit_member_all_student_list_search('<%= @course.id %>');" style="color:#ddd;"></i></span>
         </p>
       <!--------------全部学生-------------------->
       <ul class="all pl20 pr20 color-grey">
diff --git a/app/views/courses/_member_group_student_list.html.erb b/app/views/courses/_member_group_student_list.html.erb
index 7af450a4c..f4d16c42d 100644
--- a/app/views/courses/_member_group_student_list.html.erb
+++ b/app/views/courses/_member_group_student_list.html.erb
@@ -32,7 +32,7 @@
   </ul>
 </div>
 <div class="right fl">
-  <div class="banner clearfix mb20 font-16 user_bg_shadow bc-grey">
+  <div class="banner clearfix mb20 font-16 user_bg_shadow">
     <span class="span1 fl ">成员列表</span>
     <span class="span2 fr">
       <%= link_to '返回', course_path(@course), :class => 'font-14 color-grey' %>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index fca2e21f8..c02c8d8c5 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -6,7 +6,7 @@
     <%= link_to '返回', course_path(@course), :class => 'fr mr15 link-color-grey' %>
   </div>
   <div class="news">
-    <div class="nav clearfix">
+    <div class="nav clearfix user_bg_shadow">
       <p class="fl font-16 sheet" data-option="basic">
         基本信息<i class="fa fa-caret-down color-blue font-12" aria-hidden="true"></i>
       </p>
@@ -28,7 +28,7 @@
         <%= labelled_form_for @course, :html => {:remote => true} do |f| %>
            <!-- <div class="top clearfix">
               <div class="pic fl">
-                <a href="javascript:void(0);"><%= image_tag(url_to_avatar(@course),width:"139", height: "76", :id=>'nh_source_tx', :alt => '头像') %></a>
+                <a href="javascript:void(0);"><%#= image_tag(url_to_avatar(@course),width:"139", height: "76", :id=>'nh_source_tx', :alt => '头像') %></a>
 
                 <a href="javascript:void(0);" class="changepic">更换图片</a>
               </div>
diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb
index bbda82387..018e028fa 100644
--- a/app/views/courses/settings/_members.html.erb
+++ b/app/views/courses/settings/_members.html.erb
@@ -46,7 +46,7 @@
               <tr id="setting_member_<%= user.id %>">
                 <td><%= @teacher_count + index + 1 %></td>
                 <td>
-                  <%= link_to show_real_name_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %>
+                  <%= link_to user.show_real_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %>
                 </td>
                 <td><span class="edu-txt-w140 task-hide mt5"><%= user.try(:login) %></span></td>
                 <td><%= apply.content && apply.content.include?('9') ? "教师" : "助教" %></td>
diff --git a/app/views/shixuns/_shixun_list.html.erb b/app/views/shixuns/_shixun_list.html.erb
index 2b0dcec9e..1ef96c1d5 100644
--- a/app/views/shixuns/_shixun_list.html.erb
+++ b/app/views/shixuns/_shixun_list.html.erb
@@ -8,7 +8,7 @@
 </ul>
 <div class="task-index-list clearfix mb20">
 <% if @shixuns.blank? %>
-    <div style="background: #fff;padding-bottom: 15px;">
+    <div style="background: #fff;padding-bottom: 15px;" class="user_bg_shadow">
     <%= render :partial => "welcome/no_data" %>
     </div>
 <% else %>
diff --git a/app/views/subjects/_subject_list.html.erb b/app/views/subjects/_subject_list.html.erb
index b0c4da0d0..60e1ba55a 100644
--- a/app/views/subjects/_subject_list.html.erb
+++ b/app/views/subjects/_subject_list.html.erb
@@ -30,9 +30,9 @@
                 <span class="task-index-name task-hide fl"><%= subject.user.try(:show_name) %></span>
               </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 %>
-                <% end %>
+                <%# if !subject.user.user_extensions.school_id.blank? && subject.user.user_extensions.school %>
+                    <%#= subject.user.user_extensions.school.name %>
+                <%# end %>
               </p>
               <p class="color-grey pl15 pr15 clearfix" style="text-align: center;">
                 <span class="" style="margin: 0 10px"><i class="fa fa-gamepad color-light-green pr10" aria-hidden="true" title="实训"></i><em><%= subject.stage_shixuns.count %></em></span>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index a00601f81..c149c52c5 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -1,4 +1,4 @@
-<div class="eduResources mb10" id="user_activity_<%= user_activity_id%>" style="<%= activity.private == 1? 'background-color:#cecece;':'' %>">
+<div class="eduResources mb10" id="user_activity_<%= user_activity_id%>">
   <div class="eduHomepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %>