Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/controllers/projects_controller.rb

@@ -320,7 +320,8 @@ class ProjectsController < ApplicationController
     @subprojects = @project.children.visible.all
     @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").all
     @trackers = @project.rolled_up_trackers
-
+	@user = User.find_by_id(ProjectInfo.find_by_project_id(@project.id).user_id)
+	
     cond = @project.project_condition(Setting.display_subprojects_issues?)
 
     @open_issues_by_tracker = Issue.visible.open.where(cond).count(:group => :tracker)

app/views/layouts/base_projects.html.erb

@@ -83,7 +83,7 @@
 											<%= textilizable @project.description %>
 										</div>
 										<div class="created_on_project">
-											<strong style="color: #068d9c"><%= l(:label_create_time) %>：</strong><%= @project.created_on %>
+											<strong style="color: #068d9c"><%= l(:label_create_time) %>：</strong><%= format_time(@project.created_on) %>
 										</div>
 									</div>
 									<div class="user_underline"></div>

app/views/projects/show.html.erb

@@ -42,5 +42,9 @@
 </div> 
 </div>
 <% else %>
-<p class="font_description"><%= l(:label_project_no_activity) %></p>
+<p class="font_description">
+	<table width="660"><tr><td><%=link_to image_tag(url_to_avatar(@user), :class => "avatar"), user_path(@user)%></td><td colspan="2">
+	<table width="580">
+	<tr><td ><%=link_to @user.login.to_s,user_path(@user) %> <%= l(:label_user_create_project) %> <%=link_to @project.name %><strong> !</strong></td></tr>
+	<tr><td class="font_lighter" style="float: right"><%= format_time(@project.created_on) %></table></td></tr></table></p>
 <% end %>

config/locales/en.yml

@@ -1344,3 +1344,4 @@ en:
   label_in_issues: in the issue：
   label_in_bids: in the call：
   label_in_users: in the user：
+  label_user_create_project: has created 

config/locales/zh.yml

@@ -1355,4 +1355,5 @@ zh:
   label_projects_feedback_respond: 回复
   label_projects_feedback_respond_success: 回复成功
   button_projects_feedback_respond: 回复
-  label_projects_feedback_respond_content: 请输入回复内容
+  label_projects_feedback_respond_content: 请输入回复内容
+  label_user_create_project: 创建了