From 86a3ce185d7d3190fe77613ea244feb2ade5d2bf Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 23 Sep 2016 14:17:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E4=BE=A7?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=AE=BD=E5=BA=A6=E9=99=90=E5=88=B6=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=8F=90=E7=A4=BA=E6=A1=86=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E5=8F=8Ajs=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_user_courses.html.erb | 61 +++++++++++----------- public/images/user/icons_user_leftnav.png | Bin 3456 -> 3465 bytes public/images/user/user_navmore_icons.png | Bin 1072 -> 1085 bytes public/stylesheets/css/structure.css | 7 ++- 4 files changed, 36 insertions(+), 32 deletions(-) diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index 60db07db0..8f996fe1c 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -1,19 +1,19 @@ <% courses.each do |course|%> -
  • +
  • <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %> -

    - <% title = "#{course.syllabus.title}".html_safe %> - <%= link_to title, syllabus_path(course.syllabus_id), :target => '_blank', :class => 'hidden', :style => "max-width:91px; display:inline-block;"%> +

    + <%#= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :id => "show_course_#{course.id}", :class => 'course_list_menu hidden', :target => '_blank', :title => (course.is_public? ? "公开班级:":"私有班级:")+course.name+"("+current_time_and_term(course)+")"%> <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %> @@ -113,25 +113,26 @@ } $(".course_list_menu").each(function(){ - var courseWidth = $(this).children().eq(0).children().width(); - var classWidth = $(this).children().eq(2).children().width(); - var newClassWidth = 182 - courseWidth; - var newCourseWidth = 182 - classWidth; - console.log(courseWidth, classWidth); - if(courseWidth < 91 && classWidth > 91){ - $(this).children().eq(2).css("max-width",newClassWidth + "px"); - } - if(classWidth < 91 && courseWidth > 91){ - $(this).children().eq(0).css("max-width",newCourseWidth + "px"); - } + $(this).mouseenter(function(){ + $(".sub-menu-title").hide(); + $(this).next().stop(); + $(this).next().show(); + }); + $(this).mouseleave(function(){ + $(this).next().delay(500).hide(0); + }); }) - $(".course-name").each(function(){ - $(this).mouseenter(function(){ - $(this).parent().parent().children().eq(3).show(); - }); - $(this).mouseleave(function(){ - $(this).parent().parent().children().eq(3).hide(); - }); - }) + $(".sub-menu-title").each(function(){ + var boxWidth = $(this).width(); + var leftAttr = boxWidth + 50 + $(this).css("left",-leftAttr); + $(this).mouseover(function(){ + $(this).stop(); + $(this).show(); + }); + $(this).mouseout(function(){ + $(this).delay(500).hide(0); + }); + }); diff --git a/public/images/user/icons_user_leftnav.png b/public/images/user/icons_user_leftnav.png index 7983c4dc6e57599455234427fc42d295e7c39e89..b667508da64368aa31024ad31b2c746315ab98c2 100644 GIT binary patch delta 2667 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 E0y;LA6951J diff --git a/public/images/user/user_navmore_icons.png b/public/images/user/user_navmore_icons.png index e4fb91b541329d50720c2d106570ec0e59044479..249d8ab15e833d964b26ff0944ed49592027acae 100644 GIT binary patch delta 408 zcmdnMv6o|m8&iz4g`<$_i>(q+L@y;X#R{s|8JFJ4i5|o-|m4e#>M_hU*>oGgk zZ+7RiXJBB^3h)VWwVrbA-M8PB+a51H_r`nf&6@2`eCFP&-SNa}#`V3oKQ1}<#&O2= zeYZdU|NozC z8yH`GW>b&se9i04$P5C0U=m22=eCQI*zrxBCuZvwgMzu)5$_i>(q+L@y;X#R{s|8JFJ4i5|o-|m4e#>M_hU*>oGgk z9~Y@NW?*1Y5AX?bwVrbA+poVjUwyyv>U-Dz=SeH?ZM^c{b>@xaRrfmgKihcqz01rS z|NsBzcj0{x)WTa5>qOz zG=n}(6HPz{jtLLqO>Z5re7}@?j?C*9O!n7vnDVQyFIgVV#D)y?SnHX17~TpV4DgC; RX9rrs;OXk;vd$@?2>^fLkeL7g diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index 5fc47ad81..2c2773774 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -596,7 +596,7 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;} .user_sub_menu li a:hover,.user_sub_menu li a:target { color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;} .user_sub_menu li a:hover,.user_sub_menu li a:target{} .user_sub_menu li:last-child a { } -.user_sub_menu li p {padding:0 15px 0 25px; border:1px solid #e5e5e5; border-bottom:none; background:#f8f8f8;} +.user_sub_menu li p {padding:0 25px; border:1px solid #e5e5e5; border-bottom:none; background:#f8f8f8;} .user_sub_menu li p:hover {background:#fff;} .user_sub_menu li p:hover a {background:#fff;} .user_sub_menu li p:hover,.user_sub_menu li p:target {color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;} @@ -640,7 +640,10 @@ a.user_navmorebox .user_icons_closeclass{ background:url(/images/user/icons_user_leftnav.png) -25px -347px no-repeat; } .show-all-sub {position:absolute; top:18px; right:15px;} -.sub-menu-title {position:absolute; border:1px solid #ddd; background-color:#fff; padding:2px 5px; z-index:99; white-space:nowrap; left:25px; top:35px; display:none;} +.sub-menu-title {position:absolute; background-color:#fff; padding:5px 10px; z-index:99; white-space:nowrap; top:-13px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display:none;} +.sub-menu-title div a {background-color:#fff; height:auto; line-height:1; font-size:12px;} +.sub-menu-title em {display:block; border-width:8px; position:absolute;top:23px; right:-16px; border-style:dashed dashed dashed solid; border-color:transparent transparent transparent #fff; font-size:0; line-height:0; z-index:1;} +.sub-menu-title font {display:block; border-width:8px; position:absolute;top:24px; right:-17px; border-style:dashed dashed dashed solid; border-color:transparent transparent transparent rgba(146, 153, 169, 0.5); font-size:0; line-height:0;} /* 个人主页左侧导航更多功能 */ .user_navmore_box {position:absolute; width:15px; height:15px; right:13px; top:17px; cursor:pointer;} .user_navmore_box ul li:hover ul {display:block; }