From 86ef3e680aec1fb7e5f247808ece802135b63db3 Mon Sep 17 00:00:00 2001 From: whimlex Date: Mon, 20 Apr 2015 14:45:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B=E5=B1=95?= =?UTF-8?q?=E5=BC=80=E6=9B=B4=E5=A4=9A=E4=BF=A1=E6=81=AF=E4=B8=8D=E8=B6=85?= =?UTF-8?q?=E8=BF=87=E4=B8=80=E5=AE=9A=E5=86=85=E5=AE=B9=E4=B8=8D=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_projects.html.erb | 4 ++-- public/javascripts/project.js | 6 +++--- public/stylesheets/pleft.css | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index d71722ce8..ca9f43d53 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -182,12 +182,12 @@

<%= l(:label_project_overview)%>:

-
+
<%= textilizable(@project.description) if @project.description && !@project.description.blank? %>
- + diff --git a/public/javascripts/project.js b/public/javascripts/project.js index b5f769723..cf278b480 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -47,14 +47,14 @@ function show_more_msg() { var information = $("#expend_more_information"); var arrow = $("#arrow"); var val = information.attr("value"); - if (val == "展开更多信息") { + if (val == "show_more") { $("#expend_more_information").text("收起描述信息"); - information.attr("value", "收起描述信息"); + information.attr("value", "hide_more"); arrow.attr("src", "/images/jiantouup.jpg") } else { $("#expend_more_information").text("展开更多信息"); - information.attr("value", "展开更多信息"); + information.attr("value", "show_more"); arrow.attr("src", "/images/jiantou.jpg") } } diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css index cc7e18465..a64d3671f 100644 --- a/public/stylesheets/pleft.css +++ b/public/stylesheets/pleft.css @@ -50,7 +50,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; word-break: break-all;word-wrap: break-word;} .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;}