Merge branch 'szzh' into develop

app/controllers/forums_controller.rb

@@ -296,7 +296,7 @@ class ForumsController < ApplicationController
 
   #检查forum的名字
   def check_forum_name
-    forum_name_exist = Forum.where("name = '#{params[:forum_name]}'").count >= 1 ? true : false
+    forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false
     render :text => forum_name_exist
   end
 

app/controllers/journals_controller.rb

@@ -73,7 +73,7 @@ class JournalsController < ApplicationController
     text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
     @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n"
     @content << text.gsub(/(\r?\n|\r\n?)/, "\n ") + "\n"
-    @content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content << "</blockquote>"
+    @content = "<blockquote style='padding-left:0px;margin-left:0px;'>" << @content << "</blockquote>\n\n<br/>"
     @id = user.id
   rescue ActiveRecord::RecordNotFound
     render_404

app/models/mailer.rb

@@ -71,7 +71,7 @@ class Mailer < ActionMailer::Base
     recipients ||= []
     course.student.each do |student|
       user = User.find(student.student_id)
-      @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
+      @subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_open)}"
       @token = Token.get_token_from_user(user, 'autologin')
       @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
       @anonymous_comment_close_name = homework_common.name
@@ -255,7 +255,7 @@ class Mailer < ActionMailer::Base
   # 作业截止时间邮件提醒
   def homework_endtime__added(homework_common, user_id)
     user = User.find(user_id)
-    @subject = "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+    @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_homework_endtime)} "
     @token = Token.get_token_from_user(user, 'autologin')
     @homework_endtime_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
     @homework_endtime_name = homework_common.name

app/views/files/_tag_yun.html.erb

@@ -3,7 +3,7 @@
         <% if tag_name && tag_name == k%>
             <a href="javascript:void(0);" class="files_tag_select"><%= k%>×<%= v%></a>
         <% else%>
-            <a href="javascript:void(0);" class="files_tag_icon" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a>
+        <span class="files_tag_icon">    <a href="javascript:void(0);"  ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
         <% end%>
     <% end%>
 <% end%>

app/views/files/index.html.erb

@@ -223,6 +223,7 @@
                 });
 
     }
+    <% if @course %>
     var tagNameHtml; //当前双击的链接的父节点的html
     var tagName;  //标签的值
     var parentCssBorder; //当前双击的链接的父节点
@@ -271,6 +272,7 @@
                }
            }
    });
+   <%end %>
 
 </script>
 

app/views/forums/_file_form.html.erb

@@ -47,7 +47,7 @@
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
     <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
     <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'AnnexBtn fl mt3' %>
-    <a href="javascript:void(0);" onclick="$('#_file').click();" class="AnnexBtn fl mr15">上传附件</a>
+    <a href="javascript:void(0);" onclick="_file.click();" class="AnnexBtn fl mr15">上传附件</a>
     <%= file_field_tag 'attachments[dummy][file]',
                        :id => '_file',
                        :class => 'file_selector',

app/views/forums/edit.html.erb

