From 0706fdd6dcf542c053cb7a3d3f94433eebd765a0 Mon Sep 17 00:00:00 2001 From: xianbo Date: Thu, 31 Oct 2013 15:58:14 +0800 Subject: [PATCH] let the homework show under class in homeworkpager --- app/views/layouts/base_homework.html.erb | 34 ++++++++++-------------- config/locales/zh.yml | 2 +- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 05583a180..7baaafaf5 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -2,7 +2,6 @@ - <%= h html_title %> <%= csrf_meta_tag %> @@ -33,28 +32,25 @@
- - - - - - + + + + - + + <% end %> + -
<%= l(:label_course_view) %>
<%= h @bid.name %>
作业名：<%= h @bid.name %>
+ <% if @user != User.current %> <%= watcher_link(@bid, User.current) %> - <% end %>
- -
<%= link_to l(:label_course_return), project_path(@bid.courses.first), :class => 'font-user-color' %><%= link_to "返回个人主页", user_path(User.current), :class => 'font-user-after-color'%> -
@@ -63,9 +59,7 @@
- - - + diff --git a/config/locales/zh.yml b/config/locales/zh.yml index d7d345d5e..8996b794d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1279,7 +1279,7 @@ zh: field_add: 添加于 %{time} 之前 button_more: 更多 label_user_response: 用户反馈 - label_student_response: 留言讨论区 # modified by bai + label_student_response: 作业答疑 # modified by bai label_bidding_project: 参与项目 label_homework_project: 已提交作业 #huang button_bidding: 我要参加
<%= l(:label_course_homework) %> : <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %>
<%= l(:label_teacher_homework) %> : <%= link_to(@user.lastname+@user.firstname, user_path(@user)) %>