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/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index 9afa3ea9d..302b57547 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -3,9 +3,8 @@ <% if @bid.reward_type == 3 %> <% if User.current.user_extensions.identity == 1 %>
-

贴心小提示：

-

亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以再 - 回到这里来提交作业哦~ 这样在作业提交后，老师就可以随时关注你的作业进展啦~祝使用愉快^^

+

<%= l(:label_homework_prompt) %>

+

<%= l(:label_homework_prompt_content) %>

<% end %>
<%= 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)) %>
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_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 06d12601a..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: 提交作业 @@ -1378,6 +1380,8 @@ zh: label_jion_bidding_homework: 已提交！ label_bidding_user: 应标人： label_bidding_user_homework: 作业提交者 + label_homework_prompt: 贴心小提示： + label_homework_prompt_content: 亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以再回到这里来提交作业哦~ 这样在作业提交后，老师就可以随时关注你的作业进展啦~祝使用愉快^^ label_bidding_user_studentcode: 学号 label_bidding_reason: 应标宣言： label_bidding_reason_homewrok: 作业提交说明