From 9a580655ab34a8fd04ba4027f43356a530c865f6 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 21 Apr 2014 09:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8project=E7=9A=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9A=84=E6=9C=80=E5=90=8E=E4=B8=80=E9=A1=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/show.html.erb | 57 ++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 3ca41d072..eb66efc73 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,4 +1,4 @@
-
+<% if @events_by_day.size >0 %>
 	<div class="content-title-top-avtive">
 		<!-- <h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3> -->
 		<p class="subtitle">
@@ -40,26 +40,31 @@
 						</tr>
 					</table>
 				</div>
+					
 				<% end %>
 			</div>
+			
+				<!-- Added by Longjun 在最后一页显示创建信息 -->
+				<% if format_date(day) == format_date(@date_to - @days) %>
+						<div >
+							<table width="660">
+								<tr>
+									<td><%= image_tag(url_to_avatar(@user), :class => "avatar") %></td>
+									<td colspan="2">
+									<table width="580">
+										<tr>
+											<td > <%= link_to (h @user.try(:name)), user_path(@user) if @user %> <%= l(:label_user_create_project) %> <%= link_to @project.name %><strong> !</strong></td>
+										</tr>
+										<tr>
+											<td class="font_lighter" style="float: right"><%= l :label_update_time %>: <%= format_time(@project.created_on) %>
+									</table></td>
+								</tr>
+							</table>
+						</div>
+						<% end %>
 			<% end -%>
 			
-			<!--  modified by Long Jun -->
-			<div>
-				<table width="660">
-					<tr>
-						<td><%= image_tag(url_to_avatar(@user), :class => "avatar") %></td>
-						<td colspan="2">
-						<table width="580">
-							<tr>
-								<td > <%= link_to (h @user.try(:name)), user_path(@user) if @user %> <%= l(:label_user_create_project) %> <%= link_to @project.name %><strong> !</strong></td>
-							</tr>
-							<tr>
-								<td class="font_lighter" style="float: right"><%= l :label_update_time %>: <%= format_time(@project.created_on) %>
-						</table></td>
-					</tr>
-				</table>
-			</div>
+			
 			<div class="pagination">
 				<ul>
 					<%= pagination_links_full @events_pages%>
@@ -67,6 +72,22 @@
 			</div>		
 			
 	</div>
-
+<% else %>
+<div class="font_description">
+	<table width="660">
+		<tr>
+			<td><%= image_tag(url_to_avatar(@user), :class => "avatar") %></td>
+			<td colspan="2">
+			<table width="580">
+				<tr>
+					<td > <%= link_to (h @user.try(:name)), user_path(@user) if @user %> <%= l(:label_user_create_project) %> <%= link_to @project.name %><strong> !</strong></td>
+				</tr>
+				<tr>
+					<td class="font_lighter" style="float: right"><%= l :label_update_time %>: <%= format_time(@project.created_on) %>
+			</table></td>
+		</tr>
+	</table>
+</div>
+<% end %>