From 789f3906a5de7ae7bd355729807817f63025f12a Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 29 Apr 2016 15:07:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8F=8F=E8=BF=B0=E5=86=85=E5=AE=B9=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_course_list.html.erb | 4 ++--
 public/javascripts/application.js          | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb
index 610c16293..ca9420f7d 100644
--- a/app/views/users/_user_course_list.html.erb
+++ b/app/views/users/_user_course_list.html.erb
@@ -28,10 +28,10 @@
           <div class="cl"></div>
             <li class="ml15">
               <span class="grayTxt">
-                  开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
+                  创建时间：<%= format_time(course.created_at) %>
               </span>
               <span class="grayTxt">
-                  创建时间：<%= format_time(course.created_at) %>
+                  开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
               </span>
               <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
                   <% homework_num = course.homework_commons.count %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 31807b8d0..7c52bae35 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1246,6 +1246,9 @@ function description_showwords_ellipsis(id){
         str = str + $(this).text();
     });
 
+    //去掉空格
+    str = str.replace(/\s/gi,'');
+
     if(str.length > 100){
         str = str.substring(0,100)+"...";
     }