From 7b379456ed8af02c0253f761441388db8c506f80 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 25 Mar 2015 14:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E5=BE=88=E9=95=BF=E6=97=B6=E6=89=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/homework.html.erb | 17 ++++++++++++++---
 public/javascripts/course.js        | 11 +++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb
index f5fe74953..82a0b579d 100644
--- a/app/views/courses/homework.html.erb
+++ b/app/views/courses/homework.html.erb
@@ -27,9 +27,20 @@
             <%= student_new_homework bid %>
         <% end %>
         <div class="cl"></div>
-        <p  id="bid_description_<%= bid.id%>" class="news_description mt5">
-          <%= textilizable bid, :description %>
-        <div class="news_foot c_red" onclick="bid_show_more_des(<%= bid.id%>);" style="cursor:pointer;">
+        <script>
+            $(function(){
+                if($("#bid_description_<%= bid.id%>_content").height()>38)
+                {
+                    $("#bid_show_more_des_button<%= bid.id%>").show();
+                }
+            });
+        </script>
+        <div  id="bid_description_<%= bid.id%>" class="news_description mt5">
+          <div id="bid_description_<%= bid.id%>_content">
+            <%= textilizable bid, :description %>
+          </div>
+        </div>
+        <div class="news_foot c_red" id="bid_show_more_des_button<%= bid.id%>" onclick="bid_show_more_des(<%= bid.id%>);" style="cursor:pointer;display: none;">
           <%= l(:button_more)%>...
           <span class="g-arr-down"></span>
         </div>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index babdc4043..9bc784e70 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -34,10 +34,7 @@ function bid_show_more_des(id)
 {
     $("#bid_description_" + id).toggleClass("news_description_none");
 }
-//将右侧的最小高度设置成左侧高度，美化界面
-$(document).ready(function () {
-    $("#RSide").css("min-height",$("#LSide").height()-30);
-});
+
 //课程作业结束时间倒计时
 function show_bid_dead_line(year,month,day,divname)
 {
@@ -152,9 +149,15 @@ function hidden_atert_form(cur_page,cur_type)
     hideModal($("#popbox"));
 }
 
+//当课程描述长度小于112px时，不显示更多按钮
 $(function(){
     if($("#course_description_content").height()>112)
     {
         $("#lg-foot").show();
     }
+});
+
+//将右侧的最小高度设置成左侧高度，美化界面
+$(document).ready(function () {
+    $("#RSide").css("min-height",$("#LSide").height()-30);
 });
\ No newline at end of file