From 44441a644891e2fb2361d370f566d81f66893fdc Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 5 Jun 2017 09:55:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E7=B2=89=E4=B8=9D=E5=92=8C=E5=85=B3=E6=B3=A8=E2=80=9C?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A=E2=80=9D=E8=AF=B7=E5=85=88?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_edu_user_watch_fan_list.html.erb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/users/_edu_user_watch_fan_list.html.erb b/app/views/users/_edu_user_watch_fan_list.html.erb
index 07330b1d6..9249dd3af 100644
--- a/app/views/users/_edu_user_watch_fan_list.html.erb
+++ b/app/views/users/_edu_user_watch_fan_list.html.erb
@@ -31,9 +31,9 @@
               <dd class="mb10"><%= link_to user.show_name, user_path(user), :target => '_blank' %></dd>
             </dl>
         <% end %>
-        <% if @user_watchlist_count > 12 %>
-            <%= link_to '查看更多', user_watchlist_user_path(@user), :target => '_blank', :class => 'color-grey many' %>
-        <% end %>
+        <%# if @user_watchlist_count > 12 %>
+            <%#= link_to '查看更多', user_watchlist_user_path(@user), :target => '_blank', :class => 'color-grey many' %>
+        <%# end %>
       </div>
   <% end %>
 </div>
@@ -55,9 +55,9 @@
               <dd class="mb10"><%= link_to user.show_name, user_path(user), :target => '_blank' %></dd>
             </dl>
         <% end %>
-        <% if @user_fanlist_count > 12 %>
-            <%= link_to '查看更多', user_fanslist_user_path(@user), :target => '_blank', :class => 'color-grey many' %>
-        <% end %>
+        <%# if @user_fanlist_count > 12 %>
+            <%#= link_to '查看更多', user_fanslist_user_path(@user), :target => '_blank', :class => 'color-grey many' %>
+        <%# end %>
       </div>
   <% end %>
 </div>
\ No newline at end of file

From af44ac07a6a2ffe4a892617a1ecf831dd9f11951 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 5 Jun 2017 10:46:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=99=BA=E8=83=BD=E8=AF=BE=E5=A0=82?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=BE=E7=A8=8B=E5=8F=91=E5=B8=83=E4=BA=BA=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=97=A0=E6=95=88=20=E6=99=BA=E8=83=BD=E8=AF=BE?=
 =?UTF-8?q?=E5=A0=82=EF=BC=8C=E8=AF=BE=E7=A8=8B=E5=8F=91=E5=B8=83=E4=BA=BA?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=9B=B8=E5=AF=B9=E5=BA=94=E7=9A=84=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E5=92=8C=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_courseList.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/courses/_courseList.html.erb b/app/views/courses/_courseList.html.erb
index 0e8f4ebb3..d2d3cff9b 100644
--- a/app/views/courses/_courseList.html.erb
+++ b/app/views/courses/_courseList.html.erb
@@ -1,14 +1,14 @@
 <% @syllabuses.each do | sy | %>
     <div class="sub-con fl" style="cursor: default;">
-      <div class="task-index-list-box-top ">
-        <a href="<%= syllabus_path(sy) %>" title="<%= sy.title %>" target="_blank"  >
+      <div class="task-index-list-box-top">
+        <a href="<%= syllabus_path(sy) %>" title="<%= sy.title %>" target="_blank">
           <p class="font-14 task-index-list-title  two_lines_show">
             <%= sy.title %>
           </p>
         </a>
-        <div class=" clearfix task-index-list-user">
-          <img src="images/user/female.jpg" width="60" height="60" alt="用户" class="panel-warp-img mr10  fl">
-          <a href="#" class="task-index-name task-hide fl">Cillian</a>
+        <div class="clearfix task-index-list-user">
+          <%= link_to image_tag(url_to_avatar(sy.user), :width => "60", :height => "60", :class => "panel-warp-img mr10 fl", :alt => "用户"), user_path(sy.user), :target => '_blank' %>
+          <%= link_to sy.user.show_name, user_path(sy.user), :class => 'task-index-name task-hide fl', :target => '_blank' %>
         </div>
         <p class="color-grey">
           <% sy_author = User.find(sy.user_id) %>