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

let the homework show under class in homeworkpager

This commit is contained in:
xianbo 2013-10-31 15:58:14 +08:00
parent 477e299e24
commit 0706fdd6dc
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title><%= h html_title %></title>
<meta name="description" content="<%= Redmine::Info.app_name %>" /> <meta name="description" content="<%= Redmine::Info.app_name %>" />
<meta name="keywords" content="issue,bug,tracker" /> <meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
@ -33,28 +32,25 @@
<div class="main_context"> <div class="main_context">
<div class="spaceleft"> <div class="spaceleft">
<div> <div>
<table style="width: 232px ; height: 80px;"> <table style="width: 232px ; height: 80px; padding-left: 8px">
<!-- modified by bai --> <tr style="font-size:16px">
<!-- <tr> <td width="70px">课程名：</td>
<td><span style="padding-left: 8px; "><%= l(:label_course_view) %></span> <td aligin = "center">
<strong> <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %></strong>
</td> </td>
</tr> --> </tr>
<tr><td style="padding-left: 8px"><%= l(:label_course_view) %></td></tr> <tr style="font-size:16px">
<tr> <td width="70px">作业名：</td>
<td class="info_font"><span style="color:#ed8924"><%= h @bid.name %></span></td> <td align="center"><span style="color:#ed8924"><%= h @bid.name %></span></td>
</tr> </tr>
<tr> <tr>
<td> <td></td>
<td align="center">
<span class="bid_course" style="padding-left: 8px"> <% if @user != User.current %> <span class="bid_course" style="padding-left: 8px"> <% if @user != User.current %>
<%= watcher_link(@bid, User.current) %> <%= watcher_link(@bid, User.current) %>
<% end %> </span></td> <% end %> </span>
</td>
</tr> </tr>
<tr><table><tr>
<td align="center"><%= link_to l(:label_course_return), project_path(@bid.courses.first), :class => 'font-user-color' %></td>
<td align="center"><%= link_to "返回个人主页", user_path(User.current), :class => 'font-user-after-color'%>
</td></tr></table>
</table> </table>
</div> </div>
<div class="user_underline"></div> <div class="user_underline"></div>
@ -63,9 +59,7 @@
<!-- info --> <!-- info -->
<div class="inf_user_image"> <div class="inf_user_image">
<table> <table>
<tr>
<td><%= l(:label_course_homework) %> : <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %></td>
</tr>
<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> <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>

2
config/locales/zh.yml
View File

@ -1279,7 +1279,7 @@ zh:
field_add: 添加于 %{time} 之前 field_add: 添加于 %{time} 之前
button_more: 更多 button_more: 更多
label_user_response: 用户反馈 label_user_response: 用户反馈
label_student_response: 留言讨论区 # modified by bai label_student_response: 作业答疑 # modified by bai
label_bidding_project: 参与项目 label_bidding_project: 参与项目
label_homework_project: 已提交作业 #huang label_homework_project: 已提交作业 #huang
button_bidding: 我要参加 button_bidding: 我要参加