Merge branch 'cxt_course' into develop

Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css

app/controllers/users_controller.rb

@@ -85,6 +85,23 @@ class UsersController < ApplicationController
   helper :issues
   include UsersHelper
 
+  #展开所有回复
+  def show_all_replies
+    @comment = JournalsForMessage.find params[:comment].to_i
+  end
+
+  #二级回复
+  def reply_to
+    case params[:type]
+      when 'HomeworkCommon'
+        @reply = JournalsForMessage.find params[:reply_id]
+        @is_in_course = params[:is_in_course]
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def refresh_changests
     if !(@user.nil?) && !(@user.memberships.nil?)
       @user.memberships.each do |member|
@@ -599,7 +616,11 @@ class UsersController < ApplicationController
     @r_sort = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
     if(params[:type].blank? || params[:type] == "1") #题库
+      if params[:is_import].to_i == 1
+        visible_course = Course.where("is_public = 1 && is_delete = 0")
+      elsif params[:is_import].to_i == 0
         visible_course = Course.where("is_delete = 0")
+      end
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
       @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     elsif params[:type] == "2" #我的题库
@@ -664,7 +685,11 @@ class UsersController < ApplicationController
     search = params[:name].to_s.strip.downcase
     type_ids = params[:property]=="" || params[:property].nil? ? "(1, 2, 3)" : "(" + params[:property] + ")"
     if(params[:type].blank? || params[:type] == "1") #全部
+      if params[:is_import].to_i == 1
+        visible_course = Course.where("is_public = 1 && is_delete = 0")
+      elsif params[:is_import].to_i == 0
         visible_course = Course.where("is_delete = 0")
+      end
       visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")"
       all_homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'")
       all_user_ids = all_homeworks.map{|hw| hw.user_id}

app/controllers/words_controller.rb

@@ -297,6 +297,38 @@ class WordsController < ApplicationController
     end
   end
 
+  #作业的二级回复
+  def reply_to_homework
+    if User.current.logged?
+      @user = User.current
+      reply = JournalsForMessage.find params[:id].to_i
+      @homework_common = HomeworkCommon.find reply.jour_id
+      if params[:reply_message].size>0 && User.current.logged? && @user
+        options = {:notes => params[:reply_message], :reply_id => reply.user_id,:user_id => @user.id,:m_parent_id => params[:id].to_i,:m_reply_id => params[:id].to_i}
+        feedback = HomeworkCommon.add_homework_jour(@user, params[:reply_message], reply.jour_id, options)
+        if (feedback.errors.empty?)
+          if params[:asset_id]
+            ids = params[:asset_id].split(',')
+            update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
+          end
+          @homework_common.update_attributes(:updated_at => Time.now)
+          update_course_activity(@homework_common.class,@homework_common.id)
+          update_user_activity(@homework_common.class,@homework_common.id)
+          update_org_activity(@homework_common.class,@homework_common.id)
+          respond_to do |format|
+            format.js{
+              @is_in_course = params[:is_in_course]
+            }
+          end
+        else
+          flash[:error] = feedback.errors.full_messages[0]
+        end
+      end
+    else
+      render_403
+    end
+  end
+  
   def add_brief_introdution
     user = User.current
     message = params[:new_form][:user_introduction]

app/helpers/application_helper.rb

@@ -3071,6 +3071,16 @@ def host_with_protocol
   return Setting.protocol + "://" + Setting.host_name
 end
 
+
+#获取回复的所有父节点
+def get_reply_parents parents_rely, comment
+  unless comment.parent.nil?
+    parents_rely << comment.parent
+    get_reply_parents parents_rely, comment.parent
+  end
+  parents_rely
+end
+
 #将有置顶属性的提到数组前面
 def sort_by_sticky topics
   tmpTopics = []

app/views/users/_comment_reply.html.erb

@@ -0,0 +1,27 @@
+<div class="orig_cont clearfix">
+  <% unless comment.parent.nil? %>
+      <div id="comment_reply_<%=comment.id %>">
+        <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
+      </div>
+  <% end %>
+  <!--<span id="reply_praise_count_<%#=comment.id %>" class="orig_index">
+      <%# if comment.user == User.current %>
+        <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+      <%# else %>
+        <%#=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+      <%# end %>
+  </span>-->
+  <div class="orig_user fl">
+    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
+  </div>
+  <div class="orig_right fl">
+    <% if comment.try(:user).try(:realname) == ' ' %>
+        <%= link_to comment.try(:user), user_path(comment.user_id), :class => "content-username" %>
+    <% else %>
+        <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "content-username" %>
+    <% end %>
+    <span class="orig_area"><%= time_from_now(comment.created_on) %></span>
+    <div class="orig_content "><%= comment.notes.html_safe %></div>
+  </div>
+  <div class="cl"></div>
+</div>

