Merge branch 'dev-homepage-revision' into dev_new_head

app/views/homes/_floating_tabs.html.erb

@@ -1,7 +1,7 @@
 <ul>
   <li class="active">
     <div>
-      <p class="f18 floatingName"><a href="https://www.trustie.net/" target="_blank"class="colorWhite">TrustieForge</a></p>
+      <p class="f18 floatingName"><a href="<%= current_user.logged? ? user_path(current_user) : host_with_protocol %>" target="_blank"class="colorWhite">TrustieForge</a></p>
       <p class="f16 mb20">协同开发平台</p>
       <p class="f12 mb30 break_full_word floatingContent">开源创作与软件生产相结合，支持大规模群体开展软件协同创新活动。</p>
     </div>

app/views/homes/_trustie_forge.html.erb

@@ -1,3 +1,4 @@
+<% url = current_user.logged? ? user_path(current_user) : host_with_protocol %>
 <div class="homepage_introduce_trustieForge homepage_introduce_content_item active">
   <div class="cartoonTitle mt30 mb40">
     <p class="f34 mb20">协同开发平台</p>
@@ -8,8 +9,7 @@
       <div>
         <p class="f20 color-grey3 mb20 trustieTabName">项目管理</p>
         <p class="f16 fontGrey4">项目进程管理应用于研发管理、任务分配、目标跟踪等让项目管理流程高效完成。</p>
-        <a href="<%= host_with_protocol %>" target="_blank" class="trustieMore">查看详情</a>
-
+        <a href="<%= url %>" target="_blank" class="trustieMore">查看详情</a>
       </div>
       <div class="mt20">
         <i class="iconfont icon-projectx" style="font-size: 80px"></i>
@@ -19,7 +19,7 @@
       <div>
         <p class="f20 color-grey3 mb20 trustieTabName">代码托管</p>
         <p class="f16 fontGrey4">项目进程管理应用于研发管理、任务分配、目标跟踪等让项目管理流程高效完成。</p>
-        <a href="<%= host_with_protocol %>" target="_blank" class="trustieMore">查看详情</a>
+        <a href="<%= url %>" target="_blank" class="trustieMore">查看详情</a>
       </div>
       <div>
         <i class="iconfont icon-hostingx2"></i>
@@ -29,7 +29,7 @@
       <div>
         <p class="f20 color-grey3 mb20 trustieTabName">质量检测</p>
         <p class="f16 fontGrey4">基于Sonar的代码静态分析工具，及时发现代码中的潜在隐患，全面提升软件开发质量。</p>
-        <a href="<%= host_with_protocol %>" target="_blank" class="trustieMore">查看详情</a>
+        <a href="<%= url %>" target="_blank" class="trustieMore">查看详情</a>
       </div>
       <div>
         <i class="iconfont icon-detectionx"></i>
@@ -39,7 +39,7 @@
       <div>
         <p class="f20 color-grey3 mb20 trustieTabName">交流社区</p>
         <p class="f16 fontGrey4">为IT开发者营造活跃、开放的社区环境，提供即时通讯、资源分享、学习交流等社交化服务。</p>
-        <a href="<%= host_with_protocol %>" target="_blank" class="trustieMore">查看详情</a>
+        <a href="<%= url %>" target="_blank" class="trustieMore">查看详情</a>
       </div>
       <div>
         <i class="iconfont icon-communityx"></i>

app/views/issues/_issue_replies.html.erb

@@ -36,7 +36,7 @@
                                   :title => l(:button_reply)) %>
                       <span id="reply_iconup_<%= comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
                     </span>
-                        <%= link_to(
+                        <%#= link_to(
                               l(:button_delete),
                               {:controller => 'issues',:action => 'delete_journal', :id => issue.id, :journal_id=>comment.id},
                               :method => :get,