diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 22db3d5b4..eeffe8b7b 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -314,7 +314,7 @@ class AccountController < ApplicationController #根据home_url生产正则表达式 eval("code = " + "/^" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index\\\/*.*)?\$/") if (code=~params[:back_url] || params[:back_url].to_s.include?('lost_password')) && last_login_on != '' - redirect_to user_activities_path(user) + redirect_to user_activities_path(user,host: Setting.user_domain) else if last_login_on == '' redirect_to my_account_url diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 801d98b0b..babd8cb12 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -797,4 +797,17 @@ module CoursesHelper end result end + + def zh_course_role role + if role == "TeachingAsistant" + result = l(:label_TA) + elsif role == "Teacher" + result = l(:label_teacher) + elsif role == "Student" + result = l(:label_student) + elsif role == "Manager" + result = l(:field_admin) + end + result + end end diff --git a/app/views/courses/_course_members.html.erb b/app/views/courses/_course_members.html.erb index 78dc6c319..9f15405dc 100644 --- a/app/views/courses/_course_members.html.erb +++ b/app/views/courses/_course_members.html.erb @@ -37,7 +37,7 @@ <% @roles.each do |role| %>
  • <%= radio_button_tag 'membership[role_ids][]', role.id, role.name == "学生" || role.name == "Student" %> - +
    • <% end %> diff --git a/app/views/courses/_course_teacher.html.erb b/app/views/courses/_course_teacher.html.erb index 5571a4546..ef1ffc808 100644 --- a/app/views/courses/_course_teacher.html.erb +++ b/app/views/courses/_course_teacher.html.erb @@ -1,6 +1,7 @@
    加入时间 + 角色
    <% members.each do |member| %> @@ -9,8 +10,9 @@ <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32)) %> <%= l(:label_username)%> - <%= link_to(member.user.name, user_path(member.user),:class => "ml10 c_blue02") %> + <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 c_blue02") %> <%= format_date(member.created_on)%> + <%= zh_course_role(h member.roles.sort.collect(&:to_s).first)%>
    <% end%> diff --git a/app/views/courses/_member.html.erb b/app/views/courses/_member.html.erb index a4b5bae6e..40049f104 100644 --- a/app/views/courses/_member.html.erb +++ b/app/views/courses/_member.html.erb @@ -2,21 +2,21 @@
  • <%= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %> - <%= h member.roles.sort.collect(&:to_s).join(', ') %> + <%= zh_course_role(h member.roles.sort.collect(&:to_s).join(', ')) %> <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), :method => :put, :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}} ) do |f| %> <% @roles.each do |role| %> -
      +
        <%= radio_button_tag 'membership[role_ids][]', role.id, member.roles.include?(role), :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %> - +
      <% end %> <%= hidden_field_tag 'membership[role_ids][]', '' %> -
      +
      <%= l(:button_change)%> diff --git a/app/views/homework_attach/_addjour.html.erb b/app/views/homework_attach/_addjour.html.erb index e3aaa9591..c6a08209c 100644 --- a/app/views/homework_attach/_addjour.html.erb +++ b/app/views/homework_attach/_addjour.html.erb @@ -21,16 +21,9 @@ function submit_jours(is_teacher) { - if(!is_teacher&&$("#stars_value").val() == "0"){ - if(confirm('是否确定评分为0分?')) - { - - } - else - { - return; - } - } +// if(("#stars_value").val() == "0"){ +// if(confirm('是否确定评分为0分?')){}else{return;} +// } if(!is_teacher&&$("#new_form_user_message").val() == ""){alert("您还没有填写评语");return;} $('#new_form_user_message').parent().submit(); } diff --git a/app/views/homework_attach/_show.html.erb b/app/views/homework_attach/_show.html.erb index 0a94afd59..a89322049 100644 --- a/app/views/homework_attach/_show.html.erb +++ b/app/views/homework_attach/_show.html.erb @@ -11,6 +11,14 @@ for (var i = num; i >= 0; i--) {$("#star0" + i).css("background-position","-24px 0px");} $("#stars_value").val(num); } + + function ChoseZero() + { + if(confirm('是否确定评分为0分?')) + { + ChoseStars(0); + } + }
      diff --git a/app/views/homework_attach/_show_star.html.erb b/app/views/homework_attach/_show_star.html.erb index 6cb901875..49c9e2cf7 100644 --- a/app/views/homework_attach/_show_star.html.erb +++ b/app/views/homework_attach/_show_star.html.erb @@ -1,4 +1,4 @@ -零分 +零分 diff --git a/config/locales/navigatiors/zh.yml b/config/locales/navigatiors/zh.yml index 76131a001..97c6da61a 100644 --- a/config/locales/navigatiors/zh.yml +++ b/config/locales/navigatiors/zh.yml @@ -15,8 +15,8 @@ zh: label_forum_all: 公共贴吧 label_school_all: 中国高校 label_contest_innovate: 创新竞赛 - #label_software_user: 软件创客 - #label_requirement_enterprise: 软件众包 + label_software_user: 软件创客 + label_requirement_enterprise: 软件众包 label_stores_index: 资源搜索 label_login: 登录 diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 5006a11e4..031b73afb 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -70,6 +70,9 @@ h4{ font-size:14px; color:#3b3b3b;} .mr20{ margin-right:20px;} .mr30{ margin-right:30px;} .mr40{ margin-right:40px;} +.mr50{margin-right: 50px;} +.mr55{margin-right: 55px;} +.mr70{margin-right: 70px;} .mt3{ margin-top:3px;} .mt5{ margin-top:5px;} .mt8{ margin-top:8px;} @@ -79,6 +82,7 @@ h4{ font-size:14px; color:#3b3b3b;} .mb20{ margin-bottom:20px;} .pl15{ padding-left:15px;} .w20{ width:20px;} +.w45{ width: 45px;} .w60{ width:60px;} .w70{ width:70px;} .w90{ width:90px;}