jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化页面代码

This commit is contained in:
sw 2014-10-23 16:12:01 +08:00
parent fb9d3921e6
commit df937e89d8
1 changed files with 51 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
app/views/activities/index.html.erb
View File

@ -10,24 +10,46 @@
<div> <div>
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%> <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
<div class="issue-note"> <div class="issue-note">
<table width="660px" border="0" align="center"> <table width="660px" border="0" align="center">
<tr> <tr>
<td colspan="2" valign="top" width="50" ><img src="/images/new/user.jpg" width="40" height="40"/></td> <td colspan="2" valign="top" width="50" >
<td><table width="580px" border="0"> <img src="/images/new/user.jpg" width="40" height="40"/>
<tr> </td>
<td colspan="2" valign="top"><strong> <%= h(e.project) if @project.nil? || @project != e.project %></strong> <td>
<span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title(e.event_title), e.event_url %></td> <table width="580px" border="0">
</tr> <tr>
<tr> <td colspan="2" valign="top">
<td colspan="2" width="580px" ><p class="font_description"><%= format_activity_description(e.event_description) %></p></td> <strong>
</tr> <%= h(e.project) if @project.nil? || @project != e.project %>
<tr> </strong>
<td align="left"><a class="font_lighter"><%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></a></td> <span class="font_lighter">
<td width="200" align="center" class="a"><a class="font_lighter"></a><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></td> <%= l(:label_new_activity) %>
</tr> </span>
</table></td> <%= link_to format_activity_title(e.event_title), e.event_url %>
</tr> </td>
</table> </tr>
<tr>
<td colspan="2" width="580px" >
<p class="font_description">
<%= format_activity_description(e.event_description) %>
</p>
</td>
</tr>
<tr>
<td align="left">
<a class="font_lighter">
<%= format_activity_day(day) %>
<%= format_time(e.event_datetime, false) %>
</a>
</td>
<td width="200" align="center" class="a">
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
</td>
</tr>
</table>
</td>
</tr>
</table>
</div> </div>
<% end -%> <% end -%>
</div> </div>
@ -52,11 +74,11 @@
:title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1))) unless @date_to >= Date.today %> :title => l(:label_date_from_to, :start => format_date(@date_to), :end => format_date(@date_to + @days - 1))) unless @date_to >= Date.today %>
</div> </div>
<% other_formats_links do |f| %> <% other_formats_links do |f| %>
<%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %> <%= f.link_to 'Atom', :url => params.merge(:from => nil, :key => User.current.rss_key) %>
<% end %> <% end %>
<% content_for :header_tags do %> <% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %> <%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :from => nil, :key => User.current.rss_key)) %>
<% end %> <% end %>
<% content_for :sidebar do %> <% content_for :sidebar do %>
@ -64,15 +86,20 @@
<h3><%= l(:label_activity) %></h3> <h3><%= l(:label_activity) %></h3>
<p> <p>
<% @activity.event_types.each do |t| %> <% @activity.event_types.each do |t| %>
<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
<label for="show_<%= t%>"><%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%></label> <label for="show_<%= t%>">
<br /> <%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id], :from => params[:from]})%>
</label>
<br />
<% end %> <% end %>
</p> </p>
<% if @project && @project.descendants.active.any? %> <% if @project && @project.descendants.active.any? %>
<%= hidden_field_tag 'with_subprojects', 0 %> <%= hidden_field_tag 'with_subprojects', 0 %>
<p> <p>
<label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%= l(:label_subproject_plural)%></label> <label>
<%= check_box_tag 'with_subprojects', 1, @with_subprojects %>
<%= l(:label_subproject_plural)%>
</label>
</p> </p>
<% end %> <% end %>
<%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %> <%= hidden_field_tag('user_id', params[:user_id]) unless params[:user_id].blank? %>