Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/layouts/_project_info.html.erb

@@ -3,10 +3,17 @@
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <div class="pr_info_logo fl mr10 mb5">
+  <% if @course.id == 370 %>
+    <img src="/images/course/boutique.png" width="50" height="auto" alt="精品" class="boutiqueP" />
+  <% end %>
 <!--<a href="#"><img src="images/courses/pic_courses.jpg" width="60" height="60" alt="logo" /></a>-->
 <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
 </div>
-<div class="pr_info_id fl mb5 f14"><%= @course.is_public == 0 ? "私有课程" : "公开课程" %></div>
+<div class="pr_info_id fl mb5 f14"><%= @course.is_public == 0 ? "私有课程" : "公开课程" %>
+  <% if @course.id == 370 %>
+    <img src="/images/course/medal.png" alt="精品课程" style="vertical-align:bottom;" class="ml5" />
+  <% end %>
+</div>
 <div class="pr_info_id fl f14">
 ID:<%= @course.id%>
 </div>

db/migrate/20151231012634_add_last_term_to_course.rb

@@ -1,17 +0,0 @@
-class AddLastTermToCourse < ActiveRecord::Migration
-  def change
-    add_column :courses, :end_time, :integer
-    add_column :courses, :end_term, :string
-
-    count = Course.all.count / 30 + 2
-    transaction do
-      for i in 1 ... count do
-        Course.page(i).per(30).each do |course|
-          course.end_time = course.time
-          course.end_term = course.term
-          course.save
-        end
-      end
-    end
-  end
-end

public/stylesheets/courses.css

@@ -1255,3 +1255,4 @@ div.disable_link {background-color: #c1c1c1 !important;}
 .boxShadow {box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
 
 .fn {font-weight:normal}
+.boutiqueP {position:absolute; left:0px; top:0px;}