app/views/users/_comment_reply_detail.html.erb

@@ -0,0 +1,20 @@
+<!--<span id="reply_praise_count_<%#=comment.id %>" class="orig_index">
+  <%# if comment.user == User.current %>
+    <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%#= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+  <%# else %>
+    <%#=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+  <%# end %>
+</span>-->
+<div class="orig_user fl">
+<%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
+</div>
+<div class="orig_right fl">
+<% if comment.try(:user).try(:realname) == ' ' %>
+    <%= link_to comment.try(:user), user_path(comment.user_id), :class => "content-username" %>
+<% else %>
+    <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "content-username" %>
+<% end %>
+<span class="orig_area"><%= time_from_now(comment.created_on) %></span>
+<div class="orig_content "><%= comment.notes.html_safe %></div>
+</div>
+<div class="cl"></div>

app/views/users/_reply_to.html.erb

@@ -0,0 +1,18 @@
+<div class="orig_reply_box borderBottomNone" id="reply_to_message_<%= reply.id%>">
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+  <div class="orig_textarea mb10 fl">
+    <div nhname='new_message_<%= reply.id%>'>
+      <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
+          <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
+          <input type="hidden" name="reply[subject]" id="reply_subject">
+          <div nhname='toolbar_container_<%= reply.id%>'></div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply_message"></textarea>
+          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <div class="cl"></div>
+          <p nhname='contentmsg_<%= reply.id%>'></p>
+      <% end%>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="cl"></div>
+</div>

app/views/users/_user_homework_detail.html.erb

@@ -296,7 +296,8 @@
   <% count=homework_common.journals_for_messages.count %>
   <div class="homepagePostReply">
     <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
+      <div class="homepagePostReplyBannerCount"><span>回复</span>
+        <span  class="reply_iconup" > ︿</span>
         <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
         <span id="praise_count_<%=homework_common.id %>">
           <% if homework_common.user == User.current %>
@@ -338,22 +339,60 @@
                       <% else %>
                           <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_time(comment.created_on) %><span id="reply_praise_count_<%=comment.id %>">
+                      <%= time_from_now(comment.created_on) %>
+                    </div>
+                    <% unless comment.m_parent_id.nil? %>
+                        <% parents_rely = [] %>
+                        <% parents_rely = get_reply_parents parents_rely, comment %>
+                        <% length = parents_rely.length %>
+                        <div id="comment_reply_<%=comment.id %>">
+                          <% if length <= 3 %>
+                            <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
+                          <% else %>
+                            <div class="orig_cont clearfix">
+                              <div class="orig_cont clearfix">
+                                <div id="comment_reply_<%=parents_rely[length - 1].id %>">
+                                  <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+                                </div>
+                                <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+                              </div>
+                              <div class="orig_cont_hide clearfix"><span class="orig_icon" >&darr; </span><span class="orig_icon" style="display:none;" > &uarr;</span><%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %></div>
+                              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+                            </div>
+                          <% end %>
+                        </div>
+                    <% end %>
+                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+                      <%= comment.notes.html_safe %></div>
+                    <div class="orig_reply mb10 mt-10">
+                      <div class="reply">
+                                <span class="reply-right">
+                                    <span id="reply_praise_count_<%=comment.id %>">
                                       <% if comment.user == User.current %>
                                           <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
                                       <% else %>
                                           <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
                                       <% end %>
                                     </span>
-                      <div id="message_edit_<%=comment.id %>" style="display: none" class="mr10 fr">
+                                    <span style="position: relative" class="fr mr20">
+                                        <%= link_to(
+                                                  l(:button_reply),
+                                                  {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => is_in_course},
+                                                  :remote => true,
+                                                  :method => 'get',
+                                                  :title => l(:button_reply)) %>
+                                        <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                                    </span>
+                                    <!--<a action-type="reply"  href="javascript:;" poped="false" class="fr mr20 linkGrey3" title="回复">回复</a>-->
                                     <% if User.current.admin? ||is_teacher || comment.user == User.current%>
                                         <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course,:course_activity=>-1},
-                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "replyGrey fr ml10", :title => l(:button_delete))  %>
+                                          :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete))  %>
                                     <% end %>
+                                </span>
+                        <div class="cl"></div>
                       </div>
                     </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
-                      <%= comment.notes.html_safe %></div>
+                    <p id="reply_message_<%= comment.id%>"></p>
                   </div>
                   <div class="cl"></div>
                 </li>

app/views/users/reply_to.js.erb

