Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/controllers/issues_controller.rb

@@ -223,7 +223,6 @@ class IssuesController < ApplicationController
     end
 
     if saved
-
       #修改界面增加跟踪者
       watcherlist = @issue.watcher_users
       select_users = []
@@ -253,9 +252,7 @@ class IssuesController < ApplicationController
         JournalReply.add_reply(@issue.current_journal.id, reply_id, User.current.id)
       end
       flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
-
       respond_to do |format|
-
         format.html { redirect_to issue_url(@issue.id) }
         format.api  { render_api_ok }
       end

app/controllers/messages_controller.rb

@@ -162,7 +162,7 @@ class MessagesController < ApplicationController
     @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
     @topic.children << @reply
     user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
-    user_activity.updated_at = @reply.created_on
+    user_activity.updated_at = Time.now
     user_activity.save
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?

app/controllers/projects_controller.rb

@@ -259,7 +259,8 @@ class ProjectsController < ApplicationController
   # Author lizanle
   # Description  项目动态展示方法，删除了不必要的代码
   def show
-
+    # 更新消息为已读
+    update_message_status(User.current, @project)
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
@@ -468,6 +469,7 @@ class ProjectsController < ApplicationController
     if params[:message_id]
       message_invite(params[:message_id], params[:key])
     end
+    update_message_status(User.current, @project)
     # params[:login]为邮箱邀请用户加入，主要功能：
     # 1、自动注册
     # 2、加入项目、创建角色
@@ -523,11 +525,21 @@ class ProjectsController < ApplicationController
     @members = paginateHelper @members
   end
 
+  def update_message_status(user, project)
+    project_invite_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type =?", user, project, "ProjectInvite")
+    project_invite_messages.each do |project_invite_message|
+      project_invite_message.update_attribute(:viewed, true)
+    end
+  end
+
   def message_invite(message_id, key)
     forge_message = ForgeMessage.find(message_id)
     if key == forge_message.secret_key
-      Member.create(:role_ids => [4], :user_id => forge_message.user_id, :project_id => forge_message.project_id)
-      UserGrade.create(:user_id => forge_message.user_id, :project_id => forge_message.project_id)
+      # 情况：用户收到邀请邮件还没看，但是管理员已经把该用户添加进项目
+      if Member.where("user_id =? and project_id =?",forge_message.user_id, forge_message.project_id).first.nil?
+        Member.create(:role_ids => [4], :user_id => forge_message.user_id, :project_id => forge_message.project_id)
+        UserGrade.create(:user_id => forge_message.user_id, :project_id => forge_message.project_id)
+      end
     end
   end
 

app/controllers/users_controller.rb

@@ -95,37 +95,18 @@ class UsersController < ApplicationController
   # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复
   # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
   def user_messages
-    unless User.current.logged?
+    if !User.current.logged?
       redirect_to signin_url
       return
+    elsif @user != User.current && !User.current.admin?
+     return render_403
     end
-    # 记录当前点击按钮的时间
-    # 考虑到用户未退出刷新消息页面
-    message_time = OnclickTime.where("user_id =?", User.current).first
-    if message_time.nil?
-      message_new_time = OnclickTime.new
-      message_new_time.user_id = User.current.id
-      message_new_time.onclick_time = Time.now
-      message_new_time.save
-    else
-      # 24小时内显示
-      contrast_time = Time.now - 86400
-      message_time.update_attributes(:onclick_time => Time.now)
-    end
-    @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc")
-    # 当前用户查看消息，则设置消息为已读
-    # DO 待优化，只需查出符合条件的再更新
+    # 初始化/更新 点击按钮时间
+    # 24小时内显示系统消息
+    update_onclick_time
+    # 全部设为已读
     if params[:viewed] == "all"
-      course_querys = @user.course_messages
-      forge_querys = @user.forge_messages
-      user_querys = @user.user_feedback_messages
-      forum_querys = @user.memo_messages
-      if User.current.id == @user.id
-        course_querys.update_all(:viewed => true)
-        forge_querys.update_all(:viewed => true)
-        user_querys.update_all(:viewed => true)
-        forum_querys.update_all(:viewed => true)
-      end
+      update_message_viewed(@user)
     end
     # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     case params[:type]
@@ -195,10 +176,43 @@ class UsersController < ApplicationController
     end
   end
 
