From ec476cbd7410ab07b82b60b84290aef030d09a43 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 13 Dec 2016 16:16:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=A4=B4=E9=83=A8=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_course_base_info.html.erb | 37 +++++++++----------- public/stylesheets/css/public.css | 2 +- public/stylesheets/syllabus.css | 5 +-- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index 2fb572010..8bc06e1e9 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -3,7 +3,7 @@ <% student_num = studentCount(@course) %> <% course_file_num = visable_attachemnts_incourse(@course).count %>

- <%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cgrey') %> + <%= link_to(@course.teacher.show_name, user_path(@course.teacher), :title => '主讲老师', :class => 'sy_cgrey') %>  >  <% if @course.syllabus %> <%=link_to @course.syllabus.title, syllabus_path(@course.syllabus_id), :class => 'sy_cgrey', :title => '课程名称' %> @@ -22,6 +22,12 @@ <% if @course.syllabus %>

  • <%= link_to "进入课程", syllabus_path(@course.syllabus), :class => "sy_class_option", :target => "_blank" %>
    • <% end %> + <% if @course.invite_code_halt == 0 %> +
  • 暂停加入
    • + <% elsif @course.invite_code_halt == 1 %> +
  • 放开加入
    • + <% end %> +
  • <%= link_to "设置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "sy_class_option" %>
    • @@ -54,7 +60,7 @@
    -

    邀 请 码
    +

    邀 请 码
    <% if @course.invite_code_halt == 0 %> <% if User.current.admin? || User.current.member_of_course?(@course) %> @@ -66,11 +72,6 @@ 已停用 <% end %> - <% if is_teacher && @course.invite_code_halt == 0 %> - 停    用 - <% elsif is_teacher && @course.invite_code_halt == 1 %> - 启    用 - <% end %>

    @@ -79,22 +80,16 @@ <%=@course.name %> -

    - 教师：<%= course_teacher_link teacher_num %> - 学生：<%= course_student_link student_num %> - 资源：<%= link_to course_file_num, course_files_path(@course), :class => 'sy_cblue',:id=>'courses_files_count_info' %> -

    - 主讲老师：<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %> - 学时：<%= @course.class_period %>学时 - 学期：<%= current_time_and_term @course %> - 单位：<%= get_occupation_from_user(@course.teacher).blank? ? '无' : get_occupation_from_user(@course.teacher) %> + 学期：<%= current_time_and_term @course %> + 教师：<%= course_teacher_link teacher_num %> + 学生：<%= course_student_link student_num %> +

    +

    + 单位：<%= get_occupation_from_user(@course.teacher).blank? ? '无' : get_occupation_from_user(@course.teacher) %>

    - <% if is_teacher %> - <%= link_to "班级设置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "sy_btn_grey mr10 fl" %> - <% end %> <% is_TA = get_user_member_roles_course @course, User.current, 7 %> <% is_TE = get_user_member_roles_course @course, User.current, 9 %> <% is_ST = get_user_member_roles_course @course, User.current, 10 %> @@ -114,7 +109,7 @@
    -

    <%= @course.invite_code_halt == 0 ? "请将邀请码告诉学生和教辅" : "邀请码已停用，学生和教辅" %>

    -

    <%= @course.invite_code_halt == 0 ? "他们可以主动加入班级" : "不可以主动加入班级了" %>

    +

    <%= @course.invite_code_halt == 0 ? "请将邀请码告诉成员" : "邀请码已停用" %>

    +

    <%= @course.invite_code_halt == 0 ? "他们可以主动加入" : "暂时停止成员主动加入" %>

    <% end %> \ No newline at end of file diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index 8127753c5..c2ff5c841 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -1441,7 +1441,7 @@ a.syllabusbox_a_blue { .resource_tip_box span {display:block; border-width:10px; position:absolute;top:35px; left:-18px; border-style:dashed solid dashed dashed; border-color:transparent #fff transparent transparent; font-size:0; line-height:0;} /*邀请码提示框*/ -.invite_code_tip_box {position:absolute; padding:5px 10px; white-space:nowrap; background-color:#fff; right:-185px; top:50px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} +.invite_code_tip_box {position:absolute; padding:5px 10px; white-space:nowrap; background-color:#fff; right:-160px; top:50px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} .invite_code_tip_box em {display:block; border-width:10px; position:absolute;top:26px; left:-20px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;} .invite_code_tip_box span {display:block; border-width:10px; position:absolute;top:26px; left:-18px; border-style:dashed solid dashed dashed; border-color:transparent #fff transparent transparent; font-size:0; line-height:0;} diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index c38e1bd79..90d62c6c2 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -289,10 +289,11 @@ a.sy_class_option:hover { } .sy_class_id{ width:94px; - height:94px; + height:70px; border:1px solid #f1f1f1; background:#fff; text-align:center; + padding-top:24px; } .sy_class_id p{ font-size:16px; @@ -302,7 +303,7 @@ a.sy_class_option:hover { font-size: 18px; font-weight: normal; margin-bottom: 5px; - max-width:440px; + max-width:650px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;