@@ -0,0 +1,10 @@
+if($("#reply_message_<%= @reply.id%>").length > 0) {
+    $("#reply_message_<%= @reply.id%>").replaceWith("<%= escape_javascript(render :partial => 'users/reply_to', :locals => {:reply => @reply}) %>");
+    $("#reply_iconup_<%=@reply.id %>").show();
+    $(function(){
+        sd_create_editor_from_data(<%= @reply.id%>,null,"100%", "<%=@reply.class.to_s%>");
+    });
+}else if($("#reply_to_message_<%= @reply.id%>").length >0) {
+    $("#reply_to_message_<%= @reply.id%>").replaceWith("<p id='reply_message_<%= @reply.id%>'></p>");
+    $("#reply_iconup_<%=@reply.id %>").hide();
+}

app/views/users/show_all_replies.js.erb

@@ -0,0 +1,3 @@
+<% unless @comment.parent.nil? %>
+$('#comment_reply_<%=@comment.id %>').html("<%= escape_javascript(render :partial => 'users/comment_reply', :locals => {:comment => @comment.parent})%>");
+<% end %>

app/views/words/reply_to_homework.js.erb

@@ -0,0 +1,4 @@
+<% if @is_in_course %>
+$("#homework_common_<%= @homework_common.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>");
+sd_create_editor_from_data(<%= @homework_common.id%>,"","100%", "HomeworkCommon");
+<% end %>

config/routes.rb

@@ -528,6 +528,8 @@ RedmineApp::Application.routes.draw do
       match "tag_saveEx" , :via =>  [:get, :post]
       post "user_new_homework"
       get  'new_user_commit_homework'
+      get 'reply_to'
+      get 'show_all_replies'
       post "user_commit_homework"
       post 'user_select_homework'
     end
@@ -1150,6 +1152,7 @@ RedmineApp::Application.routes.draw do
   match 'project/:id/share', :to => 'projects#share', :as => 'share_show' #share
   post 'words/:id/leave_user_message', :to => 'words#leave_user_message', :as => "leave_user_message"
   post 'words/:id/leave_homework_message', :to => 'words#leave_homework_message', :as => "leave_homework_message"
+  post 'words/:id/reply_to_homework', :to => 'words#reply_to_homework', :as => "reply_to_homework"
 
   post 'join_in/join', :to => 'courses#join', :as => 'join'
   delete 'join_in/join', :to => 'courses#unjoin'

lib/tasks/homework_update.rake

@@ -1,7 +0,0 @@
-namespace :homework_update do
-  desc "update homework updated_at"
-  task :update_homework => :environment do
-    stu_pro = StudentWork.where("project_id != 0")
-
-  end
-end

public/stylesheets/courses.css

