From 7f249d29f41d0a36bcbd4956b7c6f3f0a77eb82d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 5 Mar 2015 08:45:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=95=B4=E9=A1=B5=E9=9D=A2=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/show.html.erb | 63 ++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 7a06c57cd..84b3768a2 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,7 +1,7 @@
 <% if @events_by_day.size >0 %>
     <div class="content-title-top-avtive">
       <p class="subtitle">
-        <% # 暂时隐藏时间的显示%>
+        <!-- # 暂时隐藏时间的显示% -->
         <%#= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
       </p>
 
@@ -12,7 +12,9 @@
                   <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
                 </div>
                 <div class="activity-content" style="padding:5px 5px 5px 70px;">
-                  <strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong>
+                  <strong>
+                    <%= h(e.project) if @project.nil? || @project.id != e.project.id %>
+                  </strong>
                     <span class="activity-title font_lighter">
                       <% if @canShowRealName %>
                       <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
@@ -30,10 +32,18 @@
                   </div>
                   <div class="activity_status" style="position:relative; padding-top: 3px;">
                     <span class="font_lighter"> <%= l :label_activity_time %>
-                      ：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span>
+                      ：&nbsp;
+                      <%= format_activity_day(day) %>
+                      <%= format_time(e.event_datetime, false) %>
+                    </span>
                     <% if e.event_type == "issue" %>
                         <div class="" style="display:inline-block;position:absolute; right:2%;">
-                          <span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count) %></span>
+                          <span>
+                            <%= link_to l(:label_find_all_comments), issue_path(e) %>
+                          </span>
+                          <span class="font_lighter">
+                            <%= l(:label_comments_count, :count => e.journals.count) %>
+                          </span>
                         </div>
                     <% end %>
                   </div>
@@ -48,21 +58,24 @@
               <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
             </div>
             <div class="activity-content" style="padding:5px 5px 5px 70px;">
-      <span class="activity-title font_lighter">
-              <% if @canShowRealName %>
-                  (<%= link_to_user(@user, @canShowRealName) %>
-            )
-              <% else %>
-                  <%= link_to_user(@user) %>
-              <% end %>
-        <%#= l(:label_new_activity) %>
-      </span>
-              <%= l(:label_user_create_project) %> <%= link_to @project.name %>
+              <span class="activity-title font_lighter">
+                  <% if @canShowRealName %>
+                      (<%= link_to_user(@user, @canShowRealName) %>)
+                  <% else %>
+                      <%= link_to_user(@user) %>
+                  <% end %>
+                  <%#= l(:label_new_activity) %>
+              </span>
+              <%= l(:label_user_create_project) %>
+              <%= link_to @project.name %>
               <strong> !</strong>
               <div class="activity_description info-break" style="font-size: 13px;">
               </div>
               <div class="activity_status" style="position:relative; padding-top: 3px;">
-                <span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span>
+                <span class="font_lighter">
+                  <%= l :label_activity_time %>:
+                  <%= format_time(@project.created_on) %>
+                </span>
               </div>
             </div>
           </div>
@@ -75,20 +88,24 @@
       </div>
       <div class="activity-content" style="padding:5px 5px 5px 70px;">
       <span class="activity-title font_lighter">
-              <% if @canShowRealName %>
-                  (<%= link_to_user(@user, @canShowRealName) %>
-            )
-              <% else %>
-                  <%= link_to_user(@user) %>
-              <% end %>
+          <% if @canShowRealName %>
+              (<%= link_to_user(@user, @canShowRealName) %>)
+          <% else %>
+              <%= link_to_user(@user) %>
+          <% end %>
         <%#= l(:label_new_activity) %>
       </span>
-        <%= l(:label_user_create_project) %> <%= link_to @project.name %>
+        <%= @user.to_s %>
+        <%= l(:label_user_create_project) %>
+        <%= link_to @project.name %>
         <strong> !</strong>
         <div class="activity_description info-break" style="font-size: 13px;">
         </div>
         <div class="activity_status" style="position:relative; padding-top: 3px;">
-          <span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span>
+          <span class="font_lighter">
+            <%= l :label_activity_time %>:
+            <%= format_time(@project.created_on) %>
+          </span>
         </div>
       </div>
     </div>