+  # 初始化/更新 点击按钮时间
+  def update_onclick_time
+    # 记录当前点击按钮的时间
+    # 考虑到用户未退出刷新消息页面
+    message_time = OnclickTime.where("user_id =?", User.current).first
+    if message_time.nil?
+      message_new_time = OnclickTime.new
+      message_new_time.user_id = User.current.id
+      message_new_time.onclick_time = Time.now
+      message_new_time.save
+    else
+      # 24小时内显示
+      contrast_time = Time.now - 86400
+      message_time.update_attributes(:onclick_time => Time.now)
+    end
+    # 24小时内显示系统消息
+    @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc")
+  end
+
+  # 消息设置为已读
+  def update_message_viewed(user)
+    course_querys = CourseMessage.where("user_id =? and viewed =?", user, 0)
+    forge_querys = ForgeMessage.where("user_id =? and viewed =?", user, 0)
+    user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0)
+    forum_querys = MemoMessage.where("user_id =? and viewed =?", user, 0)
+    if User.current.id == @user.id
+      course_querys.update_all(:viewed => true)
+      forge_querys.update_all(:viewed => true)
+      user_querys.update_all(:viewed => true)
+      forum_querys.update_all(:viewed => true)
+    end
+  end
+
   # 系统消息
   def user_system_messages
     @sytem_messages = SystemMessage.order("created_at desc").all
-    @sytem_messages = paginateHelper @sytem_messages,25
+    @sytem_messages = paginateHelper @sytem_messages, 10
     respond_to do |format|
       format.html{render :layout=>'new_base_user'}
     end

app/models/homework_detail_programing.rb

@@ -4,6 +4,6 @@ class HomeworkDetailPrograming < ActiveRecord::Base
   belongs_to :homework_common
 
   def language_name
-    %W(C C++).at(self.language.to_i - 1)
+    %W(C C++ Python).at(self.language.to_i - 1)
   end
 end

app/models/journal.rb

@@ -171,11 +171,16 @@ class Journal < ActiveRecord::Base
 
   # 缺陷状态更改，消息提醒
   def act_as_forge_message
+    receivers = []
+    # 直接回复
     if self.user_id != self.issue.author_id
-      self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id, :project_id => self.issue.project_id, :viewed => false)
+      receivers << self.issue.author_id
     end
     if self.user_id != self.issue.assigned_to_id && self.issue.assigned_to_id != self.issue.author_id   # 指派人不是自己的话，则给指派人发送
-      self.forge_messages << ForgeMessage.new(:user_id => self.issue.assigned_to_id, :project_id => self.issue.project_id, :viewed => false)
+      receivers << self.issue.assigned_to_id
+    end
+    receivers.each do |r|
+      self.forge_messages << ForgeMessage.new(:user_id => r, :project_id => self.issue.project_id, :viewed => false)
     end
   end
 

app/models/journal_reply.rb

@@ -5,8 +5,33 @@ class JournalReply < ActiveRecord::Base
   
   belongs_to :user
   belongs_to :journal
+  after_create :send_journal_messages
   
   def self.add_reply(journal_id, reply_id, user_id)
     self.create(:journal_id => journal_id, :reply_id => reply_id, :user_id => user_id)
   end
+
+  def send_journal_messages
+    journal = self.journal
+    replier = User.find(self.reply_id)
+    receivers = []
+    # 被回复的人发送消息
+    if journal.user_id != self.reply_id
+      receivers << self.replier
+    end
+    if journal.user_id != journal.issue.author_id && self.reply_id != journal.issue.author_id
+      receivers << self.journal.issue.author
+    end
+    receivers.each do |r|
+      journal.forge_messages << ForgeMessage.new(:user_id =>r, :project_id => journal.issue.project, :viewed => false)
+    end
+
+    #   if self.user_id != self.journal_reply.user_id
+    #     receivers << self.journal_reply.user_id
+    #   end
+    # # 给缺陷发布者发送
+    #   if self.user_id != self.issue.author_id && self.journal_reply.user_id != self.issue.author_id
+    #     receivers << self.issue.author_id
+    #   end
+  end
 end

app/models/user.rb

@@ -264,6 +264,7 @@ class User < Principal
     if OnclickTime.where("user_id =?", User.current).first.nil?
       message_new_time = OnclickTime.new
       message_new_time.user_id = User.current.id
