|
|
@ -18,7 +18,7 @@
|
|
|
|
<td colspan="2" valign="top">
|
|
|
|
<td colspan="2" valign="top">
|
|
|
|
<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="font_lighter">
|
|
|
|
<span class="font_lighter">
|
|
|
|
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
|
|
|
|
<%= link_to_user(e.event_author,@canShowRealName) if e.respond_to?(:event_author) %>
|
|
|
|
<%= l(:label_new_activity) %> </span>
|
|
|
|
<%= l(:label_new_activity) %> </span>
|
|
|
|
|
|
|
|
|
|
|
|
<%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
|
|
|
|
<%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
|
|
|
@ -46,6 +46,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
<!-- Added by Longjun 在最后一页显示创建信息 -->
|
|
|
|
<!-- Added by Longjun 在最后一页显示创建信息 -->
|
|
|
|
<% if format_date(day) == format_date(@date_to - @days) %>
|
|
|
|
<% if format_date(day) == format_date(@date_to - @days) %>
|
|
|
|
|
|
|
|
<h1>Test</h1>
|
|
|
|
<div >
|
|
|
|
<div >
|
|
|
|
<table width="660">
|
|
|
|
<table width="660">
|
|
|
|
<tr>
|
|
|
|
<tr>
|
|
|
@ -80,7 +81,16 @@
|
|
|
|
<td colspan="2">
|
|
|
|
<td colspan="2">
|
|
|
|
<table width="580">
|
|
|
|
<table width="580">
|
|
|
|
<tr>
|
|
|
|
<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>
|
|
|
|
<td >
|
|
|
|
|
|
|
|
<%
|
|
|
|
|
|
|
|
#判断是否显示真名
|
|
|
|
|
|
|
|
if @canShowRealName
|
|
|
|
|
|
|
|
%>
|
|
|
|
|
|
|
|
<%= link_to (h @user.try(:realname)), user_path(@user) if @user %>
|
|
|
|
|
|
|
|
<% else %>
|
|
|
|
|
|
|
|
<%= link_to (h @user.try(:name)), user_path(@user) if @user %>
|
|
|
|
|
|
|
|
<% end %>
|
|
|
|
|
|
|
|
<%= l(:label_user_create_project) %> <%= link_to @project.name %><strong> !</strong></td>
|
|
|
|
</tr>
|
|
|
|
</tr>
|
|
|
|
<tr>
|
|
|
|
<tr>
|
|
|
|
<td class="font_lighter" style="float: right"><%= l :label_update_time %>: <%= format_time(@project.created_on) %>
|
|
|
|
<td class="font_lighter" style="float: right"><%= l :label_update_time %>: <%= format_time(@project.created_on) %>
|
|
|
|