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

动态中显示更新项目缺陷样式异常

Browse Source
dev_repository_hjq
whimlex 10 years ago
parent 05712c4c06
commit ab93d19b56
2 changed files with 421 additions and 420 deletions
Show Stats Download Patch File Download Diff File

839
app/views/users/show.html.erb
Unescape View File

@ -45,546 +45,547 @@
<% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %> <% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %>
<% act = e.act %> <% act = e.act %>
<% unless act.nil? %> <% unless act.nil? %>
<% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest'%> <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest' %>
<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;"> <table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
<tr> <tr>
<td colspan="2" valign="top" width="50"> <td colspan="2" valign="top" width="50">
<%= image_tag(url_to_avatar(e.user), :class => "avatar") %> <%= image_tag(url_to_avatar(e.user), :class => "avatar") %>
</td> </td>
<td> <td>
<table width="580" border="0" class="info-break"> <table width="580" border="0" class="info-break">
<% case e.act_type %> <% case e.act_type %>
<% when 'JournalsForMessage' %> <% when 'JournalsForMessage' %>
<tr> <tr>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<% if User.current.login == e.user.try(:login) %> <% if User.current.login == e.user.try(:login) %>
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<% if User.current.language == "zh" %> <% if User.current.language == "zh" %>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_have_feedback) %> <%= l(:label_i_have_feedback) %>
<%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
<%= l(:label_of_feedback) + l(:label_layouts_feedback) %> <%= l(:label_of_feedback) + l(:label_layouts_feedback) %>
</span> </span>
<% else %> <% else %>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_have_feedback) %> <%= l(:label_i_have_feedback) %>
<%= l(:label_layouts_feedback) + l(:label_of_feedback) %> <%= l(:label_layouts_feedback) + l(:label_of_feedback) %>
<%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
</span> </span>
<% end %> <% end %>
<% else %> <% else %>
<strong> <strong>
<%= link_to("#{e.user.name}", user_path(e.user_id)) %> <%= link_to("#{e.user.name}", user_path(e.user_id)) %>
</strong> </strong>
<% if User.current.language == "zh" %> <% if User.current.language == "zh" %>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_have_feedback) %> <%= l(:label_have_feedback) %>
<%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
<%= l(:label_of_feedback) + l(:label_layouts_feedback) %> <%= l(:label_of_feedback) + l(:label_layouts_feedback) %>
</span> </span>
<% else %> <% else %>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_have_feedback) %> <%= l(:label_have_feedback) %>
<%= l(:label_layouts_feedback) + l(:label_of_feedback) %> <%= l(:label_layouts_feedback) + l(:label_of_feedback) %>
<%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %>
</span> </span>
<% end %> <% end %>
<% end %> <% end %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= textAreailizable act.notes %> <%= textAreailizable act.notes %>
</p> </p>
<div style="display: inline-block; float: right; margin-top: 0px">
<div style="display: inline-block; float: right; margin-top: 0px">
<span> <span>
<% puts 11111111111111%> <% puts 11111111111111 %>
<%= user_jour_feed_back_url e %> <%= user_jour_feed_back_url e %>
</span> </span>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"></div> <div style="display: inline-block; float: right; margin-top: 0px"></div>
</td> </td>
</tr> </tr>
<% when 'Bid' %> <% when 'Bid' %>
<tr> <tr>
<% if act.reward_type == 3 && @show_course == 1%> <% if act.reward_type == 3 && @show_course == 1 %>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
<%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong>&nbsp; </strong>&nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span>&nbsp; </span>&nbsp;
<%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), course_for_bid_path(e.act_id) %>
</td> </td>
<% end %> <% end %>
<% else %> <% else %>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
<%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong>&nbsp; </strong>&nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span>&nbsp; </span>&nbsp;
<%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %>
</td> </td>
<% end %> <% end %>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%=textAreailizable act, :description %> <%= textAreailizable act, :description %>
</p></td> </p></td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<!--<div style="display: inline-block; float: right; margin-top: 0px">--> <!--<div style="display: inline-block; float: right; margin-top: 0px">-->
<!--<span>--> <!--<span>-->
<!--<%#= link_to l(:label_find_all_comments), respond_path(e.act_id) %>--> <!--<%#= link_to l(:label_find_all_comments), respond_path(e.act_id) %>-->
<!--</span>--> <!--</span>-->
<!--<a class="font_lighter">--> <!--<a class="font_lighter">-->
<!--<%#= l(:label_comments_count, :count => e.act.commit) %>--> <!--<%#= l(:label_comments_count, :count => e.act.commit) %>-->
<!--</a>--> <!--</a>-->
<!--</div>--> <!--</div>-->
</td> </td>
</tr> </tr>
<% when 'Journal' %> <% when 'Journal' %>
<tr> <tr>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %>
<%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"),
{:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %>
<%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"),
{:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<% if act.notes.nil? %> <% if act.notes.nil? %>
<% desStr = '' %> <% desStr = '' %>
<% else %> <% else %>
<% desStr= textAreailizable(act, :notes) %> <% desStr= textAreailizable(act, :notes) %>
<% end %> <% end %>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= desStr %> <%= desStr %>
</p> </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"></div> <div style="display: inline-block; float: right; margin-top: 0px"></div>
</td> </td>
</tr> </tr>
<% when 'Changeset' %> <% when 'Changeset' %>
<tr> <tr>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title(act.title), <%= link_to format_activity_title(act.title),
{:controller => 'repositories', {:controller => 'repositories',
:action => 'revision', :action => 'revision',
:id => act.repository.project, :id => act.repository.project,
:repository_id => act.repository.identifier_param, :repository_id => act.repository.identifier_param,
:rev => act.identifier} %> :rev => act.identifier} %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title(act.title), <%= link_to format_activity_title(act.title),
{:controller => 'repositories', {:controller => 'repositories',
:action => 'revision', :action => 'revision',
:id => act.repository.project, :id => act.repository.project,
:repository_id => act.repository.identifier_param, :repository_id => act.repository.identifier_param,
:rev => act.identifier} %> :rev => act.identifier} %>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= textAreailizable act,:long_comments %> <%= textAreailizable act, :long_comments %>
</p> </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= format_time(e.act.committed_on) %> <%= format_time(e.act.committed_on) %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"> <div style="display: inline-block; float: right; margin-top: 0px">
<span><%= link_to l(:label_find_all_comments), <span><%= link_to l(:label_find_all_comments),
{:controller => 'repositories', {:controller => 'repositories',
:action => 'revision', :action => 'revision',
:id => act.repository.project, :id => act.repository.project,
:repository_id => act.repository.identifier_param, :repository_id => act.repository.identifier_param,
:rev => act.identifier} if e.act.count!= 0%> :rev => act.identifier} if e.act.count!= 0 %>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.count) %> <%= l(:label_comments_count, :count => e.act.count) %>
</a> </a>
</div> </div>
</td> </td>
</tr> </tr>
<% when 'Message' %> <% when 'Message' %>
<tr> <tr>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"),
{:controller => 'messages', {:controller => 'messages',
:action => 'show', :action => 'show',
:board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"),
{:controller => 'messages', {:controller => 'messages',
:action => 'show', :action => 'show',
:board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= textAreailizable(act,:content) %> <%= textAreailizable(act, :content) %>
</p> </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"></div> <div style="display: inline-block; float: right; margin-top: 0px"></div>
</td> </td>
</tr> </tr>
<% when 'Principal' %> <% when 'Principal' %>
<tr> <tr>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_user) %> <%= l(:label_new_user) %>
</span> </span>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_user) %> <%= l(:label_new_user) %>
</span> </span>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"></p> <p class="font_description"></p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"></div> <div style="display: inline-block; float: right; margin-top: 0px"></div>
</td> </td>
</tr> </tr>
<% when 'News' %> <% when 'News' %>
<tr> <tr>
<% if e.user == User.current %> <% if e.user == User.current %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= textAreailizable act,:description %> <%= textAreailizable act, :description %>
</p> </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"> <div style="display: inline-block; float: right; margin-top: 0px">
<span> <span>
<%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} if e.act.comments_count!= 0%> <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} if e.act.comments_count!= 0 %>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.comments_count) %> <%= l(:label_comments_count, :count => e.act.comments_count) %>
</a> </a>
</div> </div>
</td> </td>
</tr> </tr>
<% when 'Issue' %> <% when 'Issue' %>
<% if e.user == User.current %> <% if e.user == User.current %>
<tr> <tr>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span>&nbsp; </span>&nbsp;
<%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"),
{:controller => 'issues', {:controller => 'issues',
:action => 'show', :action => 'show',
:id => act.id} %> :id => act.id} %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word"> <td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word">
<%= textAreailizable act, :description %> <%= textAreailizable act, :description %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"> <div style="display: inline-block; float: right; margin-top: 0px">
<span> <span>
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %> <%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.journals.count) %> <%= l(:label_comments_count, :count => e.act.journals.count) %>
</a> </a>
</div> </div>
</td> </td>
</tr> </tr>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong>&nbsp; </strong>&nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span>&nbsp; </span>&nbsp;
<%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"),
{:controller => 'issues', {:controller => 'issues',
:action => 'show', :action => 'show',
:id => act.id} %> :id => act.id} %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word"> <td colspan="2" width="580" style="WORD-BREAK: break-all; WORD-WRAP: break-word">
<%= textAreailizable act, :description %> <%= textAreailizable act, :description %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"> <div style="display: inline-block; float: right; margin-top: 0px">
<span> <span>
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %> <%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.journals.count) %> <%= l(:label_comments_count, :count => e.act.journals.count) %>
</a> </a>
</div> </div>
</td> </td>
</tr> </tr>
<% end %> <% end %>
<% when 'Contest' %> <% when 'Contest' %>
<tr> <tr>
<% if e.user == User.current && @show_contest == 1%> <% if e.user == User.current && @show_contest == 1 %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_i_new_activity) %> <%= l(:label_i_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %>
</td> </td>
<% else %> <% else %>
<td colspan="2" valign="top"> <td colspan="2" valign="top">
<strong> <strong>
<%= link_to(h(e.user), user_path(e.user_id)) %> <%= link_to(h(e.user), user_path(e.user_id)) %>
</strong> </strong>
&nbsp; &nbsp;
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_new_activity) %> <%= l(:label_new_activity) %>
</span> </span>
&nbsp; &nbsp;
<%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %>
</td> </td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" class="upload_img"> <td colspan="2" width="580" class="upload_img">
<p class="font_description"> <p class="font_description">
<%= textAreailizable act, :description %> <%= textAreailizable act, :description %>
</p> </p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"> <div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a">
<span class="font_lighter"> <span class="font_lighter">
<%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %> <%= (l(:label_update_time).to_s << ': ' << format_time(e.act.created_on)).to_s %>
</span> </span>
</div> </div>
</tr> </tr>
<% else %> <% else %>
<% end %><!-- < % #case end %> --> <% end %><!-- < % #case end %> -->
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<% end %> <% end %>
<% end %><!-- < % #unless act.nil? end %> --> <% end %><!-- < % #unless act.nil? end %> -->
<% end %><!-- < % #@activity.each do |e| end%> --> <% end %><!-- < % #@activity.each do |e| end%> -->
</div> </div>
<div class="pagination" style="float:left;"> <div class="pagination" style="float:left;">
<ul> <%= pagination_links_full @activity_pages %> </ul> <ul> <%= pagination_links_full @activity_pages %> </ul>

2
config/locales/users/zh.yml
Unescape View File

@ -118,7 +118,7 @@ zh:
label_goto: "前往»" label_goto: "前往»"
label_activity_project: "项目：" label_activity_project: 项目
label_active_call: 需求 label_active_call: 需求
label_active_homework: 作业 label_active_homework: 作业
# 评论在commons模块下 # 评论在commons模块下

Write Preview
Loading…
Cancel
Save