qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修整页面代码

This commit is contained in:
sw 2015-03-05 08:45:32 +08:00
parent a2d986f70c
commit 7f249d29f4
1 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<% if @events_by_day.size >0 %> <% if @events_by_day.size >0 %>
<div class="content-title-top-avtive"> <div class="content-title-top-avtive">
<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>
@ -12,7 +12,9 @@
<%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %> <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
</div> </div>
<div class="activity-content" style="padding:5px 5px 5px 70px;"> <div class="activity-content" style="padding:5px 5px 5px 70px;">
<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="activity-title font_lighter"> <span class="activity-title font_lighter">
<% if @canShowRealName %> <% if @canShowRealName %>
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
@ -30,10 +32,18 @@
</div> </div>
<div class="activity_status" style="position:relative; padding-top: 3px;"> <div class="activity_status" style="position:relative; padding-top: 3px;">
<span class="font_lighter"> <%= l :label_activity_time %> <span class="font_lighter"> <%= l :label_activity_time %>
：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span> ：&nbsp;
<%= format_activity_day(day) %>
<%= format_time(e.event_datetime, false) %>
</span>
<% if e.event_type == "issue" %> <% if e.event_type == "issue" %>
<div class="" style="display:inline-block;position:absolute; right:2%;"> <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> <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> </div>
<% end %> <% end %>
</div> </div>
@ -48,21 +58,24 @@
<%= image_tag(url_to_avatar(@user), :class => "avatar") %> <%= image_tag(url_to_avatar(@user), :class => "avatar") %>
</div> </div>
<div class="activity-content" style="padding:5px 5px 5px 70px;"> <div class="activity-content" style="padding:5px 5px 5px 70px;">
<span class="activity-title font_lighter"> <span class="activity-title font_lighter">
<% if @canShowRealName %> <% if @canShowRealName %>
(<%= link_to_user(@user, @canShowRealName) %> (<%= link_to_user(@user, @canShowRealName) %>)
) <% else %>
<% else %> <%= link_to_user(@user) %>
<%= link_to_user(@user) %> <% end %>
<% end %> <%#= l(:label_new_activity) %>
<%#= l(:label_new_activity) %> </span>
</span> <%= l(:label_user_create_project) %>
<%= l(:label_user_create_project) %> <%= link_to @project.name %> <%= link_to @project.name %>
<strong> !</strong> <strong> !</strong>
<div class="activity_description info-break" style="font-size: 13px;"> <div class="activity_description info-break" style="font-size: 13px;">
</div> </div>
<div class="activity_status" style="position:relative; padding-top: 3px;"> <div class="activity_status" style="position:relative; padding-top: 3px;">
<span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span> <span class="font_lighter">
<%= l :label_activity_time %>:
<%= format_time(@project.created_on) %>
</span>
</div> </div>
</div> </div>
</div> </div>
@ -75,20 +88,24 @@
</div> </div>
<div class="activity-content" style="padding:5px 5px 5px 70px;"> <div class="activity-content" style="padding:5px 5px 5px 70px;">
<span class="activity-title font_lighter"> <span class="activity-title font_lighter">
<% if @canShowRealName %> <% if @canShowRealName %>
(<%= link_to_user(@user, @canShowRealName) %> (<%= link_to_user(@user, @canShowRealName) %>)
) <% else %>
<% else %> <%= link_to_user(@user) %>
<%= link_to_user(@user) %> <% end %>
<% end %>
<%#= l(:label_new_activity) %> <%#= l(:label_new_activity) %>
</span> </span>
<%= l(:label_user_create_project) %> <%= link_to @project.name %> <%= @user.to_s %>
<%= l(:label_user_create_project) %>
<%= link_to @project.name %>
<strong> !</strong> <strong> !</strong>
<div class="activity_description info-break" style="font-size: 13px;"> <div class="activity_description info-break" style="font-size: 13px;">
</div> </div>
<div class="activity_status" style="position:relative; padding-top: 3px;"> <div class="activity_status" style="position:relative; padding-top: 3px;">
<span class="font_lighter"><%= l :label_activity_time %>: <%= format_time(@project.created_on) %></span> <span class="font_lighter">
<%= l :label_activity_time %>:
<%= format_time(@project.created_on) %>
</span>
</div> </div>
</div> </div>
</div> </div>