From e2990fb55cd56b0a3328ecd55719861ca20bcb11 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 22 Oct 2015 17:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8A=A8=E6=80=81=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E7=9A=84=E9=AB=98=E5=BA=A6=E4=B8=BA20=E8=A1=8C?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E5=B1=95=E5=BC=80=E5=92=8C=E6=94=B6=E8=B5=B7?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_activity.html.erb   | 17 +++++++++++++----
 app/views/users/_course_homework.html.erb     | 10 ++++++++--
 app/views/users/_course_message.html.erb      | 19 ++++++++++++-------
 app/views/users/_course_news.html.erb         | 10 ++++++++--
 app/views/users/_course_poll.html.erb         | 10 +++++++++-
 app/views/users/_project_issue.html.erb       | 15 ++++++++++-----
 app/views/users/_project_message.html.erb     | 18 ++++++++++++------
 app/views/users/_user_activities.html.erb     | 13 +++++++++++++
 .../users/_user_homework_detail.html.erb      | 10 ++++++++--
 app/views/users/_user_homework_list.html.erb  | 13 +++++++++++++
 public/stylesheets/courses.css                |  5 ++++-
 public/stylesheets/new_user.css               |  4 +++-
 public/stylesheets/public.css                 |  2 +-
 13 files changed, 114 insertions(+), 32 deletions(-)

diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb
index aa99236df..b79964a8d 100644
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@@ -68,13 +68,22 @@
                 }
             }
 
-            function expand_reply_input(id) {
-                $(id).toggle();
-            }
-
             $(function () {
                 init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
                 showNormalImage('activity_description_<%= activity.id %>');
+                if($("#intro_content_<%= activity.id %>").height() > 360) {
+                    $("#intro_content_show_<%= activity.id %>").show();
+                }
+                $("#intro_content_show_<%= activity.id %>").click(function(){
+                    $("#activity_description_<%= activity.id %>").toggleClass("maxh360");
+                    $("#intro_content_show_<%= activity.id %>").hide();
+                    $("#intro_content_hide_<%= activity.id %>").show();
+                });
+                $("#intro_content_hide_<%= activity.id %>").click(function(){
+                    $("#activity_description_<%= activity.id %>").toggleClass("maxh360");
+                    $("#intro_content_hide_<%= activity.id %>").hide();
+                    $("#intro_content_show_<%= activity.id %>").show();
+                });
             });
         </script>
             <% if activity && activity.course_act%>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index df42f6ee9..4bde4476d 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -43,9 +43,15 @@
 
         <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id%>">
-        <%= activity.description.html_safe %>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+        <div id="intro_content_<%= user_activity_id%>">
+          <%= activity.description.html_safe %>
+        </div>
       </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>
       <%# if is_teacher%>
           <!--<div class="homepagePostSetting">
             <ul>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index d9574dc0b..1653a0e8a 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -30,14 +30,19 @@
       <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" 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 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/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index bc0306ee9..9016e8b71 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -18,9 +18,15 @@
       <div class="homepagePostDate">
         发布时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id %>">
-        <%= activity.description.html_safe %>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+        <div id="intro_content_<%= user_activity_id%>">
+          <%= activity.description.html_safe %>
+        </div>
       </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>
     <div class="cl"></div>
   </div>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index 8bbdadc1a..ec76bf947 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -29,7 +29,15 @@
       <div class="homepagePostDate">
         发布时间：<%= format_time(activity.published_at) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>"><%=activity.polls_description.html_safe.to_s%></div>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+        <div id="intro_content_<%= user_activity_id%>">
+          <%= activity.polls_description.html_safe %>
+        </div>
+      </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/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 5db13a350..babf6ab35 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -33,12 +33,17 @@
           <%=format_time(activity.created_on) %>
         </div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style" id="activity_description_<%= user_activity_id %>">
