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 @@

<%= l(:label_course_brief_introduction)%>:

- <%= textilizable(@course.description) if @course.description && !@course.description.blank? %> +
+ <%= textilizable(@course.description) if @course.description && !@course.description.blank? %> +
-
+
<%= l(:label_expend_information)%> 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;}