p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

最后创建人信息的正确显示（+去掉了乱78糟的table套table） 

div-class内标明activity-title等，内嵌css属性等没有问题再移动出html文件
This commit is contained in:
yanxd 2014-07-05 09:39:58 +08:00
parent fd25f42e61
commit 2fa9a4855c
1 changed files with 62 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
app/views/projects/show.html.erb
View File

@ -1,91 +1,77 @@
<% if @events_by_day.size >0 %> <% if @events_by_day.size >0 %>
<div class="content-title-top-avtive"> <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">
<p class="subtitle"> <%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %> </p>
</p>
<% @events_by_day.keys.sort.reverse.each do |day| %>
<div>
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
<div>
<table class="underline-evreycontent" style="font-size: 14px;">
<tr>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%></td>
<td>
<table width="580px" border="0">
<tr>
<td colspan="2" valign="top">
<strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong>
<span class="font_lighter">
<% 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) %>)
<% else %>
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
<% end %>
<%= l(:label_new_activity) %> </span> <% @events_by_day.keys.sort.reverse.each do |day| %>
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
<%= 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 %> <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
</td> <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
</tr> <%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%>
<tr> </div>
<td colspan="2" width="580px" > <div class="activity-content" style="padding:5px 5px 5px 70px;">
<p class="info-break"> <strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong>
<%= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/,' '), length: 30, omission:'...')) %> <span class="activity-title font_lighter">
</p></td> <% if @canShowRealName %>
</tr> <%= 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) %>)
<tr> <% else %>
<td align="left"><span class="font_lighter"> <%= l :label_activity_time %>：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span></td> <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
<% if e.event_type == "issue" %> <% end %>
<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 %>
</tr>
</table></td>
</tr>
</table>
</div>
<% end %>
</div>
<% end -%> <%= 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 %>
<div class="activity_description info-break" style="font-size: 13px;">
</div> <%= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/,' '), length: 30, omission:'...')) %>
<%end%> </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>
<% 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>
</div>
<% end %>
</div>
</div>
</div>
<div class="font_description"> <% end %>
<table width="660"> <% end -%>
<tr> <% if(@events_pages.page == @events_pages.last_page) %>
<td><%= image_tag(url_to_avatar(@user), :class => "avatar") %></td> <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;">
<td colspan="2"> <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
<table width="580"> <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
<tr> </div>
<td > <div class="activity-content" style="padding:5px 5px 5px 70px;">
<% <span class="activity-title font_lighter">
#判断是否显示真名 <% 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 %>)
%> <% else %>
<%= 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 %>
<% else %> <% end %>
<%= link_to (h @user.try(:name)), user_path(@user) if @user %> <%#= l(:label_new_activity) %>
<% end %> </span>
<%= l(:label_user_create_project) %> <%= link_to @project.name %><strong> !</strong></td> <%= l(:label_user_create_project) %> <%= link_to @project.name %><strong> !</strong>
</tr> <div class="activity_description info-break" style="font-size: 13px;">
<tr> </div>
<td class="font_lighter" style="float: right"><%= l :label_update_time %>: <%= format_time(@project.created_on) %> <div class="activity_status" style="position:relative; padding-top: 3px;">
</table></td> <span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span>
</tr> </div>
</table> </div>
</div>
<% end %>
</div> </div>
<%end%>
<div class="pagination"> <div class="pagination">
<ul> <ul>
<%= pagination_links_full @events_pages%> <%= pagination_links_full @events_pages%>
<% #binding.pry %>
</ul> </ul>
</div> </div>