From a001f85502798da5b2b6a3ee1c7ab1596875579a Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 21 Oct 2014 13:49:03 +0800 Subject: [PATCH] =?UTF-8?q?#1379=201.=E9=9A=90=E8=97=8F=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=202.=E5=8F=96=E6=B6=88=E6=97=A0=E6=95=88?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_homework_form.html.erb | 1 - app/views/courses/_homework_form.html.erb | 1 - app/views/layouts/base_homework.html.erb | 99 ++++++++++++++++------- app/views/memos/_form.html.erb | 1 - config/locales/zh.yml | 1 + 5 files changed, 69 insertions(+), 34 deletions(-) diff --git a/app/views/bids/_homework_form.html.erb b/app/views/bids/_homework_form.html.erb index 145e01f1c..2b7578a96 100644 --- a/app/views/bids/_homework_form.html.erb +++ b/app/views/bids/_homework_form.html.erb @@ -21,7 +21,6 @@ <%= error_messages_for 'bid' %> -

<%= l(:label_homeworks_form_new_description) %>

<%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :onblur => "regexName();" %> diff --git a/app/views/courses/_homework_form.html.erb b/app/views/courses/_homework_form.html.erb index b397b8d8f..646deb16e 100644 --- a/app/views/courses/_homework_form.html.erb +++ b/app/views/courses/_homework_form.html.erb @@ -21,7 +21,6 @@ <%= error_messages_for 'bid' %> -

<%= l(:label_homeworks_form_new_description) %>

<%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :onblur => "regexName();" %> diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 01813bf52..7808f268e 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -33,17 +33,26 @@ - - + - + <%= link_to request.host()+"/courses", :controller => 'courses', :action => 'index' %> + +
高校课程实践社区<%= l(:label_user_location) %> : + <%= l(:label_user_location) %> : +
- <%= link_to request.host()+"/courses", :controller => 'courses', :action => 'index' %>

<%= link_to "主页", home_path %> - > <%= link_to l(:label_course_practice), :controller => 'courses', :action => 'index' %> > - <%= link_to(course.name.to_s, homework_course_path(course)) if course %> - > - <%= link_to(@bid.name, respond_path(@bid)) %>

 +

<%= link_to "主页", home_path %> + > + <%= link_to l(:label_course_practice), :controller => 'courses', :action => 'index' %> + > + + <%= link_to(course.name.to_s, homework_course_path(course)) if course %> + + > + <%= link_to(@bid.name, respond_path(@bid)) %> +

+
@@ -93,26 +102,42 @@ + + <%= l(:label_new_course_description) %> : + + - + - - + + - - + + - - + + @@ -120,26 +145,34 @@ - - - - <% unless @user.user_extensions.nil? || @user.user_extensions.school.nil? %> - - <% end %> - -
- <%= l(:label_new_course_description) %> :
<%= textilizable course.description %> + <%= textilizable course.description %> +
<%= l(:label_create_time) %> :<%= format_time course.created_at %> + <%= l(:label_create_time) %> : + + <%= format_time course.created_at %> +
主讲老师 :<%= link_to(course.teacher.lastname+course.teacher.firstname, user_path(course.teacher)) %><%= l(:lable_course_teacher) %> : + <%= link_to(course.teacher.lastname+course.teacher.firstname, user_path(course.teacher)) %> +
<%= l(:label_class_period) %> :<%= course.class_period.to_s %> <%= l(:label_class_hour) %> + <%= l(:label_class_period) %> : + + <%= course.class_period.to_s %>  + <%= l(:label_class_hour) %> +
<%= course.time.to_s %> <%= course.term %>
<%= l(:label_teacher_work_unit) %> :<%= link_to @user.user_extensions.school,"http://course.trustie.net/?school_id=#{@user.user_extensions.school.id}" %>
- -

+ + + <%= l(:label_teacher_work_unit) %> : + + + <% unless @user.user_extensions.nil? || @user.user_extensions.school.nil? %> + + <%= link_to @user.user_extensions.school,"http://#{Setting.host_course}/?school_id=#{@user.user_extensions.school.id}" %> + + <% end %> + + + +
- - + - + <% unless @bid.parent_id.nil? %> @@ -160,7 +193,9 @@
<%= l(:label_limit_time) %>: <%= @bid.deadline %> + <%= l(:label_limit_time) %>: + <%= @bid.deadline %> +
作业类型: <%= @bid.homework_type==Bid::HomeworkFile ? "提交文件" : "提交项目" %>
- +
<%= render :partial => 'tags/tag', :locals => {:obj => @bid, :object_flag => "4"} %> + <%= render :partial => 'tags/tag', :locals => {:obj => @bid, :object_flag => "4"} %> +
@@ -238,7 +273,9 @@
diff --git a/app/views/memos/_form.html.erb b/app/views/memos/_form.html.erb index 116f97149..b22983d2a 100644 --- a/app/views/memos/_form.html.erb +++ b/app/views/memos/_form.html.erb @@ -1,6 +1,5 @@ <%= error_messages_for 'bid' %> -

<%= l(:label_homeworks_form_new_description) %>