issue回复局部刷新

附件浏览问题
昵称改成登录名

app/api/mobile/apis/courses.rb

@@ -272,7 +272,7 @@ module Mobile
         params do
           requires :token,type:String
           requires :course_id,type:Integer,desc: '课程id'
-          optional :name,type:String,desc:'学生的姓名或者昵称或者学号可能包含的字符'
+          optional :name,type:String,desc:'学生的姓名或者登录名或者学号可能包含的字符'
         end
         get ":course_id/members" do
           cs = CoursesService.new

app/api/mobile/apis/users.rb

@@ -82,7 +82,7 @@ module Mobile
         desc "用户搜索"
         params do
           requires :name, type: String, desc: '用户名关键字'
-          requires :search_by, type: String,desc: '搜索依据：0 昵称，1 用户名，2 邮箱,3 昵称和姓名'
+          requires :search_by, type: String,desc: '搜索依据：0 登录名，1 用户名，2 邮箱,3 登录名和姓名'
           optional :is_search_assitant,type:Integer,desc:'是否搜索注册用户来作为助教'
           optional :course_id,type:Integer,desc: '课程id，搜索注册用户不为该课程教师的其他用户'
           optional :user_id,type:Integer,desc:'用户id'

app/views/account/login.html.erb

@@ -224,7 +224,7 @@
           <%= back_url_hidden_field_tag %>
           <div class="mb20">
             <%= text_field_tag 'username', params[:username], :tabindex => '1' ,
-                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或昵称', :onkeypress => "user_name_keypress(event);"%>
+                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
             <!--<input type="text" placeholder="请输入邮箱地址或昵称" class="loginSignBox" />-->
           </div>
           <% if Setting.openid? %>
@@ -283,8 +283,8 @@
           </div>
           <div  class="loginSignRow">
             <!--<input type="text" placeholder="请输入用户昵称" class="loginSignBox" />-->
-            <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户昵称",:class=>'loginSignBox'%>
-            <div class="loginSignAlert" id="login_req" style="display: none">用户昵称为2-18个中英文，数字或下划线</div>
+            <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户登录名",:class=>'loginSignBox'%>
+            <div class="loginSignAlert" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</div>
           </div>
               <div class="loginSignOption">
                 <div class="fl mt3 mr5">

app/views/admin/latest_login_users.html.erb

@@ -38,7 +38,7 @@
         用户姓名
       </th>
       <th style="width: 50px;">
-        用户昵称
+        用户登录名
       </th>
       <th style="width: 50px;">
         用户身份

app/views/attachments/_form.html.erb

@@ -31,7 +31,7 @@
   <span class="add_attachment" style="font-weight:normal;">
     <%#= 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 => 'sub_btn' %>
+    <%= button_tag "上传附件", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
     <%= file_field_tag 'attachments[dummy][file]',
                        :id => '_file',
                        :class => 'file_selector',

app/views/attachments/_form_project.html.erb

@@ -109,7 +109,7 @@
     <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
       <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-      <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+      <%= button_tag "上传附件", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
       <%= file_field_tag 'attachments[dummy][file]',
                          :id => '_file',
                          :class => 'file_selector',

app/views/courses/_searchmembers.html.erb

@@ -1,5 +1,5 @@
 <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:remote=>true,:id => "search_student") do %>
-    <%= text_field_tag 'name', params[:name], name: "name", :class => 'st_search_input', :placeholder => '输入学生昵称、姓名、学号进行搜索'%>
+    <%= text_field_tag 'name', params[:name], name: "name", :class => 'st_search_input', :placeholder => '输入学生登录名、姓名、学号进行搜索'%>
     <% if @group %>
         <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %>
         <input type="hidden" name="ingroup">

app/views/courses/settings.html.erb

@@ -109,7 +109,7 @@
     <div class="search_course fl">
       <%= form_tag(search_member_course_path,:id => "course_member_search_form", :method => :get, :class => "search_form_course",:remote => true) do %>
           <!-- , :onkeyup => "regexQ('#{l(:label_search_conditions_not_null)}');" -->
-          <%= text_field_tag 'name', params[:name], :placeholder => "昵称、学号、姓名搜索", :class => "search_text fl" %>
+          <%= text_field_tag 'name', params[:name], :placeholder => "登录名、学号、姓名搜索", :class => "search_text fl" %>
           <a href="javascript:void(0)" onclick="submitMemberSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white ml10" >
             <%= l(:label_search)%>
           </a>

app/views/homework_attach/_homeworks_list.html.erb

