Merge branch 'yuanke' into develop

Conflicts:
	app/helpers/application_helper.rb

app/controllers/blogs_controller.rb

@@ -24,8 +24,14 @@ class BlogsController < ApplicationController
     #根据 赞+回复数排序
     if @order.to_i == 2
         @type = 2
-        @b_sort == 1 ? @topics = @topics.sort{|x,y| get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) <=> get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) } : @topics = @topics.sort{|x,y| get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) <=> get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) }
-        @topics = @topics.sort{|x,y| y.sticky <=> x.sticky}
+
+        @topics.each do |topic|
+          topic[:infocount] = get_praise_num(topic) + (topic.parent ? topic.parent.children.count : topic.children.count)
+        end
+
+        @b_sort == 1 ? @topics = @topics.sort{|x,y| x[:infocount]  <=> y[:infocount] } : @topics = @topics.sort{|x,y| y[:infocount]  <=> x[:infocount] }
+
+        @topics = sort_by_sticky @topics
     else
         @type = 1
     end

app/controllers/boards_controller.rb

@@ -103,7 +103,6 @@ class BoardsController < ApplicationController
     @topic_count = @board ? @board.topics.count : 0
     if @project
       if @board
-        limit = 10;
         @topic_count = @board.topics.count();
         @topic_pages = 0#(params[:page] ? params[:page].to_i + 1 : 0) *10
         @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on) #{sort_type}").
@@ -125,14 +124,17 @@ class BoardsController < ApplicationController
     #根据 赞+回复数排序
     if @order.to_i == 2
       @type = 2
-      @b_sort == 1 ? @topics = @topics.sort{|x,y| get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) <=> get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) } : @topics = @topics.sort{|x,y| get_praise_num(y) + (y.parent ? y.parent.children.count : y.children.count) <=> get_praise_num(x) + (x.parent ? x.parent.children.count : x.children.count) }
-      @topics = @topics.sort{|x,y| y.sticky <=> x.sticky}
+      @topics.each do |topic|
+        topic[:infocount] = get_praise_num(topic) + (topic.parent ? x.parent.children.count : topic.children.count)
+      end
+      @b_sort == 1 ? @topics = @topics.sort{|x,y| x[:infocount]  <=> y[:infocount] } : @topics = @topics.sort{|x,y| y[:infocount]  <=> x[:infocount] }
+      @topics = sort_by_sticky @topics
     else
       @type = 1
     end
 
     #分页
-    @limit = 10
+    @limit = 15
     @is_remote = true
     @atta_count = @topics.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1

app/controllers/news_controller.rb

@@ -70,25 +70,59 @@ class NewsController < ApplicationController
       end
     elsif @course
       if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
+        @order, @b_sort,@type = params[:order] || 1, params[:sort] || 1, params[:type] || 1
+
+        #确定 sort_type 1升序 2 降序
+        if @order.to_i == @type.to_i
+          @b_sort = @b_sort.to_i == 1 ? 2 : 1
+        else
+          @b_sort = 2
+        end
+
+        sort_name = "created_on"
+
+        sort_type = @b_sort == 1 ? "asc" : "desc"
+
         scope = @course ? @course.news.course_visible : News.course_visible
         news_arr = scope.map{|news| news.id}
 
 
         @page = params[:page] ? params[:page].to_i + 1 : 0
-        news_page = @page *10
+        news_page = 0 #@page *10
         @news_count = scope.count
         @is_new = params[:is_new]
         @q = params[:subject]
         if params[:subject].nil? || params[:subject].blank?
-          scope_order = scope.reorder("#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC").limit(10).offset(news_page).includes(:author,:course).all()
+          scope_order = scope.reorder("#{News.table_name}.sticky DESC, #{News.table_name}.#{sort_name} #{sort_type}").offset(news_page).includes(:author,:course).all()
               #all(:include => [:author, :course],
                                   #:order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC").limit(10).offset(news_page)
         else
