From 57ecffc130a637456d5a0df4e0bd6eddc808d7ab Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 24 Aug 2016 10:28:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_user_courses.html.erb |   6 ++++++
 app/views/layouts/new_base_user.html.erb |   2 +-
 app/views/users/_courses_list.html.erb   |   5 +++--
 public/images/syllabus/sy_icons_star.png | Bin 0 -> 18508 bytes
 public/stylesheets/syllabus.css          |   5 +++++
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 public/images/syllabus/sy_icons_star.png

diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb
index b3b21547e..485ef72ff 100644
--- a/app/views/layouts/_user_courses.html.erb
+++ b/app/views/layouts/_user_courses.html.erb
@@ -45,6 +45,12 @@
                 <%= link_to "论坛",course_boards_path(course), :class => 'user_navmore_li fl',:target => '_blank' %>
                 <%= link_to "+",course_boards_path(course, :flag => true, :is_new => 1), :class => 'user_navmore_add fl', :title => '发布帖子',:target => '_blank' %>
               </li>
+
+              <li>
+                <%= link_to "取消收藏", :class => 'user_navmore_li',:target => '_blank' %>
+                <div class="cl"></div>
+              </li>
+
               <% if !course.syllabus.nil? %>
                   <li>
                     <%= link_to "所属课程",syllabus_path(course.syllabus_id), :class => 'user_navmore_li',:target => '_blank' %>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 50e788e2f..d91939c4b 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -157,7 +157,7 @@
         <% if !unvisiable %>
         <ul class="users_accordion mb10">
           <li id="user_01" class="user_icons_course">
-            <%= link_to '课程',{:controller => "users", :action => "user_courselist", :id => @user.id}, :id => "user_course_list" %>
+            <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user.id}, :id => "user_course_list" %>
             <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
             <% all_count = @user.courses.visible.where("is_delete =?", 0).count%>
             <div class="<%= courses.empty? ? 'none' : ''%>" >
diff --git a/app/views/users/_courses_list.html.erb b/app/views/users/_courses_list.html.erb
index 83b9ab56b..42c92b1a0 100644
--- a/app/views/users/_courses_list.html.erb
+++ b/app/views/users/_courses_list.html.erb
@@ -3,11 +3,12 @@
         <li class="syllabus_class_list <%=i > 2 ? 'none' : '' %>">
           <% allow_visit = User.current.member_of_course?(course) || User.current.admin? || course.is_public == 1 %>
           <a href="<%= allow_visit ? course_path(course.id) : "javascript:void(0)" %>" target="_blank" title="<%= allow_visit ? "" : "私有班级不可访问"%>">
-            <span class="icons_sy_cir "></span>
+            <span class="icons_sy_favorite "></span>
+            <span class="icons_sy_star "></span>
             <div class="fl">
               <div class="syllabus_class_w ">
                 <p class="syllabus_class_title fl"><%=course.name %></p>
-                <span class="<%= course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl"></span>
+                <span class="<%= course.is_public == 0 ? 'syllabus_class_private' : 'syllabus_class_open' %> fl ml10 mt3 syllabus_class_property"><%= course.is_public == 0 ? '私有' : '公开' %></span>
                 <span class="fr sy_p_grey hidden" style="max-width: 120px;">主讲老师：<%=course.teacher.show_name %></span>
                 <div class="cl"></div>
               </div>
diff --git a/public/images/syllabus/sy_icons_star.png b/public/images/syllabus/sy_icons_star.png
new file mode 100644
index 0000000000000000000000000000000000000000..2256346d960cb3cae2ebff90ea29447b23fce255
GIT binary patch
literal 18508
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
G?fpNVBhm2y

literal 0
HcmV?d00001

diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index c506d3d5f..52b172f23 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -80,6 +80,8 @@ input.syllabus_input_min{
 .icons_sy_setting{background: url(../images/syllabus/icons_syllabus.png) -51px -33px no-repeat; width:20px; height:20px; display:block; position:absolute; right:10px; top:10px; }
 .icons_sy_setting:hover{background: url(../images/syllabus/icons_syllabus.png) -25px -33px no-repeat; }
 .icons_sy_cir{background: url(../images/syllabus/icons_syllabus.png) 0px -82px no-repeat; width:15px; height:15px; display:block; position:absolute; left:-8px; top:25px;}
+.icons_sy_favorite{background: url(../images/syllabus/sy_icons_star.png) 0px 0px no-repeat; width:20px; height:20px; display:block; position:absolute; left:-10px; top:25px;}
+.icons_sy_star{background: url(../images/syllabus/sy_icons_star.png) 0px -27px no-repeat; width:20px; height:20px; display:block; position:absolute; left:-10px; top:25px;}
 .icons_sy_arrow{background: url(../images/syllabus/icons_syllabus.png) -31px -81px no-repeat; width:20px; height:20px; display:block; }
 .syllabus_h2_top{  font-size:18px; color:#333; font-weight:normal;  padding:10px 15px;border-bottom:1px solid #e7e7e7; }
 .syllabus_category{ padding:10px 15px; background-color:#f6f6f6; border-bottom:1px solid #e7e7e7;}
@@ -96,6 +98,9 @@ input.syllabus_input_min{
 .syllabus_class_list_more a{ color:#ff7e00;}
 .syllabus_class_title{ font-size:14px; color:#333; max-width:480px; margin-bottom:3px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
 .syllabus_class_w{ width:650px;}
+.syllabus_class_property {font-size:12px; padding:0 5px; border-radius:3px; line-height:14px;}
+.syllabus_class_private {color:#ff4a1b; border:1px solid #ff4a1b;}
+.syllabus_class_open {color:#7dd26c; border:1px solid #7dd26c;}
 
 
 /*新建页面*/

From bb2b51aa8d82bcaec73a8a6a1ccf960d0608a98a Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 24 Aug 2016 10:30:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_courses_list.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_courses_list.html.erb b/app/views/users/_courses_list.html.erb
index 42c92b1a0..7254a0818 100644
--- a/app/views/users/_courses_list.html.erb
+++ b/app/views/users/_courses_list.html.erb
@@ -3,8 +3,8 @@
         <li class="syllabus_class_list <%=i > 2 ? 'none' : '' %>">
           <% allow_visit = User.current.member_of_course?(course) || User.current.admin? || course.is_public == 1 %>
           <a href="<%= allow_visit ? course_path(course.id) : "javascript:void(0)" %>" target="_blank" title="<%= allow_visit ? "" : "私有班级不可访问"%>">
-            <span class="icons_sy_favorite "></span>
-            <span class="icons_sy_star "></span>
+            <span class="icons_sy_favorite " title="点击将其从个人主页的班级列表中移除"></span>
+            <span class="icons_sy_star " title="点击将其添加至个人主页的班级列表中"></span>
             <div class="fl">
               <div class="syllabus_class_w ">
                 <p class="syllabus_class_title fl"><%=course.name %></p>