@@ -134,8 +134,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .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;}
-
-.homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
+.homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
 .borderBottomNone {border-bottom:none !important;}
 .topBorder {border-top: 1px solid #e4e4e4;}
 div.minHeight48{min-height: 48px;}
@@ -1302,6 +1301,48 @@ a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: no
 /*20160310分班样式*/
 .select-class-option {width:125px;}
 
+/* 作业二级回复 */
+.clearfix:after { content:"."; display:block; height:0; visibility:hidden; clear:both; }
+.clearfix { zoom:1; }
+.clearit { clear:both; height:0; font-size:0; overflow:hidden; }
+.comment_item{ width:720px; background-color:#f1f1f1; color:#888;}
+.comment_top{ height:15px;    border: 1px solid #e4e4e4; padding:10px; position:relative;}
+.reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.fl{ float:left;}
+.fr{ float:right;}
+.comment_item_cont{ padding:15px; border-bottom:1px solid #e3e3e3;}
+.J_Comment_Face img{ width:40px; height:40px; }
+.t_content{ width:92%; margin-left:15px;}
+a.content-username { color:#269ac9; font-size:14px; margin-right:15px;}
+a.content-username:hover{ color:#297fb8;}
+.orig_user img{width:32px; height:32px;}
+.reply-right{ float:right; position:relative;}
+.reply_iconup02{ position:absolute; top:16px; left:4px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.comment_orig_content{margin:10px 0; color:#999;}
+.comment_orig_content .comment_orig_content{margin-top:0;}
+.orig_cont{ border:solid 1px #F3DDB3; background:#FFFEF4; padding:4px;color:#999;margin-top:-1px;}
+.orig_cont_sub{ border-top:0}
+.orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
+.orig_user{ margin:10px 15px 10px 5px;}
+.orig_user span{ color:#999; padding-right:5px;}
+.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; }
+.orig_right{ width:80%; margin-top:5px;}
+a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
+a:hover.comment_ding_link{ color:#269ac9;}
+.comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;}
+.comment_ding_link em{font-style: normal;font-family: arial;}
+.comment_reply_link{  display:inline-block; width:50px; height:24px;line-height: 24px; vertical-align:middle;text-align: center;}
+.comment_reply_link:link,.comment_reply_link:visited{color:#333;text-decoration: none;}
+.comment_content{ color:#333;}
+.t_txt{ margin-top:10px;}
+.orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
+.orig_textarea{width:90%;  margin-bottom:10px;}
+.orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
+.orig_sub:hover{ background:#297fb8;}
+.orig_cont_hide{ text-align:center; width:624px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:8px 0;}
+.orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}
+
+
 /* 代码查重弹框 */
 a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.Blue-btn{ background:#3598db; color:#fff;}
@@ -1340,3 +1381,4 @@ a.pages-big{ width:50px;}
 
 .red-cir-btn{ background:#e74c3c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .green-cir-btn{ background:#28be6c; padding:1px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+

public/stylesheets/new_user.css

@@ -676,10 +676,9 @@ a.postTypeGrey:hover {color:#269ac9;}
 .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;}
+.homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
 .homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
-.homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
-.borderBottomNone {border-bottom:none !important;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}.borderBottomNone {border-bottom:none !important;}
 .topBorder {border-top: 1px solid #e4e4e4;}
 div.minHeight48{min-height: 48px;}
 .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:15px;}
@@ -1503,6 +1502,50 @@ a.st_img { display:block;width:32px; height:32px; border:1px solid #CCC; padding
 .green_btn_share{ background:#28be6c; padding:2px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
 
+/* 作业二级回复 */
+.clearfix:after { content:"."; display:block; height:0; visibility:hidden; clear:both; }
+.clearfix { zoom:1; }
+.clearit { clear:both; height:0; font-size:0; overflow:hidden; }
+.comment_item{ width:720px; background-color:#f1f1f1; color:#888;}
+.comment_top{ height:15px;    border: 1px solid #e4e4e4; padding:10px; position:relative;}
+.reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.fl{ float:left;}
+.fr{ float:right;}
+.comment_item_cont{ padding:15px; border-bottom:1px solid #e3e3e3;}
+.J_Comment_Face img{ width:40px; height:40px; }
+.t_content{ width:92%; margin-left:15px;}
+a.content-username { color:#269ac9; font-size:14px; margin-right:15px;}
+a.content-username:hover{ color:#297fb8;}
+.orig_user img{width:32px; height:32px;}
+.reply-right{ float:right; position:relative;}
+.reply_iconup02{ position:absolute; top:16px; left:4px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
+.comment_orig_content{margin:10px 0; color:#999;}
+.comment_orig_content .comment_orig_content{margin-top:0;}
+.orig_cont{ border:solid 1px #F3DDB3; background:#FFFEF4; padding:4px;color:#999;margin-top:-1px;}
+.orig_cont_sub{ border-top:0}
+.orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
+.orig_user{ margin:10px 15px 10px 5px;}
+.orig_user span{ color:#999; padding-right:5px;}
+.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; }
+.orig_right{ width:80%; margin-top:5px;}
+a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
+a:hover.comment_ding_link{ color:#269ac9;}
+.comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;}
+.comment_ding_link em{font-style: normal;font-family: arial;}
+.comment_reply_link{  display:inline-block; width:50px; height:24px;line-height: 24px; vertical-align:middle;text-align: center;}
+.comment_reply_link:link,.comment_reply_link:visited{color:#333;text-decoration: none;}
+.comment_content{ color:#333;}
+.t_txt{ margin-top:10px;}
+.orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
+.orig_textarea{width:90%;  margin-bottom:10px;}
+.orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
+.orig_sub:hover{ background:#297fb8;}
+.orig_cont_hide{ text-align:center; width:624px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:8px 0;}
+.orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}
+
+.likeText{color: #7f7f7f}
+.likeNum{color: #7f7f7f}
+
 /* 代码查重弹框 */
 a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.Blue-btn{ background:#3598db; color:#fff;}

public/stylesheets/project.css

@@ -984,6 +984,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
     vertical-align: middle;
     font-size: 12px;
     color: #888;
+    position: relative;
 }
 .homepagePostReplyBannerCount {
     width: 255px;

public/stylesheets/public.css

@@ -111,6 +111,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mw20{ margin: 0 20px;}
 .mt1{margin-top: 1px;}
 .mt-4 {margin-top:-4px;}
+.mt-10 {margin-top:-10px;}
 .mt0 {margin-top:0px !important;}
 .mt3{ margin-top:3px;}
 .mt5{ margin-top:5px;}
@@ -604,7 +605,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
 .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;}
+.homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
 .borderBottomNone {border-bottom:none !important;}
 .topBorder {border-top: 1px solid #e4e4e4;}
 .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:15px;}
@@ -1145,3 +1146,6 @@ a.program-btn{background: url(../images/homepage_icon.png) -86px -393px no-repea
 /*排序样式*/
 a.st_up{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 0 no-repeat; margin-top:5px; margin-left:3px;}
 a.st_down{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;}
+
+.likeText{color: #7f7f7f}
+.likeNum{color: #7f7f7f}