动态内容显示不全

app/views/blogs/_article.html.erb

@@ -223,5 +223,4 @@
         $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
         $("#moreProject_<%=user_activity_id %>").show();
     });
-    $(description_show_hide(<%=user_activity_id %>));
 </script>

app/views/organizations/_org_course_homework.html.erb

@@ -346,5 +346,4 @@
         $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
         $("#moreProject_<%=user_activity_id %>").show();
     });
-    $(description_show_hide(<%=user_activity_id %>));
 </script>

app/views/organizations/_org_course_message.html.erb

@@ -157,6 +157,3 @@
     <% end %>
   </div>
 </div>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/organizations/_org_course_news.html.erb

@@ -121,6 +121,3 @@
     </div>
   </div>
 </div>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/organizations/_org_course_poll.html.erb

@@ -56,6 +56,3 @@
       </div>
     </div>
 <% end %>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/organizations/_org_project_issue.html.erb

@@ -139,6 +139,3 @@
 
   </div>
 </div>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/organizations/_org_subfield_message.html.erb

@@ -133,6 +133,3 @@
 
   </div>
 </div>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/organizations/_project_message.html.erb

@@ -134,6 +134,3 @@
 
   </div>
 </div>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/projects/_attachment_acts.html.erb

@@ -22,18 +22,14 @@
         发布时间：<%= format_time(activity.created_on) %>
       </div>
       <p class="mt5 break_word"><%= textAreailizable activity, :description %><br/></p>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id %>">
+      <!--<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id %>">
         <div id="intro_content_<%= user_activity_id %>">
           <%#= activity.description.html_safe %>
         </div>
-      </div>
+      </div>-->
       <div class="cl"></div>
 
     </div>
     <div class="cl"></div>
   </div>
-
+</div>
-</div>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/projects/_project_news.html.erb

@@ -120,7 +120,4 @@
       <div class="cl"></div>
     </div>
   </div>
-</div>
+</div>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/users/_course_homework.html.erb

@@ -347,5 +347,4 @@
         $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
         $("#moreProject_<%=user_activity_id %>").show();
     });
-    $(description_show_hide(<%=user_activity_id %>));
 </script>

app/views/users/_course_message.html.erb

@@ -177,6 +177,4 @@
     <% end %>
   </div>
 </div>
-<script type="text/javascript">
+
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/users/_course_news.html.erb

@@ -120,7 +120,4 @@
       <div class="cl"></div>
     </div>
   </div>
-</div>
+</div>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/users/_course_poll.html.erb

@@ -55,6 +55,3 @@
   </div>
 </div>
 <% end %>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/users/_intro_content.html.erb

@@ -1,4 +1,4 @@
-<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
+<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth lh18" id="activity_description_<%= user_activity_id%>">
   <div id="intro_content_<%= user_activity_id%>">
     <%= content.to_s.html_safe%>
   </div>
@@ -8,5 +8,6 @@
       var postContent = $("#intro_content_<%= user_activity_id%>").html();
       postContent = postContent.replace(/&nbsp;/g," ");
       $("#intro_content_<%= user_activity_id%>").html(postContent);
+      description_show_hide(<%=user_activity_id %>);
   });
 </script>

app/views/users/_project_issue.html.erb

@@ -151,6 +151,3 @@
 
   </div>
 </div>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/users/_project_message.html.erb

@@ -167,6 +167,3 @@
     </div>
   </div>
 </div>
-<script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
-</script>

app/views/users/_user_blog.html.erb

@@ -144,5 +144,4 @@
         $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
         $("#moreProject_<%=user_activity_id %>").show();
     });
-    $(description_show_hide(<%=user_activity_id %>));
 </script>

app/views/users/_user_homework_detail.html.erb

@@ -348,5 +348,4 @@
         $("#relatePWrap_<%=homework_common.id %>").toggleClass('relatePWrap');
         $("#moreProject_<%=homework_common.id %>").show();
     });
-    $(homework_description_show_hide(<%=homework_common.id %>));
 </script>

public/javascripts/application.js

@@ -23,23 +23,6 @@ function description_show_hide(id){
     });
 }
 
-function homework_description_show_hide(id){
-    showNormalImage('homework_description_'+id);
-    if($("#intro_content_"+id).height() > 810) {
-        $("#intro_content_show_"+id).show();
-    }
-    $("#intro_content_show_"+id).click(function(){
-        $("#homework_description_"+id).toggleClass("maxh360");
-        $("#intro_content_show_"+id).hide();
-        $("#intro_content_hide_"+id).show();
-    });
-    $("#intro_content_hide_"+id).click(function(){
-        $("#homework_description_"+id).toggleClass("maxh360");
-        $("#intro_content_hide_"+id).hide();
-        $("#intro_content_show_"+id).show();
-    });
-}
-
 function cleanArray (actual){
   var newArray = new Array();
     for (var i = 0; i< actual.length; i++){

public/stylesheets/courses.css

@@ -1099,7 +1099,7 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}

public/stylesheets/new_user.css

@@ -841,7 +841,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;display: inline}

public/stylesheets/project.css

@@ -1109,7 +1109,7 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}