1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点

2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题

app/views/organizations/_org_subfield_leftMD.html.erb

@@ -28,7 +28,7 @@
                               <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.description.to_s.html_safe, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", student_work_index_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
@@ -50,7 +50,7 @@
                               <% end %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                           </div>
@@ -67,7 +67,7 @@
                               <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %>
@@ -130,7 +130,7 @@
                               <%= link_to activity.subject.to_s, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.description.to_s.html_safe, issue_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                           </div>
@@ -151,7 +151,7 @@
                               <% end %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                           </div>
@@ -168,7 +168,7 @@
                               <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank"  %>
@@ -214,7 +214,7 @@
                               <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-title sn-hidden" %>
                             </h3>
                             <div class="resources-tagbox">
-                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28} %>
+                              <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> document.content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                               <%#= link_to document.content.to_s.html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "resources-tag" %>
                             </div>
                             <%#= link_to "更多", org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => "more-btn", :target => "_blank"  %>
@@ -244,7 +244,7 @@
                                       <% end %>
                                     </h3>
                                     <div class="resources-tagbox">
-                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                                       <%#= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
                                     </div>
                                     <%#= link_to "更多", board_message_url_in_org(message.board.id,message.id), :class => "more-btn", :target => "_blank" %>
@@ -264,7 +264,7 @@
                                       <% end %>
                                     </h3>
                                     <div class="resources-tagbox">
-                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %>
+                                      <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28, :maxwidth=>0} %>
                                       <%#= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
                                     </div>
                                     <%#= link_to "更多", board_message_path(message.board,activity), :class => "more-btn", :target => "_blank" %>
@@ -285,7 +285,7 @@
                                 </h3>
                                 <div class="resources-tagbox">
                                   <%#= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %>
-                                  <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28} %>
+                                  <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28, :maxwidth=>0} %>
                                 </div>
                                 <%#= link_to "更多", news_path(news), :class => "more-btn", :target => "_blank" %>
                               </div>

app/views/users/_course_boardlist.html.erb

@@ -31,9 +31,6 @@
                       <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
                   <% end %>
                   <% u = User.where("id=?",activity.author_id).first%>
-                  <span class="fr grayTxt">
-                      发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-                  </span>
                   <div class="cl"></div>
                 </div>
                 <div class="massages-content ml15">
@@ -42,11 +39,13 @@
                   <% else %>
                       <% content = activity.parent.content %>
                   <% end %>
-                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %></p>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %></p>
                 </div>
                 <div class="ml15 mt10">
-                  <span class="grayTxt">发帖：<%= format_time(activity.created_on) %></span>
-                  <span class="grayTxt">更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+                  <span class="grayTxt">
+                      发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
                   <% count=0 %>
                   <% if activity.parent %>
                       <% count=activity.parent.children.count%>

app/views/users/_course_newslist.html.erb

@@ -24,16 +24,15 @@
                       <span class="fl ml10 red-cir-btn">顶</span>
                   <% end%>
                   <% u = User.where("id=?",activity.author_id).first%>
-                  <span class="fr grayTxt">
-                      发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-                  </span>
                   <div class="cl"></div>
                 </div>
                 <div class="massages-content ml15">
-                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100} %></p>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100, :maxwidth=>563} %></p>
                 </div>
                 <div class="ml15 mt10">
-                  <span class="grayTxt">发布：<%= format_time(activity.created_on) %></span>
+                  <span class="grayTxt">
+                      发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
                   <span class="grayTxt">更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
                   <% count=0 %>
                   <% count=activity.comments.count %>

app/views/users/_intro_content_ex.html.erb

@@ -12,6 +12,11 @@
             $("#activity_description_<%= user_activity_id%>").css("max-height", heightType + "px");
         }
 
+        var maxWidth = <%= maxwidth %>
+        if (maxWidth > 0) {
+            $("#intro_content_<%= user_activity_id%>").css("max-width", maxWidth + "px");
+        }
+
         description_showwords_ellipsis(<%=user_activity_id %>,<%= maxwordsnum %>);
     });
 </script>

app/views/users/_project_boardlist.html.erb

@@ -31,9 +31,6 @@
                       <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
                   <% end %>
                   <% u = User.where("id=?",activity.author_id).first%>
-                  <span class="fr grayTxt">
-                      发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-                  </span>
                   <div class="cl"></div>
                 </div>
                 <div class="massages-content ml15">
@@ -42,11 +39,13 @@
                   <% else %>
                       <% content = activity.parent.content %>
                   <% end %>
-                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>100} %></p>
+                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %></p>
                 </div>
                 <div class="ml15 mt10 f12">
-                  <span class="grayTxt">发帖：<%= format_time(activity.created_on) %></span>
-                  <span class="grayTxt">更新：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %></span>
+                  <span class="grayTxt">
+                      发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                  </span>
+                  <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
                   <% count=0 %>
                   <% if activity.parent %>
                       <% count=activity.parent.children.count%>

app/views/users/_user_course_list.html.erb

@@ -24,7 +24,7 @@
                 <% teacher = User.where("id=?",course.tea_id).first%>
                 <span class="fr grayTxt">
                     <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
-                </span>
+                  </span>
               </li>
               <div class="cl"></div>
                 <li class="ml15">

public/javascripts/create_kindeditor.js

@@ -25,7 +25,7 @@ function sd_create_editor(params){
             var edit = this.edit;
             var body = edit.doc.body;
             edit.iframe.height(paramsHeight);
-            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight))  , paramsHeight));
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight+7))  , paramsHeight));
         },
         afterBlur:function(){
             //params.toolbar_container.hide();

public/stylesheets/public.css

@@ -24,9 +24,9 @@ table{ background:#fff;}
 a.btn_message_free{ background:#ff5722; display:block;  text-align:center; color:#fff; padding:3px 0; width:80px; margin-bottom:10px;}
 .db {display:block;}
 /* font & color */
-h2{ font-size:18px; color:#15bccf;}
-h3{ font-size:14px; color:#e8770d;}
-h4{ font-size:14px; color:#3b3b3b;}
+h2{ font-size:18px; }
+h3{ font-size:14px; }
+h4{ font-size:14px; }
 .f12{font-size:12px; font-weight:normal;}
 .f14{font-size:14px;}
 .f16{font-size:16px;}
@@ -1139,4 +1139,4 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 .likeNum{color: #7f7f7f}
 
 /*弹框*/
-.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}
+.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}

public/stylesheets/public_new.css

@@ -22,9 +22,9 @@ table{ background:#fff;}
 .none{display: none;}
 
 /* font & color */
-h2{ font-size:18px; color:#15bccf;}
-h3{ font-size:14px; color:#e8770d;}
-h4{ font-size:14px; color:#3b3b3b;}
+h2{ font-size:18px; }
+h3{ font-size:14px; }
+h4{ font-size:14px; }
 .f12{font-size:12px; font-weight:normal;}
 .f14{font-size:14px;}
 .f16{font-size:16px;}