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

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

@ -45,7 +45,7 @@
<% (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>
@ -101,9 +101,10 @@
<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>
@ -121,7 +122,7 @@
</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>
@ -170,7 +171,7 @@
<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>
@ -285,7 +286,7 @@
<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>
@ -302,7 +303,7 @@
: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) %>
@ -347,7 +348,7 @@
<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>
@ -431,7 +432,7 @@
<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>
@ -444,7 +445,7 @@
</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) %>
@ -533,7 +534,7 @@
<% 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)) %>

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