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

修改了作业界面显示 

修改了发布作业的时候在个人动态里面显示做（之前显示需求）
This commit is contained in:
huangjingquan 2013-10-10 22:36:35 +08:00
parent 962842d841
commit 0a5013edd1
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/layouts/base_homework.html.erb
View File

@ -34,6 +34,9 @@
<div class="spaceleft">
<div>
<table style="padding-top: 20px ;width: 232px ; height: 80px;"> <!-- modified by bai -->
<tr>
<td class="info_font" style=" word-wrap: break-word; word-break: break-all "><%= "课程作业" %></td>
</tr>
<tr>
<td class="info_font" style=" word-wrap: break-word; word-break: break-all; color: #ed8924 "><%= h @bid.name %></td>
</tr>
@ -51,12 +54,13 @@
<!-- info -->
<div class="inf_user_image">
<table>
<tr>
<td style="text-align: justify ; text-justify: inter-ideograph; width: 180px"><%= l(:label_teacher_homework) %> : <%= link_to(@user.lastname+@user.firstname, user_path(@user)) %></td>
</tr>
<tr>
<td><%= l(:label_course_homework) %> : <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %></td>
</tr>
<tr>
<td style="text-align: justify ; text-justify: inter-ideograph; width: 180px"><%= l(:label_teacher_homework) %> : <%= link_to(@user.lastname+@user.firstname, user_path(@user)) %></td>
</tr>
<tr>
<td><%= l(:label_limit_time) %>： <%= @bid.deadline %></td>
</tr>

8
app/views/users/show.html.erb
View File

@ -16,11 +16,19 @@
<% case e.act_type %>
<% when 'Bid' %>
<tr>
<% if act.reward_type ==3 %>
<% if e.user == User.current%>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_i_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
<% else %>
<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;<%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
<% end %>
<% else %>
<% if e.user == User.current%>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_i_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
<% else %>
<td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;<%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
<% end %>
<% end %>
</tr>
<tr>
<td colspan="2" width="580" >

1
config/locales/zh.yml
View File

@ -1434,6 +1434,7 @@ zh:
label_project_tool_response: 用户反馈
label_tags_search_result: 搜索结果
label_active_call: 需求
label_active_homework: 作业
label_tags_call: 需求
label_user_extensions: 其他信息
label_boy: 男