From 1f09817e4d7d5a7013688c86fad6246c16d2a0f0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 5 Jan 2016 12:59:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B=E8=AE=A8?=
 =?UTF-8?q?=E8=AE=BA=E5=8C=BA/=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E5=8A=9F=E8=83=BD=20?=
 =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E6=9B=B4=E5=A4=9A=20=E7=BB=9F=E4=B8=80=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E9=AB=98=E5=BA=A6=E4=B8=BA=E4=B8=80=E4=B8=AA=E5=B1=8F?=
 =?UTF-8?q?=E5=B9=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/blogs/_article.html.erb             | 20 ++++++++++------
 app/views/blogs/_article_list.html.erb        | 24 ++++++++++++-------
 .../boards/_project_show_detail.html.erb      | 24 ++++++++++++-------
 public/stylesheets/courses.css                |  4 ++--
 public/stylesheets/new_user.css               |  3 ++-
 public/stylesheets/project.css                |  6 -----
 public/stylesheets/public.css                 |  6 ++++-
 7 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index 33a3201c0..ee20dcd22 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -57,13 +57,14 @@
       <div class="homepagePostDate">
         发帖时间：<%= format_time(activity.created_on) %>
       </div>
-
-      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
-        <% if activity.parent_id.nil? %>
-            <%= activity.content.to_s.html_safe%>
-        <% else %>
-            <%= activity.parent.content.to_s.html_safe%>
-        <% end %>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
+        <div id="intro_content_<%= user_activity_id%>">
+          <% if activity.parent_id.nil? %>
+              <%= activity.content.to_s.html_safe%>
+          <% else %>
+              <%= activity.parent.content.to_s.html_safe%>
+          <% end %>
+        </div>
       </div>
       <div class="cl"></div>
       <div class=" fl" style="width: 600px">
@@ -72,6 +73,11 @@
             <%= render :partial => 'blog_comments/attachments_links', :locals => {:attachments => activity.attachments, :options => options, :is_float => true} %>
         <% end %>
       </div>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
+      
       <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
diff --git a/app/views/blogs/_article_list.html.erb b/app/views/blogs/_article_list.html.erb
index f6383c95b..10868efb4 100644
--- a/app/views/blogs/_article_list.html.erb
+++ b/app/views/blogs/_article_list.html.erb
@@ -76,15 +76,21 @@
               $(function () {
                   init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
                   showNormalImage('activity_description_<%= topic.id %>');
-                  /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
-                   if (description_images.length>0) {
-                   for (var i=0; i<description_images.length; i++){
-                   var image=$(description_images[i]);
-                   var element=$("<a></a>").attr("href",image.attr('src'));
-                   image.wrap(element);
-                   }
-                   }
-                   $('#activity_description_<%#= topic.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});*/
+                  if($("#intro_content_<%= topic.id %>").height() > 360) {
+                      $("#intro_content_show_<%= topic.id %>").show();
+                  }
+                  $("#intro_content_show_<%= topic.id %>").click(function(){
+                      $("#activity_description_<%= topic.id %>").toggleClass("maxh360");
+                      $("#activity_description_<%= topic.id%>").toggleClass("lh18");
+                      $("#intro_content_show_<%= topic.id %>").hide();
+                      $("#intro_content_hide_<%= topic.id %>").show();
+                  });
+                  $("#intro_content_hide_<%= topic.id %>").click(function(){
+                      $("#activity_description_<%= topic.id %>").toggleClass("maxh360");
+                      $("#activity_description_<%= topic.id%>").toggleClass("lh18");
+                      $("#intro_content_hide_<%= topic.id %>").hide();
+                      $("#intro_content_show_<%= topic.id %>").show();
+                  });
               });
           </script>
           <% if topic %>
diff --git a/app/views/boards/_project_show_detail.html.erb b/app/views/boards/_project_show_detail.html.erb
index 166978ee0..7af315f56 100644
--- a/app/views/boards/_project_show_detail.html.erb
+++ b/app/views/boards/_project_show_detail.html.erb
@@ -41,15 +41,21 @@
             $(function () {
                 init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
                 showNormalImage('activity_description_<%= topic.id %>');
-                /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
-                 if (description_images.length>0) {
-                 for (var i=0; i<description_images.length; i++){
-                 var image=$(description_images[i]);
-                 var element=$("<a></a>").attr("href",image.attr('src'));
-                 image.wrap(element);
-                 }
-                 }
-                 $('#activity_description_<%#= topic.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});*/
+                if($("#intro_content_<%= topic.id %>").height() > 360) {
+                    $("#intro_content_show_<%= topic.id %>").show();
+                }
+                $("#intro_content_show_<%= topic.id %>").click(function(){
+                    $("#activity_description_<%= topic.id %>").toggleClass("maxh360");
+                    $("#activity_description_<%= topic.id%>").toggleClass("lh18");
+                    $("#intro_content_show_<%= topic.id %>").hide();
+                    $("#intro_content_hide_<%= topic.id %>").show();
+                });
+                $("#intro_content_hide_<%= topic.id %>").click(function(){
+                    $("#activity_description_<%= topic.id %>").toggleClass("maxh360");
+                    $("#activity_description_<%= topic.id%>").toggleClass("lh18");
+                    $("#intro_content_hide_<%= topic.id %>").hide();
+                    $("#intro_content_show_<%= topic.id %>").show();
+                });
             });
         </script>
         <% if topic %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 2e8133172..434b13dd3 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -216,8 +216,8 @@ a.menuGrey:hover {color:#fe7d68;}
 #navSearchAlert {display:none;}
 .homepagePostReplyjournal{margin-left: 15px; float: left;}
 
-.lh18 {line-height: 18px;}
-.maxh360 {max-height: 360px;}
+/*.lh18 {line-height: 18px;}*/
+/*.maxh360 {max-height: 360px;}*/
 
 /*邮件邀请*/
 .box_main{ width:345px; margin:0 auto;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 0e387f5ef..9244fe5da 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -706,7 +706,8 @@ a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px n
 a:hover.gz_btn{ color:#ff5722;}
 .homepagePostReplyjournal{margin-left: 15px; float: left;}
 .lh18 {line-height: 18px;}
-.maxh360 {max-height: 360px;}
+/*该高度会写入配置文件*/
+.maxh360 {max-height: 760px;}
 
 .courseMenu {width:30px; display:block; float:right;height: 50px;}
 .courseMenuIcon {display:inline-block; background:url(../images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px; position: relative;line-height:0;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 91afb852b..bb63b8c4e 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -962,12 +962,6 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
     margin-bottom: 5px;
     font-weight: bold;
 }
-.maxh360 {
-    max-height: 360px;
-}
-.lh18 {
-    line-height: 18px;
-}
 .homepagePostIntro {
     font-size: 14px;
     color: #484848;
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index e898db13e..7f9a4ad7a 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -956,4 +956,8 @@ span.at {color:#269ac9;}
 .sectionContent li:hover {background-color:#cccccc;}
 .sectionContent span {width:160px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:20px; vertical-align:top;}
 .orgDirection {width:392px; background-color:#f1f1f1; height:30px; vertical-align:middle; line-height:30px; color:#585858; padding-left:10px;}
-.orgSendSearch {border:1px solid #dddddd; outline:none; width:262px; height:22px; padding-left:10px; float:left;}
\ No newline at end of file
+.orgSendSearch {border:1px solid #dddddd; outline:none; width:262px; height:22px; padding-left:10px; float:left;}
+
+/*文本描述展开高度*/
+.maxh360 {max-height: 760px;}
+.lh18 { line-height: 18px;}
\ No newline at end of file