-        <% if activity.description? %>
-            <%= textAreailizable activity, :description, :attachments => activity.attachments %>
-        <% end %>
-        <%#= activity.description.html_safe %>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="activity_description_<%= user_activity_id%>">
+        <div id="intro_content_<%= user_activity_id%>">
+          <% if activity.description? %>
+              <%= textAreailizable activity, :description, :attachments => activity.attachments %>
+          <% end %>
+        </div>
       </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="mt10" style="font-weight:normal;">
         <% if activity.attachments.any? %>
             <% activity.attachments.each do |attachment| %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 4b83cb906..25b47d72c 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -26,13 +26,19 @@
       <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" 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 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>
     <div class="cl"></div>
   </div>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index cc8a6c0f2..a9584c80e 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -39,6 +39,19 @@
             $(function() {
                 init_activity_KindEditor_data(<%= user_activity.id%>, null, "87%");
                 showNormalImage('activity_description_<%= user_activity.id %>');
+                if($("#intro_content_<%= user_activity.id %>").height() > 360) {
+                    $("#intro_content_show_<%= user_activity.id %>").show();
+                }
+                $("#intro_content_show_<%= user_activity.id %>").click(function(){
+                    $("#activity_description_<%= user_activity.id %>").toggleClass("maxh360");
+                    $("#intro_content_show_<%= user_activity.id %>").hide();
+                    $("#intro_content_hide_<%= user_activity.id %>").show();
+                });
+                $("#intro_content_hide_<%= user_activity.id %>").click(function(){
+                    $("#activity_description_<%= user_activity.id %>").toggleClass("maxh360");
+                    $("#intro_content_hide_<%= user_activity.id %>").hide();
+                    $("#intro_content_show_<%= user_activity.id %>").show();
+                });
             });
         </script>
         <% unless user_activity.act_type == "ProjectCreateInfo" %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 40400c71e..848417d3e 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -43,9 +43,15 @@
           <%= l(:label_end_time)%>：<%= homework_common.end_time%>
         </div>
       </div>
-      <div class="homepagePostIntro upload_img break_word list_style" id="homework_description_<%= homework_common.id%>">
-        <%= homework_common.description.html_safe %>
+      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18" id="homework_description_<%= homework_common.id%>">
+        <div id="intro_content_<%= homework_common.id%>">
+          <%= homework_common.description.html_safe %>
+        </div>
       </div>
+      <div class="cl"></div>
+      <div id="intro_content_show_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <div class="cl"></div>
       <div>
         <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
         <div class="cl"></div>
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index cf511c51f..ee3e05795 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -16,6 +16,19 @@
         $(function() {
             init_activity_KindEditor_data(<%= homework_common.id%>, null, "87%");
             showNormalImage('homework_description_<%= homework_common.id%>');
+            if($("#intro_content_<%= homework_common.id%>").height() > 360) {
+                $("#intro_content_show_<%= homework_common.id%>").show();
+            }
+            $("#intro_content_show_<%= homework_common.id%>").click(function(){
+                $("#homework_description_<%= homework_common.id%>").toggleClass("maxh360");
+                $("#intro_content_show_<%= homework_common.id%>").hide();
+                $("#intro_content_hide_<%= homework_common.id%>").show();
+            });
+            $("#intro_content_hide_<%= homework_common.id%>").click(function(){
+                $("#homework_description_<%= homework_common.id%>").toggleClass("maxh360");
+                $("#intro_content_hide_<%= homework_common.id%>").hide();
+                $("#intro_content_show_<%= homework_common.id%>").show();
+            });
         });
 
         function expand_reply(container,btnid){
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 590feb380..36a01f5d1 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -120,7 +120,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
-.homepagePostIntro {font-size:14px; color:#484848;}
+.homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -203,6 +203,9 @@ a.menuGrey:hover {color:#fe7d68;}
 #navSearchAlert {display:none;}
 .homepagePostReplyjournal{margin-left: 15px; float: left;}
 
+.lh18 {line-height: 18px;}
+.maxh360 {max-height: 360px;}
+
 /*邮件邀请*/
 .box_main{ width:345px; margin:0 auto;}
 .box_h3{ color:#15bccf; text-align:center; font-size:16px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 872d8df6d..8b12fbd6b 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -646,7 +646,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
-.homepagePostIntro {font-size:14px; color:#484848;}
+.homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -692,6 +692,8 @@ a.postGrey:hover {color:#000000;}
 a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;margin-right: 15px;}
 a:hover.gz_btn{ color:#ff5722;}
 .homepagePostReplyjournal{margin-left: 15px; float: left;}
+.lh18 {line-height: 18px;}
+.maxh360 {max-height: 360px;}
 
 /*课程主页css*/
 .homepageCoursesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-65px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 45580e95e..630b96bcd 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -536,7 +536,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
-.homepagePostIntro {font-size:14px; color:#484848;}
+.homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}