From 9ce39d2f4a41ce9d938fbbcc20e3d33e4cc56773 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 25 Mar 2016 15:46:40 +0800
Subject: [PATCH] =?UTF-8?q?Issue=E6=A8=A1=E5=9D=97=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb    | 30 -------------------
 app/views/layouts/base_projects.html.erb      |  2 +-
 app/views/users/_project_issue.html.erb       |  7 ++---
 app/views/users/_project_issue_reply.html.erb |  4 +--
 4 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 315b1d300..c04081128 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -24,19 +24,6 @@
     </ul>
   </div>
   <script>
-      <%# type = type%>
-//      $(function (){
-//          if('<%#= type %>' != null && '<%#= type %>' == 'courses' ){
-//              $('input:radio[value="courses"]').attr('checked','checked');
-//          }
-//          if('<%#= type %>' != null && '<%#= type %>' == 'projects' ){
-//              $('input:radio[value="projects"]').attr('checked','checked');
-//          }
-//          if('<%#= type %>' != null && '<%#= type %>' == 'users' ){
-//              $('input:radio[value="users"]').attr('checked','checked');
-//          }
-//      });
-
       $(function(){
           $("#navHomepageSearchInput").keypress(function(e){
               var name = $.trim($('#navHomepageSearchInput').val());
@@ -65,23 +52,6 @@
       <input type="text" style="display: none;"/>
       <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
     <% end %>
-    <!--<div class="navSearchTypeBox" id="navHomepageSearchType">-->
-      <!--<div class="fl mr15 mt8">-->
-        <!--<input type="radio"  value="courses" name="search_type" checked/>-->
-        <!--课程-->
-      <!--</div>-->
-      <!--<div class="fl mr15 mt8">-->
-        <!--<input type="radio"  value="projects" name="search_type" />-->
-        <!--项目-->
-      <!--</div>-->
-      <!--<div class="fl mr15 mt8">-->
-        <!--<input type="radio" value="users" name="search_type"  />-->
-        <!--用户-->
-      <!--</div>-->
-      <!--<div id="navSearchAlert" class="fr mr10">-->
-        <!--<span class="c_red">请选择搜索类型</span>-->
-      <!--</div>-->
-    <!--</div>-->
   </div>
 
   <div class="navHomepageProfile" id="navHomepageProfile">
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 3af8f9212..4ce35802d 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -29,7 +29,7 @@
         showMathMenuMSIE: false,
           tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
         });
-      </script>
+  </script>
 
 </head>
 <!--add by huang-->
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 5d472497d..008f08706 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -73,10 +73,9 @@
         </div>
         <div class="cl"></div>
       </div>
-      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
-
-      <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
-      <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id => user_activity_id, :content => activity.description} %>
+      <div id="intro_content_show_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
+      <div id="intro_content_hide_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
       <div class="cl"></div>
       <%# 局部刷新：修改xissue属性 %>
       <% if User.current.member_of?(activity.project) %>
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index 16d681dc9..5020f67d3 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -25,7 +25,7 @@
   <% if count > 0 %>
       <div class="" id="reply_div_<%= user_activity_id %>">
         <ul>
-          <% activity.journals.reorder("created_on desc").each do |reply| %>
+          <% activity.journals.includes(:user, :details).reorder("created_on desc").each do |reply| %>
               <script type="text/javascript">
                   $(function(){
                       showNormalImage('reply_content_<%= reply.id %>');
@@ -44,7 +44,7 @@
                         <%= 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 %>">
+                    <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 %>