diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index 21c8c11b9..27732b549 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -291,7 +291,6 @@ <%= labelled_form_for @user, :url => register_path do |f| %> <%= error_messages_for 'user' %> -

@@ -305,73 +304,80 @@ - + + +
- - -<% else %> -<%= text_field_tag :no, nil, :placeholder => "请输入学号" %> -<% end %> -

- <% if @user.auth_source_id.nil? %>

<%= f.text_field :login, :size => 25, :required => true %> - <%= l(:label_max_number) %>

- + <%= l(:label_max_number) %> +

<%= f.password_field :password, :size => 25, :required => true %> - <%= l(:text_caracters_minimum, :count => Setting.password_min_length) %>

- + <%= l(:text_caracters_minimum, :count => Setting.password_min_length) %> +

<%= f.password_field :password_confirmation, :size => 25, :required => true %>

<% end %> - - -

<%= f.text_field :mail, :required => true %>

- +

<%= f.text_field :firstname, :required => true %>

+

<%= f.text_field :lastname, :required => true %>

+ +

- <%= "#{l(:label_mail_attention)} " %>

- + <%= f.text_field :mail, :required => true %> + +

+

+ <%= "#{l(:label_mail_attention)} " %> +

<%= f.select :language, lang_options_for_select, :required => true %>

- - - - +

@@ -435,19 +441,13 @@

<% end %> - <% if Setting.openid? %>

<%= f.text_field :identity_url %>

<% end %> - - <% @user.custom_field_values.select { |v| v.editable? || v.required? }.each do |value| %>

<%= custom_field_tag_with_label :user, value %>

<% end %>
- - - \ No newline at end of file diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index 6d1581820..aae4a63b8 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -56,97 +56,97 @@ - - - - - + + + + + - - - - + + + + - - - - - - - - + + + + + + + +
- 作品名称:  - <% if homework.name == nil || homework.name == "" %> - <% homework_filename = homework.user.name + "提交的作业" %> - <% else %> - <% homework_filename = homework.name %> - <% end %> - - <%= link_to homework_filename , homework_attach_path(homework)%> - - - 合作成员:  - <% homework_users = homework_user_of_homework(homework,is_teacher) %> - <% if homework.users.count == 0 %> - 无 - <% else %> - <%= homework_users %> - <% end %> - - <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %> - 迟交 - <% end %> -
+ 作品名称:  + <% if homework.name == nil || homework.name == "" %> + <% homework_filename = homework.user.name + "提交的作业" %> + <% else %> + <% homework_filename = homework.name %> + <% end %> + + <%= link_to homework_filename , homework_attach_path(homework)%> + + + 合作成员:  + <% homework_users = homework_user_of_homework(homework,is_teacher) %> + <% if homework.users.count == 0 %> + 无 + <% else %> + <%= homework_users %> + <% end %> + + <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %> + 迟交 + <% end %> +
- 开发项目:  - <% if homework.project != nil %> - - <%= link_to homework.project.name,project_path(homework.project.id)%> - - <% else %> - 暂无 - <% end %> - - 项目得分:  - ;"> - <%= homework.project.nil? ? "N/A" : project_scores(homework.project) %> - - -
+ 开发项目:  + <% if homework.project != nil %> + + <%= link_to homework.project.name,project_path(homework.project.id)%> + + <% else %> + 暂无 + <% end %> + + 项目得分:  + ;"> + <%= homework.project.nil? ? "N/A" : project_scores(homework.project) %> + + +
- 提交文件:  - <% if is_evaluation || is_teacher%> - <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%> - <% else %> - 未开启互评功能作业不允许下载 - <% end %> - - - 互评得分:  - <%# student_homework_score = student_score_for_homework(homework) %> - ;"> - <% score = homework.s_score.nil? ? "N/A" : format("%.2f",homework.s_score) %> - <%= score %> -    - <% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%> - <%= link_to "学生互评>>",homework_attach_path(homework) %> - <% end %> - -
- <% if is_evaluation || is_teacher%> - <%= render :partial => 'app_link', :locals => {:attachments => homework.attachments} %> - <% end %> - - 终评得分:  - <%# totle_homework_score = score_for_homework(homework) %> - <% totle_homework_score = format("%.2f",(homework.t_score.nil? ? 0.00 : homework.t_score) * (@bid.proportion * 1.0 / 100) + (homework.s_score.nil? ? 0.00 : homework.s_score) * (1 - @bid.proportion * 1.0 / 100)) %> - ;"> - <% score = totle_homework_score == "0.00"? "N/A" : totle_homework_score %> - <%= score %> -    - <% if is_teacher %> - <%= link_to "教师评分>>",homework_attach_path(homework) %> - <% end %> - -
+ 提交文件:  + <% if is_evaluation || is_teacher%> + <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%> + <% else %> + 未开启互评功能作业不允许下载 + <% end %> + + + 互评得分:  + <%# student_homework_score = student_score_for_homework(homework) %> + ;"> + <% score = homework.s_score.nil? ? "N/A" : format("%.2f",homework.s_score) %> + <%= score %> +    + <% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%> + <%= link_to "学生互评>>",homework_attach_path(homework) %> + <% end %> + +
+ <% if is_evaluation || is_teacher%> + <%= render :partial => 'app_link', :locals => {:attachments => homework.attachments} %> + <% end %> + + 终评得分:  + <%# totle_homework_score = score_for_homework(homework) %> + <% totle_homework_score = format("%.2f",(homework.t_score.nil? ? 0.00 : homework.t_score) * (@bid.proportion * 1.0 / 100) + (homework.s_score.nil? ? 0.00 : homework.s_score) * (1 - @bid.proportion * 1.0 / 100)) %> + ;"> + <% score = totle_homework_score == "0.00"? "N/A" : totle_homework_score %> + <%= score %> +    + <% if is_teacher %> + <%= link_to "教师评分>>",homework_attach_path(homework) %> + <% end %> + +