@@ -20,7 +20,7 @@
         <%= link_to l(:label_export_excel), get_batch_homeworks_homework_attach_index_path(:bid_id => @bid.id,:format => 'xls'),:class=>'xls' if is_batch_homeworks%>
         <%= link_to l(:label_export_excel), get_not_batch_homework_homework_attach_index_path(:bid_id => @bid.id,:format => 'xls'),:class=>'xls' if not_batch_homework%>
         <%= link_to l(:label_export_excel), get_homeworks_homework_attach_index_path(:bid_id => @bid.id,:format => 'xls'),:class=>'xls' if is_all_homeworks%>
-        <input type="text" id="homework_member_search" placeholder="昵称、学号、姓名搜索" class="min_search ml10" value="<%= @search_name%>" >
+        <input type="text" id="homework_member_search" placeholder="登录名、学号、姓名搜索" class="min_search ml10" value="<%= @search_name%>" >
         <a href="javascript:void(0)" class="member_search" onclick="search_homework_member('<%= url%>');">搜索</a>
       </span>
       <span class="fr">

app/views/issues/add_journal.js.erb

@@ -1,7 +1,6 @@
 <% if @issue_id %> //issue详情中回复
     $("#reply_div_<%= @issue_id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => Issue.find( @issue_id),:replies_all_i=>0}) %>");
     $("#div_issue_attachment_<%=@issue.id %>").html("<%= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => Issue.find( @issue_id)}) %>");
-//    $("#div_user_issue_detail_<%#=@issue.id %>").html("<%#= escape_javascript(render :partial => 'users/project_issue_detail', :locals => {:issue => Issue.find( @issue_id), :activity => Issue.find( @issue_id)}) %>");
     $("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/edit') %>')
     sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
     issue_desc_editor = KindEditor.create('#issue_description',
@@ -18,11 +17,10 @@
             "uploadJson":"/kindeditor/upload",
             "fileManagerJson":"/kindeditor/filemanager"});
 //    $("#issue_test_<%#= @issue.id %>").html("<%#= escape_javascript(render :partial => 'issues/edit', :locals => {:issue => Issue.find( @issue_id)}) %>");
-
     $(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue_id).journals.count %>)')
     sd_create_editor_from_data(<%= @issue.id %>, null, "100%");
 <%else%>
