界面优化
This commit is contained in:
parent
5c0b1f3a47
commit
52ddee2b2f
|
|
@ -19,7 +19,9 @@
|
||||||
<strong> <%= h(e.event_title) if @course.nil? || (e.course != nil && @course.id != e.course.id) %></strong>
|
<strong> <%= h(e.event_title) if @course.nil? || (e.course != nil && @course.id != e.course.id) %></strong>
|
||||||
<span class="font_lighter">
|
<span class="font_lighter">
|
||||||
<% if @canShowRealName %>
|
<% if @canShowRealName %>
|
||||||
<%= 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) %>)
|
<%= 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) %>
|
||||||
|
)
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
|
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
@ -37,12 +39,17 @@
|
||||||
</p></td>
|
</p></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td align="left"><span class="font_lighter"> <%= l :label_activity_time %>： <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span></td>
|
<td align="left"><span class="font_lighter"> <%= l :label_activity_time %>
|
||||||
|
： <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span>
|
||||||
|
</td>
|
||||||
<% if e.event_type == "issue" %>
|
<% if e.event_type == "issue" %>
|
||||||
<td align="right"><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></td>
|
<td align="right">
|
||||||
|
<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>
|
||||||
|
</td>
|
||||||
<% end %>
|
<% end %>
|
||||||
</tr>
|
</tr>
|
||||||
</table></td>
|
</table>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -50,24 +57,6 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</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 @course.name %><strong> !</strong></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="font_lighter" style="float: right"><%= l :label_update_time %>: <%= format_time(@course.created_at) %>
|
|
||||||
</table></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<% end %>
|
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -78,7 +67,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<% else %>
|
<% end %>
|
||||||
<div class="font_description">
|
<div class="font_description">
|
||||||
<table width="660">
|
<table width="660">
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -91,18 +80,22 @@
|
||||||
#判断是否显示真名
|
#判断是否显示真名
|
||||||
if @canShowRealName
|
if @canShowRealName
|
||||||
%>
|
%>
|
||||||
<%= link_to (h @user.try(:name)), user_path(@user) if @user %>(<%= link_to (h @user.try(:realname)), user_path(@user) if @user %>)
|
<%= link_to (h @user.try(:name)), user_path(@user) if @user %>
|
||||||
|
(<%= link_to (h @user.try(:realname)), user_path(@user) if @user %>)
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= link_to (h @user.try(:name)), user_path(@user) if @user %>
|
<%= link_to (h @user.try(:name)), user_path(@user) if @user %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= l(:label_user_create_project) %> <%= link_to @course.name %><strong> !</strong></td>
|
<%= l(:label_user_create_project) %> <%= link_to @course.name %>
|
||||||
|
<strong> !</strong></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="font_lighter" style="float: right"><%= l :label_update_time %>: <%= format_time(@course.created_at) %>
|
<td class="font_lighter" style="float: right"><%= l :label_update_time %>
|
||||||
</table></td>
|
: <%= format_time(@course.created_at) %>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,25 +49,6 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Added by Longjun 在最后一页显示创建信息 -->
|
|
||||||
<% if format_date(day) == format_date(@date_to - @days) %>
|
|
||||||
<h1>Test</h1>
|
|
||||||
<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 -%>
|
<% end -%>
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -78,7 +59,8 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<% else %>
|
<%end%>
|
||||||
|
|
||||||
<div class="font_description">
|
<div class="font_description">
|
||||||
<table width="660">
|
<table width="660">
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -103,6 +85,6 @@
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue