From 29e2a4c70b228eb82320daceb9df3bc2b379aff7 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Wed, 16 Oct 2013 10:53:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E5=AD=A6=E5=8F=B7=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=20=E4=BD=9C=E4=B8=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_list_projects.html.erb | 8 ++++---- app/views/layouts/base_courses.html.erb | 8 ++++---- app/views/layouts/base_homework.html.erb | 20 +++++++++----------- config/locales/zh.yml | 4 +++- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index d7611e8b7..a072160c7 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -115,9 +115,9 @@ - + <%= b_project.created_at%> - + @@ -126,10 +126,10 @@ <% if @bid.reward_type == 3 %> - + - diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index be74b58c0..432d7286f 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -99,22 +99,22 @@ - + - + <% unless @course.teacher.user_extensions.nil?%> - + <% else %> - + <% end %> diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 420ac18ea..0917e9bcf 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -33,22 +33,20 @@
-
<%= l(:label_bidding_user_studentcode) %> : <%= @user.user_extensions.student_id %><%= l(:label_bidding_user_studentcode) %> : <%= User.current.user_extensions.student_id %>
<%= l(:label_bidding_user_homework) %> + <%= l(:label_bidding_user_homework) %> : <%= link_to(b_project.user.lastname+b_project.user.firstname, user_path(b_project.user)) %>
<%= l(:label_main_teacher) %><%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher)) %><%= l(:label_main_teacher) %> :<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher)) %>
<%= l(:label_main_term) %><%= @course.time %> -- <%= @course.term %><%= l(:label_main_term) %> :<%= @course.time %> -- <%= @course.term %>
<%= l(:label_teacher_work_unit) %><%= @course.teacher.user_extensions.occupation %><%= l(:label_teacher_work_unit) %> :<%= @course.teacher.user_extensions.occupation %>
<%= l(:label_teacher_work_unit) %><%= l(:field_course_un) %><%= l(:label_teacher_work_unit) %> :<%= l(:field_course_un) %>
+
- + - - - <% if @user != User.current %> - - - - <% end %> - - + +
<%= "课程作业" %><%=l(:label_course_view) %>
<%= h @bid.name %>
<%= watcher_link(@bid, User.current) %>
<%=link_to l(:label_course_return), project_path(@bid.courses.first) %> + + <% if @user != User.current %> + <%= watcher_link(@bid, User.current) %> + <% end %> +
diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 1170b4efd..4cef2019b 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -543,6 +543,8 @@ zh: label_limit_time: 截止日期 label_commit_homework: 提交作业 label_course_homework: 对应课程 + label_course_return: 返回课程 + label_course_view: 作业界面 label_homework_response: 作业咨询 label_bidding_homework: 提交作业 @@ -1379,7 +1381,7 @@ zh: label_bidding_user: 应标人： label_bidding_user_homework: 作业提交者 label_homework_prompt: 贴心小提示： - label_homework_prompt_content: 亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以再 回到这里来提交作业哦~ 这样在作业提交后，老师就可以随时关注你的作业进展啦~祝使用愉快^^ + label_homework_prompt_content: 亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以再回到这里来提交作业哦~ 这样在作业提交后，老师就可以随时关注你的作业进展啦~祝使用愉快^^ label_bidding_user_studentcode: 学号 label_bidding_reason: 应标宣言： label_bidding_reason_homewrok: 作业提交说明