-    $("#user_activity_<%= @user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
+    $("#div_user_issue_reply_<%=@user_activity_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
    init_activity_KindEditor_data(<%= @user_activity_id %>,"","87%", 'UserActivity');
    // sd_create_editor_from_data(<%#= @issue.id%>, null, "100%");
 <%end %>

app/views/organizations/setting.html.erb

@@ -86,7 +86,7 @@
           <div class="orgMemberAdd">
             <p class="fontBlue fb mb5">添加成员</p>
             <%= form_tag url_for(:controller => 'org_member',:action => 'create',:org=>@organization),:id=>'org_member_add_form',:remote=>true do |f|%>
-                <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、昵称搜索" class="orgAddSearch mb20" />
+                <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
                 <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript org_member_autocomplete_org_member_index_path(:org=>@organization, :format => 'js') }')" %>
                 <div id="principals_for_new_member">
                   <%= find_user_not_in_current_org_by_name(@project) %>

app/views/student_work/_student_work_attachment_form.html.erb

@@ -3,7 +3,7 @@
   </span>
   <div class="cl"></div>
   <span class="add_attachment" style="font-weight:normal;">
-    <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file#{work.id}').click();",:onmouseover => 'this.focus()',:class => 'sub_btn mb0' %>
+    <%= button_tag "上传附件", :type=>"button", :onclick=>"$('#_file#{work.id}').click();",:onmouseover => 'this.focus()',:class => 'sub_btn mb0' %>
     <%= file_field_tag 'attachments[dummy][file]',
                        :id => "_file#{work.id}",
                        :class => 'file_selector',

app/views/users/_project_issue.html.erb

@@ -65,93 +65,7 @@
     </div>
     <div class="cl"></div>
   </div>
-  <% count = activity.journals.count %>
-  <div class="homepagePostReply">
-    <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复
-        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
-        <span id="praise_count_<%=user_activity_id %>">
-          <% if activity.author == User.current %>
-            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
-          <% else %>
-            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
-          <% end %>
-        </span>
-      </div>
-      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
-      <% if count > 3 %>
-          <div class="homepagePostReplyBannerMore">
-            <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-              展开更多
-            </a>
-          </div>
-      <% end %>
-    </div>
-
-    <% replies_all_i = 0 %>
-    <% if count > 0 %>
-        <div class="" id="reply_div_<%= user_activity_id %>">
-          <ul>
-            <% activity.journals.reorder("created_on desc").each do |reply| %>
-                <script type="text/javascript">
-                    $(function(){
-                        showNormalImage('reply_content_<%= reply.id %>');
-                    });
-                </script>
-                <% replies_all_i=replies_all_i + 1 %>
-                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
-                  <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
-                  </div>
-                  <div class="homepagePostReplyDes">
-                    <div class="homepagePostReplyPublisher mt-4">
-                      <% if reply.try(:user).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                      <% else %>
-                          <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                      <% end %>
-                      <%= format_time(reply.created_on) %>
-                      <span id="reply_praise_count_<%=reply.id %>">
-                          <% if reply.user == User.current %>
-                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
-                          <% else %>
-                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
-                          <% end %>
-                      </span>
-                    </div>
-                    <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-                      <% if reply.details.any? %>
-                          <% details_to_strings(reply.details).each do |string| %>
-                              <p><%= string %></p>
-                          <% end %>
-                      <% end %>
-                      <P><%= reply.notes.html_safe %></P>
-                    </div>
-                  </div>
-                  <div class="cl"></div>
-                </li>
-            <% end %>
-          </ul>
-        </div>
-    <% end %>
-
-    <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 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="display:none;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 id="div_user_issue_reply_<%=user_activity_id%>">
+    <%= render :partial => 'users/project_issue_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id} %>
   </div>
 </div>

app/views/users/_project_issue_reply.html.erb

@@ -0,0 +1,89 @@
+<% count = activity.journals.count %>
+<div class="homepagePostReply">
+  <div class="homepagePostReplyBanner">
+    <div class="homepagePostReplyBannerCount">回复
+      <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+          <% if activity.author == User.current %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+          <% end %>
+        </span>
+    </div>
+    <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
+    <% if count > 3 %>
+        <div class="homepagePostReplyBannerMore">
+          <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
+            展开更多
+          </a>
+        </div>
+    <% end %>
+  </div>
+
+  <% replies_all_i = 0 %>
+  <% if count > 0 %>
+      <div class="" id="reply_div_<%= user_activity_id %>">
+        <ul>
+          <% activity.journals.reorder("created_on desc").each do |reply| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_content_<%= reply.id %>');
+                  });
+              </script>
+              <% replies_all_i=replies_all_i + 1 %>
+              <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
+                <div class="homepagePostReplyPortrait">
+                  <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <div class="homepagePostReplyPublisher mt-4">
+                    <% if reply.try(:user).try(:realname) == ' ' %>
+                        <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                    <% else %>
+                        <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                    <% end %>
+                    <%= format_time(reply.created_on) %>
+                    <span id="reply_praise_count_<%=reply.id %>">
+                          <% if reply.user == User.current %>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+                          <% end %>
+                      </span>
+                  </div>
+                  <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
+                    <% if reply.details.any? %>
+                        <% details_to_strings(reply.details).each do |string| %>
+                            <p><%= string %></p>
+                        <% end %>
+                    <% end %>
+                    <P><%= reply.notes.html_safe %></P>
+                  </div>
+                </div>
+                <div class="cl"></div>
+              </li>
+          <% end %>
+        </ul>
+      </div>
+  <% end %>
+
+  <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 mb10">
+      <div nhname='new_message_<%= user_activity_id %>' style="display:none;">
+        <%= form_for('new_form',:url =>  add_journal_issue_path(activity.id, :user_activity_id => user_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="display:none;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>

app/views/welcome/_search_project.html.erb

@@ -91,7 +91,7 @@ form #search_by
   {
       if($("#search_type").val() == "users")
       {
-          $("#q").attr('placeholder','昵称/姓名/邮箱');
+          $("#q").attr('placeholder','登录名/姓名/邮箱');
 //          $("#search_by").show();
       }
       else

config/locales/navigatiors/zh.yml

@@ -63,7 +63,7 @@ zh:
         course: 课程
         user: 用户
         userinfo:
-          nickname: 昵称
+          nickname: 登录名
           showname: 姓名
           email: 邮箱  
 

config/locales/projects/zh.yml

@@ -369,7 +369,7 @@ zh:
   label_input_email: 请输入邮箱地址
   
   label_invite_trustie_user: "邀请Trustie注册用户" 
-  label_invite_trustie_user_tips: "支持姓名、邮箱、昵称搜索！"
+  label_invite_trustie_user_tips: "支持姓名、邮箱、登录名搜索！"
   label_user_role_null: 用户和角色不能留空！
   label_invite_project: 邀请您加入项目
   label_mail_invite_success: 您已成功加入项目！

config/locales/zh.yml

@@ -1855,7 +1855,7 @@ zh:
 
   excel_user_id: 学生id
   excel_user_name: 用户名
-  excel_nickname: 昵称
+  excel_nickname: 登录名
   excel_student_id: 学号
   excel_mail: 电子邮箱
   excel_homework_name: 作品名