+      # 第一次初始化点击铃铛时间
       message_new_time.onclick_time = User.current.last_login_on.nil? ? Time.now : User.current.last_login_on
       message_new_time.save
     end

app/views/comments/create.js.erb

@@ -1,3 +1,3 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_activity_KindEditor_data('<%= @user_activity_id%>',"","85%");
+init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");

app/views/homework_common/index.html.erb

@@ -78,11 +78,7 @@
             <div class="mt5">
               <span class="tit_fb"  style="width: auto;"> 开发语言：</span>
               <div class="fl">
-                <% if homework.homework_detail_programing.language.to_i == 1%>
-                    C
-                <% elsif homework.homework_detail_programing.language.to_i == 2%>
-                    C++
-                <% end%>
+                <%= homework.language_name%>
               </div>
             </div>
             <div class="cl"></div>

app/views/issues/_edit.html.erb

@@ -6,15 +6,9 @@
         <div id="all_attributes" style="display:none;">
           <%= render :partial => 'form', :locals => {:f => f} %>
           <div class="ping_C mb10 ml10"></div>
-          <!--<a remote="true" href="javascript:void(0)" class="blue_btn fl" style="margin-left: 80px;margin-bottom: 10px;margin-top: -10px;" onclick="$('#issue-form').submit();">-->
-            <!--<%#= l(:button_submit) %>-->
-          <!--</a>-->
         </div>
-
     <% end %><!--end-->
 
-    <!--<fieldset><legend><%#= l(:field_notes) %></legend>-->
-    <!--回复框-->
     <% if @journals.present? %>
         <div id="history">
           <%= render :partial => 'history', :locals => {:issue => @issue, :journals => @journals} %>

app/views/issues/add_journal.js.erb

@@ -1,3 +1,3 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","85%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");

app/views/mailer/applied_project.html.erb

@@ -1,5 +1,11 @@
-<%= l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name) %>
-<hr />
-
-<h1><%= link_to(h(@project.name), @applied_url) %></h1>
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+          <p><%=link_to @user.show_name, user_url(@user) %> 申请加入项目：<%=link_to @project.name, @applied_url %> </p>
+        </span>
+    </li>
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
 

app/views/mailer/applied_project.text.erb

@@ -1,4 +1,7 @@
-<%= l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name) %>
+<%= l(:mail_issue_content)%>
+<%=link_to @user.show_name, user_url(@user) %>
+<%=link_to @project.name, @applied_url %>
+
+
 
-<h1><%= link_to(h(@project.name), @applied_url) %></h1>
 

app/views/messages/reply.js.erb

@@ -3,4 +3,4 @@
 <%elsif @course%>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
 <%end%>
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","85%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");

app/views/poll/_poll.html.erb

@@ -30,13 +30,13 @@
   <% if poll.polls_status == 1 %>
       <li><%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml5"%></li>
   <% else%>
-      <li class="polls_de_grey fr ml5">编辑</li>
+      <li class="polls_de_grey fr ml5" title="未发布的问卷才能进行编辑">编辑</li>
   <% end%>
 
   <% if poll.polls_status == 2 %>
       <li><a class="polls_de fr ml5" onclick="close_poll(<%= poll.id%>);" href="javascript:">关闭</a></li>
   <% else %>
-      <li class="polls_de_grey fr ml5">关闭</li>
+      <li class="polls_de_grey fr ml5" title="发布的问卷才能进行关闭">关闭</li>
   <% end%>
 
     <% if poll.polls_status == 1%>

app/views/users/_activity_new_score_index.html.erb

@@ -1,4 +1,3 @@
-
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.tramples')%> * (-2) = <%= option_num.tread %> * (-2) = <%= option_num.tread * (-2) %></div>
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.like.level1')%> * 4 = <%= option_num.praise_by_one %> * 4 = <%= option_num.praise_by_one * 4 %></div>
 <div>&nbsp;&nbsp;&nbsp; <%= l('userscore.skill.like.level2')%> * 6 = <%= option_num.praise_by_two %> * 6 = <%= option_num.praise_by_two * 6 %></div>

app/views/users/_course_homework.html.erb

@@ -36,11 +36,7 @@
         <% if activity.homework_type == 2%>
             <div class="homepagePostDeadline mr15">
               语言：