@@ -43,13 +43,10 @@
     function check_forum_name(){
         check_pass = true;
         name = $("textarea[name='forum[name]']").val().trim();
-        if(name == '<%= @forum.name%>'){
-            return;
-        }
         if( name != ""){
             $.get(
                     '<%= check_forum_name_forums_path %>',
-                    {"forum_name":name},
+                    {"forum_name":name,"forum_id":<%= @forum.id%>},
                     function(data){
 
                         if( data == 'true'){

app/views/issues/_action_menu.html.erb

@@ -3,4 +3,4 @@
 <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'talk_edit fr' if User.current.allowed_to?(:add_issues, @project) %>
 <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
 <%= link_to l(:button_edit), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
-<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>
+<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_journal_kind_reply"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>

app/views/issues/_edit.html.erb

@@ -1,3 +1,4 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
@@ -19,7 +20,7 @@
     </div>
     <input name="issue_quote_new" type="hidden" value="<%= %>" />
     <fieldset><legend>回复</legend>
-    <%= f.text_area :notes, :style => "width:99%;", :rows => "5", :no_label => true %>
+    <%= f.kindeditor :notes, :style => "width:99%;",:height=>'100px', :cssData =>"blockquote { padding:0px}", :rows => "5", :no_label => true, :editor_id=>'issue_journal_kind_reply' %>
     </fieldset>
     <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
     <!--<label for="issue_private_notes"><%#= f.check_box :private_notes, :no_label => true %> <%#= l(:field_private_notes) %></label>-->

app/views/issues/_history.html.erb

@@ -12,9 +12,9 @@
             <p>
               <% if journal.details.any? %>
                 <% details_to_strings(journal.details).each do |string| %>
-                  <p><%= string %></p>
+                  <p><%= string.html_safe %></p>
                 <% end %>
-            <% end %>
+              <% end %>
             </p>
           </div>
           <!--编辑、引用、回复按钮-->

app/views/issues/show.html.erb

@@ -64,7 +64,7 @@
       </div>
       <p style="padding-top: 5px"></p>
       <%#--引用时不能修改，剥离出引用内容--%>
-      <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">
+      <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="issue_desc_editor.sync();issue_journal_kind_reply.sync();$('#issue-form').submit();">
         <%= l(:button_submit) %>
       </a>
   <% end %>

app/views/journals/new.js.erb

@@ -1,4 +1,4 @@
-$('#issue_notes').val("<%= raw escape_javascript(@content) %>");
+issue_journal_kind_reply.html("<%= raw escape_javascript(@content) %>");
 <%
   # when quoting a private journal, check the private checkbox
   if @journal && @journal.private_notes?

app/views/memos/show.html.erb

@@ -56,7 +56,7 @@
     <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
   </span>
       <div class="cl"></div>
-      <div class="fl fontGrey3" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;">
+      <div class="fl fontGrey3" class="memo-content">
             <%= @memo.content.html_safe%>
       </div>
       <div class="cl"></div>

app/views/projects/show.html.erb

@@ -34,7 +34,7 @@
                                  :id => act.id},
                                  :class => "problem_tit fl fb " %>
                 </a><br />
-                <p class="mt5 break_word"><%= textAreailizable act,:description %><br />
+                <p class="mt5 break_word"><%= act.description.html_safe %><br />
                   <%= l :label_activity_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %>
                 </p>
               </div>
@@ -51,7 +51,7 @@
                   <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"),
                               {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"}, :class => "problem_tit fl fb" %>
                 </a><br />
-                <p class="mt5 break_word"><%= textilizable act,:notes %><br />
+                <p class="mt5 break_word"><%=  act.notes.html_safe %><br />
                   <%= l :label_activity_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
               </div>
               <div class="cl"></div>

app/views/users/user_messages.html.erb

@@ -118,44 +118,39 @@
                 <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
                     <ul class="homepageNewsList fl">
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                      <li class="homepageNewsPubTypeHomework fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotReadHomework fl":"homepageNewsTypeHomework fl" %>">发布了作业于课程：<%= ma.course_message.course.name %></span>
+                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                        <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了课程作业：</span>
                       </li>
-                      <li class="homepageNewsContent fl" style="width:315px;"><a href="javascript:void(0);" class="newsGrey">
+                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                         <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
                                     :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                                     :onmouseover =>"message_titile_show($(this),event)",
                                     :onmouseout => "message_titile_hide($(this))" %></a></li>
                       <div  style="display: none" class="message_title_red system_message_style">
                         <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
-                            <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
-                            <p><strong>课程：</strong><%= ma.course_message.course.name %>
+                            <p><%= User.current.lastname + User.current.firstname %>同学你好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
+                            <p>课程名称：<%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
-                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                            <% unless ma.course_message.description.blank? %>
-                                <div class="fl"><strong>作业内容：</strong></div>
-                                <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                            <% end %>
-                            <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
-                            <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                            <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
+                            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
+                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
+                            <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
                             <p>
-                              请同学们抓紧时间提交自己的作品，谢谢！
+                              请抓紧时间提交自己的作品，谢谢！
                             </p>
                         <% else %>
-                            <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
-                            <p><strong>课程：</strong><%= ma.course_message.course.name %>
+                            <p>
+                              <%= User.current.lastname + User.current.firstname %>老师您好！
+                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：
+                            </p>
+                            <p>课程名称：<%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
-                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                            <% unless ma.course_message.description.blank? %>
-                                <div class="fl"><strong>作业内容：</strong></div>
-                                <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                            <% end %>
-                            <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
-                            <p><strong>匿评自动开始日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %></p>
-                            <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                            <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
-                            <p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分</p>
+                            <p>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></p>
+                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
+                            <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
+                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
+                            <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
+                            <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
                             <p>
                               您可以修改作业内容、评分规则、匿评过程等，谢谢！
                             </p>
@@ -168,59 +163,62 @@
                     <ul class="homepageNewsList fl">
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
                       <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
-                      <% if ma.viewed == 0 %>
-                          <li class="homepageHomeworkContent fl">
-                            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
-                                <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
-                                <p><strong>课程：</strong><%= ma.course_message.course.name %>
-                                  (<%= ma.course_message.course.term %>)</p>
-                                <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                                <% unless ma.course_message.description.blank? %>
-                                    <div class="fl"><strong>作业内容：</strong></div>
-                                    <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                                <% end %>
-                                <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
-                                <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                                <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
-                                <p>
-                                  请同学们抓紧时间提交自己的作品，谢谢！
-                                </p>
-                            <% else %>
-                                <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业，详情如下：</p>
-                                <p><strong>课程：</strong><%= ma.course_message.course.name %>
-                                  (<%= ma.course_message.course.term %>)</p>
-                                <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                                <% unless ma.course_message.description.blank? %>
-                                    <div class="fl"><strong>作业内容：</strong></div>
-                                    <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                                <% end %>
-                                <p><strong>作业提交截止日期：</strong><%= ma.course_message.end_time %></p>
-                                <p><strong>匿评自动开始日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %></p>
-                                <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                                <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
-                                <p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分</p>
-                                <p>
-                                  您可以修改作业内容、评分规则、匿评过程等，谢谢！
-                                </p>
-                            <% end %>
-                          </div>
-                          <li  class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
-                      <% else %>
-                          <li class="homepageNewsContent fl">
-                            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))"%>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <%= ma.course_message.name %>
-                          </div>
-                      <% end %>
+                      <li class="homepageHomeworkContent fl">
+                        <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
+                                    :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                    :onmouseover => "message_titile_show($(this),event)",
+                                    :onmouseout => "message_titile_hide($(this))" %>
+                      </li>
+                      <div style="display: none" class="message_title_red system_message_style">
+                        <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
+                            <p>
+                              <%= User.current.lastname + User.current.firstname %>同学您好！
+                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
+                            </p>
+
+                            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+
+                            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+
+                            <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>@nbsp;&nbsp;24点</span></p>
+
+                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>
+                              @nbsp;@nbsp;24点</span></p>
+
+                            <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
+
+                            <p>
+                              请同学们抓紧时间提交自己的作品，谢谢！
+                            </p>
+                        <% else %>
+                            <p><%= User.current.lastname + User.current.firstname %>您好！
+                              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>
+                              老师发布的作业截止日期快到了：</p>
+
+                            <p><strong>课程名称：</strong><%= ma.course_message.course.name %>
+                              (<%= ma.course_message.course.term %>)</p>
+
+                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
+
+                            <p><strong>提交截止：</strong><%= ma.course_message.end_time %>@nbsp;@nbsp;24点</p>
+
+                            <p><strong>匿评开始：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %>
+                              @nbsp;@nbsp;24点</p>
+
+                            <p><strong>匿评关闭：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %>
+                              @nbsp;@nbsp;24点</p>
+
+                            <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
+
+                            <p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分
+                            </p>
+
+                            <p>
+                              您可以修改作业内容、评分规则、匿评过程等，谢谢！
+                            </p>
+                        <% end %>
+                      </div>
+                      <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
@@ -368,7 +366,7 @@
                         </li>
                       <li class="homepageNewsPubType fl">
                         <% if ma.course_message.reviewer_role == 3 %>
-                            匿名用户
+                            <span class="newsBlue homepageNewsPublisher">匿名用户</span>
                         <% else %>
                             <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
                                         user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
@@ -578,16 +576,16 @@
                           </div>
                       <% else %>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ma.forge_message.content.html_safe, project_boards_path(ma.forge_message.project,
+                            <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project,
                                         :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
                                         :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
                                         :onmouseover => "message_titile_show($(this),event)",
                                         :onmouseout => "message_titile_hide($(this))" %></a></li>
                           <div style="display: none" class="message_title_red system_message_style">
-                            <p><strong>主题：</strong><%= ma.forge_message.subject %></p>
+                            <p><strong>帖子主题：</strong><%= ma.forge_message.subject %></p>
                             <% unless ma.forge_message.content.nil? %>
-                                <div class="fl"><strong>内容：</strong></div>
-                                <div class="ml36"><%= ma.forge_message.content.html_safe %></div>
+                                <div class="fl"><strong>评论内容：</strong></div>
+                                <div class="ml60"><%= ma.forge_message.content.html_safe %></div>
                             <% end %>
                           </div>
                       <% end %>

public/javascripts/project.js

@@ -370,7 +370,9 @@ $(document).ready(function () {
     }
 
     function quote_issue_journal(){
-        document.getElementById("#issue_notes").focus();
+        alert("test");
+        issue_journal_kind_reply.focus();
+        issue_journal_kind_reply.cmd.range.setStart(issue_journal_kind_reply.cmd.range.startOffset)
     }
 
     /*缺陷完成度决定缺陷状态*/

public/stylesheets/courses.css

@@ -41,7 +41,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .pingBoxTit{ float:left; width:625px; margin-left:10px;}
 .pingText{border:1px solid #CCCCCC; margin:5px; padding:5px; width:610px; height:20px; }
 .pingBackTit{ float:left; width:573px; margin-left:10px; }
-.hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle; padding-bottom:5px;}
+.hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle;}
 .hworkH30 {height:30px !important; line-height:30px !important;}
 .hworkListRow {height:65px; border-bottom:1px solid #eaeaea; line-height:65px; vertical-align:middle;}
 .hworkListRow:hover {background-color:#f6f6f7;}
@@ -614,7 +614,9 @@ a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px
 .newwork_btn a{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; display:block; text-align:center; float:right;}
 .newwork_btn a:hover{ background:#329cbd;}
 .files_tag{ width:670px; min-height:22px;margin-bottom:10px;}/* overflow:hidden; */
-a.files_tag_icon{ background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px; }
+/*padding:1px 10px 修改原因，padding会导致内部输入框和外边框有边距*/
+a.files_tag_icon{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;margin-bottom:10px; }
+span.files_tag_icon{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;margin-bottom:10px; }
 a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px;}
 
 /* 20150423作业评分*/

public/stylesheets/new_user.css

@@ -406,6 +406,7 @@ a.sendButtonBlue:hover {color:#ffffff;}
 }
 a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;}
 a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;}
+a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-repeat; padding-left:23px;}
 .resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;}
 /*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/
 /*.resourcesUploadBox:hover {background-color:#0781b4;}*/
@@ -547,11 +548,11 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
 .homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
 .homepageNewsPublisher { max-width:100px; font-size:12px; color:#269ac9; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
-.homepageNewsType {width:110px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
+.homepageNewsType {padding-left: 5px; font-size:12px; color:#888888; display:block;}
 .homepageNewsTypeHomework {width:160px; padding-left: 5px; font-size:12px; color:#888888; display:block; overflow:hidden; height:49px;word-break:break-all; word-wrap:break-word; text-overflow:ellipsis;}
-.homepageNewsPubType {width:220px; font-size:12px; color:#888888; display: block;}
+.homepageNewsPubType {width:230px; font-size:12px; color:#888888; display: block;}
 .homepageNewsPubTypeHomework {width:270px; font-size:12px; color:#888888; display: block; white-space:nowrap;}
-.homepageNewsContent {width:365px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageNewsContent {width:355px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageSystenMessageContent {width:291px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContent {width:245px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
@@ -1061,7 +1062,7 @@ img.ui-datepicker-trigger {
     margin: 7px;
 }
 /*消息*/
-.homepageNewsTypeNotRead {width:100px; padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;}
+.homepageNewsTypeNotRead {padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;}
 .homepageNewsTypeNotReadHomework {width:170px; padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;overflow:hidden; height:49px; word-break:break-all; word-wrap:break-word;text-overflow:ellipsis;}
 .calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;}
 .calendar_div{border: 1px solid #d9d9d9;}