From 27e7bc21b523bc7490103f6da58d27ad101857a1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 25 Mar 2015 14:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E8=AF=BE=E7=A8=8B=E7=AE=80=E4=BB=8B?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=BE=88=E5=B0=91=E6=97=B6=EF=BC=88=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=98=BE=E7=A4=BA=E6=9B=B4=E5=A4=9A=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=8F=8D=E5=BA=94=EF=BC=89=EF=BC=8C=E5=8F=96=E6=B6=88=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb |  6 ++++--
 public/javascripts/course.js            | 10 +++++++++-
 public/stylesheets/leftside.css         |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 684765b9b..95384845f 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -150,9 +150,11 @@
       <div class="project_intro">
         <div id="course_description" class="course_description">
           <h4 ><%= l(:label_course_brief_introduction)%>：</h4>
-          <%= textilizable(@course.description) if @course.description && !@course.description.blank? %>
+          <div id="course_description_content">
+            <%= textilizable(@course.description) if @course.description && !@course.description.blank? %>
+          </div>
         </div>
-        <div class="lg-foot" onclick="show_more_msg();">
+        <div class="lg-foot" id="lg-foot" onclick="show_more_msg();">
           <%= l(:label_expend_information)%>
           <span class="g-arr-down">
             <img src="/images/jiantou.jpg" width="12" height="6" />
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 69432c8b3..4da7b142e 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -150,4 +150,12 @@ function close_window(id1,id2){
 function hidden_atert_form(cur_page,cur_type)
 {
     hideModal($("#popbox"));
-}
\ No newline at end of file
+}
+
+$(function(){
+    alert($("#course_description_content").height());
+    if($("#course_description_content").height()>112)
+    {
+        $("#lg-foot").show();
+    }
+});
\ No newline at end of file
diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css
index ee7cd2001..8551d8f94 100644
--- a/public/stylesheets/leftside.css
+++ b/public/stylesheets/leftside.css
@@ -46,7 +46,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;}
 .course_description{max-height: 112px;overflow:hidden;}
 .course_description_none{max-height: none;}
-.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;}
+.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;}
 .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}
 /****标签(和资源库的tag样式一致)***/
 .project_Label{ width:220px; padding:10px; background:#fff; margin-top:10px;  padding-top:5px; margin-bottom:10px;}