-              <% if activity.homework_detail_programing.language.to_i == 1%>
-                  C
-              <% elsif activity.homework_detail_programing.language.to_i == 2%>
-                  C++
-              <% end%>
+              <%= activity.language_name%>
             </div>
         <% end %>
 

app/views/users/_course_message.html.erb

@@ -97,16 +97,16 @@
         </div>
     <% end %>
 
-    <div class="homepagePostReplyContainer borderBottomNone">
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer">
+      <div class="homepagePostReplyInputContainer mt3 mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
               <input type="hidden" name="quote[quote]" value="">
               <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
               <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left; margin-left: 5px; padding-top:3px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
               <div class="cl"></div>
               <p nhname='contentmsg_<%= user_activity_id%>'></p>
           <% end%>

app/views/users/_course_news.html.erb

@@ -68,21 +68,22 @@
         </div>
     <% end %>
 
-    <div class="homepagePostReplyContainer borderBottomNone">
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer">
-      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-        <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
-            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
-            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
-            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
-            <div class="cl"></div>
-            <p nhname='contentmsg_<%= user_activity_id%>'></p>
-        <% end%>
+      <div class="homepagePostReplyInputContainer mt3 mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="comment"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
       </div>
       <div class="cl"></div>
     </div>
-    </div>
   </div>
 </div>

app/views/users/_project_issue.html.erb

@@ -113,22 +113,23 @@
         </div>
     <% end %>
 
-    <div class="homepagePostReplyContainer borderBottomNone">
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer">
-      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-        <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
-            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
-            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
-            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
-            <div class="cl"></div>
-            <p nhname='contentmsg_<%= user_activity_id%>'></p>
-        <% end%>
+      <div class="homepagePostReplyInputContainer mt3 mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="notes"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
       </div>
       <div class="cl"></div>
     </div>
-    </div>
 
   </div>
 </div>

app/views/users/_project_message.html.erb

@@ -82,23 +82,24 @@
         </div>
     <% end %>
 
-    <div class="homepagePostReplyContainer borderBottomNone">
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
-      <div class="homepagePostReplyInputContainer">
-      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-        <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-            <input type="hidden" name="quote[quote]" value="">
-            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-            <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
-            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
-            <div class="cl"></div>
-            <p nhname='contentmsg_<%= user_activity_id%>'></p>
-        <% end%>
+      <div class="homepagePostReplyInputContainer mt3 mb10">
+        <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+          <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+              <input type="hidden" name="quote[quote]" value="">
+              <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+              <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
+              <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="margin-top:6px;">发送</a>
+              <div class="cl"></div>
+              <p nhname='contentmsg_<%= user_activity_id%>'></p>
+          <% end%>
+        </div>
+        <div class="cl"></div>
       </div>
       <div class="cl"></div>
     </div>
-    </div>
 
 
   </div>

app/views/users/_user_activities.html.erb

@@ -36,7 +36,7 @@
             }
 
             $(function() {
-                init_activity_KindEditor_data(<%= user_activity.id%>,"","85%");
+                init_activity_KindEditor_data(<%= user_activity.id%>,"","87%");
             });
         </script>
         <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>

app/views/users/_user_homework_list.html.erb

@@ -34,11 +34,7 @@
             <% if homework_common.homework_type == 2%>
                 <div class="homepagePostDeadline mr15">
                     语言：
-                    <% if homework_common.homework_detail_programing.language.to_i == 1%>
-                        C
-                    <% elsif homework_common.homework_detail_programing.language.to_i == 2%>
-                        C++
-                    <% end%>
+                    <%= homework_common.language_name%>
                 </div>
             <% end %>
             <div class="homepagePostDeadline">

app/views/users/_user_programing_attr.html.erb

@@ -4,7 +4,7 @@
 <div class="HomeWorkCon">
   <div class="mt15">
     <select class="InputBox W120 language_type"  >
-      <%= options_for_select({"C语言"=>1, "C++"=>2}, (edit_mode && homework.is_program_homework?) ? homework.language : 1) %>
+      <%= options_for_select({"C语言"=>1, "C++"=>2, "Python"=>3}, (edit_mode && homework.is_program_homework?) ? homework.language : 1) %>
     </select>
   </div>
   <% if edit_mode && homework.is_program_homework? %>