-          scope_order = scope.where("#{News.table_name}.title like '#{'%' << params[:subject].to_s << '%'}'").reorder("#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC").limit(10).offset(news_page).includes(:author,:course).all()
+          scope_order = scope.where("#{News.table_name}.title like '#{'%' << params[:subject].to_s << '%'}'").reorder("#{News.table_name}.sticky DESC, #{News.table_name}.#{sort_name} #{sort_type}").offset(news_page).includes(:author,:course).all()
           #.all(:include => [:author, :course],:order => "#{News.table_name}.sticky DESC, #{News.table_name}.created_on DESC")
         end
 
+        #根据 赞+回复数排序
+        if @order.to_i == 2
+          @type = 2
+          scope_order.each do |topic|
+            topic[:infocount] = get_praise_num(topic) + topic.comments.count
+          end
+          @b_sort == 1 ? scope_order = scope_order.sort{|x,y| x[:infocount]  <=> y[:infocount] } : scope_order = scope_order.sort{|x,y| y[:infocount]  <=> x[:infocount] }
+          scope_order = sort_by_sticky scope_order
+        else
+          @type = 1
+        end
+
         @newss = scope_order
+
+        #分页
+        @limit = 15
+        @is_remote = true
+        @atta_count = @newss.count
+        @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+        @offset ||= @atta_pages.offset
+        @newss = paginateHelper @newss,@limit
+
         #@newss = paginateHelper scope_order,10
         respond_to do |format|
           format.html {

app/controllers/users_controller.rb

@@ -2867,7 +2867,7 @@ class UsersController < ApplicationController
       @c_sort = 2
     end
 
-    sort_name = "updated_at"
+    sort_name = "created_at"
     sort_type = @c_sort == 1 ? "asc" : "desc"
 
     if @user.courses.visible.count > 0
@@ -2925,7 +2925,11 @@ class UsersController < ApplicationController
     #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num
     if @order.to_i == 2
       @type = 2
-      @c_sort == 1 ? (@projects = @projects.sort{|x,y| x.project_score.issue_num+x.project_score.attach_num <=> y.project_score.issue_num+y.project_score.attach_num }) : (@projects = @projects.sort{|x,y| y.project_score.issue_num+y.project_score.attach_num <=> x.project_score.issue_num+x.project_score.attach_num })
+      @projects.each do |project|
+        project[:infocount] = project.project_score.issue_num+project.project_score.attach_num
+      end
+
+      @c_sort == 1 ? (@projects = @projects.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@projects = @projects.sort{|x,y| y[:infocount] <=> x[:infocount] })
     else
       @type = 1
     end

app/helpers/application_helper.rb

@@ -3065,7 +3065,27 @@ def host_with_protocol
   return Setting.protocol + "://" + Setting.host_name
 end
 
-def strip_html(text,len=0,endss="...")
+#将有置顶属性的提到数组前面 #infocount 相同的按时间降序排列
+def sort_by_sticky topics
+  tmpTopics = []
+  tmpIndex = 0
+  topics.each do |topic|
+    if topic.sticky == 1
+      tmpTopics[tmpIndex] = topic
+      tmpIndex = tmpIndex + 1
+    end
+  end
+
+  topics.each do |topic|
+    if topic.sticky == 0
+      tmpTopics[tmpIndex] = topic
+      tmpIndex = tmpIndex + 1
+    end
+  end
+
+  topics = tmpTopics
+  return topics
+enddef strip_html(text,len=0,endss="...")
   ss = ""
   if text.length>0
     ss=text.gsub(/<\/?.*?>/, '').strip
@@ -3078,5 +3098,4 @@ def strip_html(text,len=0,endss="...")
     end
   end
   return ss
-end
-
+end

app/views/blogs/_article.html.erb

@@ -66,11 +66,13 @@
 </div>
 <script type="text/javascript">
     //如果右边的博客列表比左边的高度低则将右边的高度设为与左边对齐
-    var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-10;
-    var rightHeight = $(".homepageRight").height();
-    if (rightHeight < leftHeight){
-        var diffHeight = leftHeight - rightHeight;
-        var tmpHeight = $(".listbox").height()+diffHeight;
-        $(".listbox").css("height",tmpHeight);
-    }
+    $(function() {
+        var leftHeight = $("#LSide").height() - $(".fontGrey5").height() - 10;
+        var rightHeight = $(".homepageRight").height();
+        if (rightHeight < leftHeight) {
+            var diffHeight = leftHeight - rightHeight;
+            var tmpHeight = $(".listbox").height() + diffHeight;
+            $(".listbox").css("height", tmpHeight);
+        }
+    });
 </script>

app/views/forums/_show_topics.html.erb

@@ -7,7 +7,15 @@
               <%= link_to image_tag(url_to_avatar(topic.author), :width => 50,:height => 50,:alt => '贴吧图片'), user_path(topic.author) if topic.author%>
             </div>
             <div class="postDetailWrap">
-              <div class="postDetailTitle"><a href="<%= forum_memo_path(topic.forum, topic) %>" class="f14 linkGrey4 fb"><%=topic.subject%></a></div>
+              <div class="postDetailTitle fl">
+                <a href="<%= forum_memo_path(topic.forum, topic) %>" class="f14 linkGrey4 fb"><%=topic.subject%></a>
+              </div>
+              <div class="postDetailReply fr">
+                <a href="<%= forum_memo_path(topic.forum, topic)%>" class="postReplyIcon mr5" target="_blank"></a>
+                <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
+                <a href="javascript:void(0);" class="linkGrey2 disablePostLikeIcon ml10 mt20" style="cursor: default" title="点赞人数" >   <%= get_praise_num(topic)%></a>
+              </div>
+
               <div class="postDetailDes"><%= topic.content.html_safe%>
                 <!--<a href="javascript:void(0);" class="linkBlue2 underline ml8">显示全部</a>-->
               </div>
@@ -16,12 +24,7 @@
                   <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.name%></a></div>
                   <div class="postDetailDate"><%= format_date(topic.last_reply.created_at)%></div>
               <% end%>
-              <span class=" fr" style="color: #888888; font-size: 12px;">更新时间：<%= format_date(topic.updated_at)%></span>
-            </div>
-            <div class="postDetailReply">
-              <a href="<%= forum_memo_path(topic.forum, topic)%>" class="postReplyIcon mr5" target="_blank"></a>
-              <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
-              <a href="javascript:void(0);" class="linkGrey2 disablePostLikeIcon ml10 mt20" style="cursor: default" title="点赞人数" >   <%= get_praise_num(topic)%></a>
+              <span class=" fr " style="color: #888888; font-size: 12px;">更新时间：<%= format_date(topic.updated_at)%></span>
             </div>
             <div class="cl"></div>
           </div>

app/views/news/_course_news_detail.html.erb

@@ -4,41 +4,6 @@
 <% end %>
 
 <% if newss%>
-    <% newss.each do |news| %>
-        <script>
-            function expand_reply(container, btnid) {
-                var target = $(container);
-                var btn = $(btnid);
-                if (btn.data('init') == '0') {
-                    btn.data('init', 1);
-                    btn.html('收起回复');
-                    target.show();
-                } else {
-                    btn.data('init', 0);
-                    btn.html('展开更多');
-                    target.hide();
-                    target.eq(0).show();
-                    target.eq(1).show();
-                    target.eq(2).show();
-                }
-            }
-
-            function expand_reply_input(id) {
-                $(id).toggle();
-            }
-
-            $(function () {
-                sd_create_editor_from_data(<%= news.id%>, null, "100%");
-                showNormalImage('activity_description_<%= news.id %>');
-            });
-        </script>
-        <% if news %>
-            <%= render :partial => 'users/course_news', :locals => {:activity => news, :user_activity_id => news.id} %>
-        <% end %>
-    <% end %>
-
-    <% if newss.count == 10 %>
-        <%= link_to "点击展开更多",news_index_path(:course_id => @course.id ,:page => page),:id => "show_more_course_news",:remote => "true",:class => "loadMore mt10 f_grey"%>
-    <% end %>
+    <%= render :partial => 'users/course_newslist', :locals => {:topics => newss} %>
 <% end%>
 

app/views/news/index.js.erb

@@ -1,5 +1,5 @@
 <% if @project %>
     $("#show_more_project_news").replaceWith("<%= escape_javascript(render :partial => 'project_news_detail', :locals=>{ :all_news=>@newss,:page => @page})%>");
 <% else %>
-    $("#show_more_course_news").replaceWith("<%= escape_javascript( render :partial =>  'course_news_detail', :locals =>{:newss => @newss, :page => @page} )%>");
+    $("#course-newslist").replaceWith('<%= escape_javascript( render :partial => 'users/course_newslist', :locals => {:topics => @newss}) %>');
 <% end %>

app/views/users/_course_boardlist.html.erb

@@ -68,11 +68,13 @@
 </div>
 <script type="text/javascript">
     //如果右边的博客列表比左边的高度低则将右边的高度设为与左边对齐
-    var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-20;
-    var rightHeight = $(".homepageRight").height();
-    if (rightHeight < leftHeight){
-        var diffHeight = leftHeight - rightHeight;
-        var tmpHeight = $(".listbox").height()+diffHeight;
-        $(".listbox").css("height",tmpHeight);
-    }
+    $(function(){
+        var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-20;
+        var rightHeight = $(".homepageRight").height();
+        if (rightHeight < leftHeight){
+            var diffHeight = leftHeight - rightHeight;
+            var tmpHeight = $(".listbox").height()+diffHeight;
+            $(".listbox").css("height",tmpHeight);
+        }
+    });
 </script>

app/views/users/_course_newslist.html.erb

@@ -0,0 +1,64 @@
+<div class = "cl"> </div>
+<div id="course-newslist">
+  <div class="listbox mt10" >
+    <h2 class="list-h2">通知列表</h2>
+    <div class="category">
+      <span class="grayTxt ">排序：</span>
+      <%= link_to "时间", {:controller => 'news', :action => 'index',  :type => @type,  :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
+      <% if @type.to_i == 1 %>
+          <%= link_to "", {:controller => 'news', :action => 'index', :type => @type,  :sort => @b_sort, :order => 1 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+      <% end %>
+      <%= link_to "人气", {:controller => 'news', :action => 'index',  :type => @type,  :sort => @b_sort, :order => 2 }, :class => "sortTxt", :remote => true %>
+      <% if @type.to_i  == 2 %>
+          <%= link_to "", {:controller => 'news', :action => 'index', :type => @type,  :sort => @b_sort, :order => 2 }, :class => "#{@b_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} ", :remote => true %>
+      <% end %>
+      <div class="cl"></div>
+    </div>
+    <div class="bloglistbox">
+      <% topics.each do |activity| %>
+          <div class="list-file">
+            <div><span class="item_list fl"></span>
+              <%= link_to activity.title.to_s, news_path(activity), :class => "list-title fl" %>
+              <% if activity.sticky == 1 %>
+                  <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} %></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>
+              <% count=0 %>
+              <% count=activity.comments.count %>
+              <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>
+            </div>
+            <div class="cl"></div>
+          </div>
+      <% end %>
+      <div>
+        <ul class="wlist" id="pages" >
+          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>
+<script type="text/javascript">
+    //如果右边的博客列表比左边的高度低则将右边的高度设为与左边对齐
+    $(function(){
+        var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-20;
+        var rightHeight = $(".homepageRight").height();
+        if (rightHeight < leftHeight){
+            var diffHeight = leftHeight - rightHeight;
+            var tmpHeight = $(".listbox").height()+diffHeight;
+            $(".listbox").css("height",tmpHeight);
+        }
+    });
+</script>

app/views/users/_intro_content_ex.html.erb

@@ -4,21 +4,14 @@
   </div>
 </div>
 <script type="text/javascript">
-    $(function(){
+    $("#intro_content_<%= user_activity_id%>").hide();
+    $(function() {
         var heightType = <%= maxheight %>;
 
-        if (heightType > 0){
-            $("#activity_description_<%= user_activity_id%>").css("max-height",heightType+"px");
+        if (heightType > 0) {
+            $("#activity_description_<%= user_activity_id%>").css("max-height", heightType + "px");
         }
 
-        $("#intro_content_<%= user_activity_id%> p,#intro_content_<%= user_activity_id%> span,#intro_content_<%= user_activity_id%> em").each(function(){
-            var postContent = $(this).html();
-            postContent = postContent.replace(/&nbsp;/g," ");
-            postContent= postContent.replace(/ {2}/g,"&nbsp; ");
-            postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
-            postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
-            $(this).html(postContent);
-        });
-        description_show_hide(<%=user_activity_id %>);
+        description_showwords_ellipsis(<%=user_activity_id %>);
     });
 </script>

app/views/users/_project_boardlist.html.erb

@@ -68,11 +68,13 @@
 </div>
 <script type="text/javascript">
     //如果右边的博客列表比左边的高度低则将右边的高度设为与左边对齐
-    var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-20;
-    var rightHeight = $(".homepageRight").height();
-    if (rightHeight < leftHeight){
-        var diffHeight = leftHeight - rightHeight;
-        var tmpHeight = $(".listbox").height()+diffHeight;
-        $(".listbox").css("height",tmpHeight);
-    }
+    $(function() {
+        var leftHeight = $("#LSide").height() - $(".fontGrey5").height() - 20;
+        var rightHeight = $(".homepageRight").height();
+        if (rightHeight < leftHeight) {
+            var diffHeight = leftHeight - rightHeight;
+            var tmpHeight = $(".listbox").height() + diffHeight;
+            $(".listbox").css("height", tmpHeight);
+        }
+    });
 </script>

app/views/users/_user_course_list.html.erb

@@ -18,7 +18,7 @@
         <ul class="list-file">
           <li>
             <span class="item_list fl"></span>
-            <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "course-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
+            <%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "list-title fl #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
                         :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
             <% teacher = User.where("id=?",course.tea_id).first%>
             <span class="fr grayTxt">
@@ -27,6 +27,9 @@
           </li>
           <div class="cl"></div>
             <li class="ml15">
+              <span class="grayTxt">
+                  创建时间：<%= format_time(course.created_at) %>
+              </span>
               <span class="grayTxt">
                   开课学期:&nbsp;&nbsp;<span><%= current_time_and_term course %></span>
               </span>
@@ -51,11 +54,13 @@
 
 <script type="text/javascript">
     //如果右边的列表比左边的高度低则将右边的高度设为与左边对齐
-    var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-20;
-    var rightHeight = $(".homepageRight").height();
-    if (rightHeight < leftHeight){
-        var diffHeight = leftHeight - rightHeight;
-        var tmpHeight = $(".listbox").height()+diffHeight;
-        $(".listbox").css("height",tmpHeight);
-    }
+    $(function() {
+        var leftHeight = $("#LSide").height() - $(".fontGrey5").height() - 20;
+        var rightHeight = $(".homepageRight").height();
+        if (rightHeight < leftHeight) {
+            var diffHeight = leftHeight - rightHeight;
+            var tmpHeight = $(".listbox").height() + diffHeight;
+            $(".listbox").css("height", tmpHeight);
+        }
+    });
 </script>

app/views/users/_user_project_list.html.erb

@@ -18,7 +18,7 @@
         <ul class="list-file">
           <li>
             <span class="item_list fl"></span>
-            <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "course-title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
+            <%= link_to project.name, project_path(project.id,:host=>Setting.host_name), :target => '_blank', :class => "list-title fl",:id => "show_project_#{project.id}", :title => (project.is_public? ? "公开项目：":"私有项目：") + project.name%>
             <% projectUser = User.where("id=?",project.user_id).first%>
             <span class="fr grayTxt">
                 <%='创建者：'+(projectUser.try(:realname) != " " ? projectUser.lastname + projectUser.firstname : projectUser.try(:login)) %>
@@ -43,11 +43,13 @@
 
 <script type="text/javascript">
     //如果右边的列表比左边的高度低则将右边的高度设为与左边对齐
-    var leftHeight = $("#LSide").height()-$(".fontGrey5").height()-20;
-    var rightHeight = $(".homepageRight").height();
-    if (rightHeight < leftHeight){
-        var diffHeight = leftHeight - rightHeight;
-        var tmpHeight = $(".listbox").height()+diffHeight;
-        $(".listbox").css("height",tmpHeight);
-    }
+    $(function() {
+        var leftHeight = $("#LSide").height() - $(".fontGrey5").height() - 20;
+        var rightHeight = $(".homepageRight").height();
+        if (rightHeight < leftHeight) {
+            var diffHeight = leftHeight - rightHeight;
+            var tmpHeight = $(".listbox").height() + diffHeight;
+            $(".listbox").css("height", tmpHeight);
+        }
+    });
 </script>

public/javascripts/application.js

@@ -1238,3 +1238,22 @@ function expand_reply(container,btnid){
     target.eq(2).show();
   }
 }
+
+//by yk 列表描述将文字和起来去掉空格多于100就显示省略号
+function description_showwords_ellipsis(id){
+    var str = "";
+    $("#intro_content_"+id).each(function () {
+        str = str + $(this).text();
+    });
+
+    //去掉空格
+    str = str.replace(/\s/gi,'');
+
+    if(str.length > 100){
+        str = str.substring(0,100)+"...";
+    }
+
+    $("#intro_content_"+id).html(str);
+    $("#intro_content_"+id).show();
+
+}

public/stylesheets/courses.css

@@ -1311,7 +1311,7 @@ a:hover.Blue-btn{ background:#3598db; color:#fff;}
 a{text-decoration:none}
 .listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
 /*.bloglistbox{ min-height:690px;}*/
-.list-h2{ font-size:16px; font-weight:bold; color:#000; border-bottom:2px solid #269ac9; padding-bottom:5px;}
+.list-h2{ font-size:16px; font-weight:bold; color:#000;  padding-bottom:5px;}
 .category{ padding:10px 0; border-bottom:1px solid #ddd;}
 .category a,.category span{ float:left; margin-right:5px;}
 .grayTxt{ color:#9093a6;}

public/stylesheets/new_user.css

@@ -845,14 +845,14 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailBanner {height:30px; width:720px; border-bottom:1px solid #efefef;}
 .postDetailRow {width:720px; border-bottom:1px solid #efefef; padding:15px 0;}
 .postDetailPortrait {width:50px; height:50px; float:left; margin-right:15px;}
-.postDetailWrap {width:580px; float:left;}
-.postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
+.postDetailWrap {width:655px; float:left;}
+.postDetailTitle {width:570px; max-width:570px; 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, .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}
+.postDetailReply { color:#888888; float:right;display: inline}
 .disablePostLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; padding-right: 5px; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a.postReplyIcon {background:url(images/post_image_list.png) -40px 2px no-repeat; width:18px; height:18px; float:left; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no-repeat; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
@@ -1508,7 +1508,7 @@ a:hover.Blue-btn{ background:#3598db; color:#fff;}
 a{text-decoration:none}
 .listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
 /*.bloglistbox{ min-height:690px;}*/
-.list-h2{ font-size:16px; font-weight:bold; color:#000; border-bottom:2px solid #269ac9; padding-bottom:5px;}
+.list-h2{ font-size:16px; font-weight:bold; color:#000; padding-bottom:5px;}
 .category{ padding:10px 0; border-bottom:1px solid #ddd;}
 .category a,.category span{ float:left; margin-right:5px;}
 .grayTxt{ color:#9093a6;}
@@ -1533,6 +1533,7 @@ a.pages-big{ width:50px;}
 a.course-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:590px;}
 a:hover.course-title{ color:#269ac9;}
 
+
 /*通知列表界面样式*/
 a.messages-title{font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; max-width:630px;}
 a:hover.messages-title{ color:#269ac9;}
@@ -1546,4 +1547,4 @@ ul.wlist li{float: left;}
 ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3px;}
 ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 /*.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}*/
-.wlist_select a{background-color: #64bdd9;cursor: default;}
+.wlist_select a{background-color: #64bdd9;cursor: default;}

public/stylesheets/project.css

@@ -1209,7 +1209,7 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;}
 a{text-decoration:none}
 .listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
 /*.bloglistbox{ min-height:690px;}*/
-.list-h2{ font-size:16px; font-weight:bold; color:#000; border-bottom:2px solid #269ac9; padding-bottom:5px;}
+.list-h2{ font-size:16px; font-weight:bold; color:#000; padding-bottom:5px;}
 .category{ padding:10px 0; border-bottom:1px solid #ddd;}
 .category a,.category span{ float:left; margin-right:5px;}
 .grayTxt{ color:#9093a6;}