From 63a141a75a5cbdaa623ea12d0bd302731069e25a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 17 Nov 2014 10:32:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8F=B3=E4=B8=8A=E4=BE=A7?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BD=9C=E4=B8=9A=E5=BF=AB=E6=8D=B7=E6=A0=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAjs=E3=80=81css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_header.html.erb       | 22 +++++++++----------
 app/views/layouts/_user_courses_list.html.erb |  4 +++-
 .../layouts/_user_homework_list.html.erb      |  2 +-
 .../stylesheets/application.css               |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index c263853a4..6f87d4171 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -74,13 +74,13 @@
 
 <script type="text/javascript">
 	function setMessageCount () {
-		var mes = $('#loggedas .my-message')
-		mes.html(mes.html()+ '(' + <%=User.current.count_new_jour.to_s%> + ")")
+		var mes = $('#loggedas .my-message');
+		mes.html(mes.html()+ '(' + <%=User.current.count_new_jour.to_s%> + ")");
 	}
 
 	function addSlipMenu () {
-		var loggedas = $('#loggedas ul li:first')
-		var sub_menu = $('.sub_menu')
+		var loggedas = $('#loggedas ul li:first');
+		var sub_menu = $('.sub_menu');
 		loggedas.mouseenter(function(event) {
 				sub_menu.show();
 		});
@@ -90,9 +90,9 @@
 	}
 
     function addProjectSlipMenu () {
-        var loggedas = $('#project_loggedas_li')
-        var project_sub_menu = $('.project_sub_menu')
-        var course_sub_menu = $('.course_sub_menu')
+        var loggedas = $('#project_loggedas_li');
+        var project_sub_menu = $('.project_sub_menu');
+        var course_sub_menu = $('.course_sub_menu');
         loggedas.mouseenter(function(event) {
             course_sub_menu.hide();
             project_sub_menu.show();
@@ -102,9 +102,9 @@
         });
     }
     function addCourseSlipMenu () {
-        var loggedas = $('#course_loggedas_li')
-        var project_sub_menu = $('.project_sub_menu')
-        var course_sub_menu = $('.course_sub_menu')
+        var loggedas = $('#course_loggedas_li');
+        var project_sub_menu = $('.project_sub_menu');
+        var course_sub_menu = $('.course_sub_menu');
         loggedas.mouseenter(function(event) {
             project_sub_menu.hide();
             course_sub_menu.show();
@@ -133,7 +133,7 @@
 	});
 
 	jQuery(document).ready(function($) {
-        $('.sub_menu').find("a").attr('target', '_blank');
+		$('.sub_menu').find("a").attr('target', '_blank');
         $('.project_sub_menu').find("a").attr('target', '_blank');
         $('.course_sub_menu').find("a").attr('target', '_blank');
 	});
diff --git a/app/views/layouts/_user_courses_list.html.erb b/app/views/layouts/_user_courses_list.html.erb
index 134774c12..d3da499dc 100644
--- a/app/views/layouts/_user_courses_list.html.erb
+++ b/app/views/layouts/_user_courses_list.html.erb
@@ -2,9 +2,11 @@
     <li  id="course_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
       <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id} %>
       <ul class="course_sub_menu">
+        <% course_index = 0 %>
         <% User.current.courses.each do |course| %>
             <% if !course_endTime_timeout?(course) %>
-                <%= render :partial => 'layouts/user_homework_list', :locals => {:course => course} %>
+                <%= render :partial => 'layouts/user_homework_list', :locals => {:course => course,:course_index => course_index} %>
+                <% course_index += 1 %>
             <% end %>
         <% end %>
       </ul>
diff --git a/app/views/layouts/_user_homework_list.html.erb b/app/views/layouts/_user_homework_list.html.erb
index 18480555d..9eddc94d9 100644
--- a/app/views/layouts/_user_homework_list.html.erb
+++ b/app/views/layouts/_user_homework_list.html.erb
@@ -1,7 +1,7 @@
 <% if course %>
     <li id="homework_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%=course.name%>" onmouseover="homeworkSlipMenuOver(<%= course.id%>);" onmouseout="homeworkSlipMenuOut(<%= course.id%>);">
       <%= link_to course.name, {:controller => 'courses',:action => 'show',id:course.id} %>
-      <ul class="homework_sub_menu" id="homework_loggedas_ul_<%= course.id%>" onmouseover="homeworkSlipMenuOver(<%= course.id%>);" onmouseout="homeworkSlipMenuOut(<%= course.id%>);">
+      <ul class="homework_sub_menu" id="homework_loggedas_ul_<%= course.id%>" style="top:<%= course_index * 28.1%>px;">
         <% course.homework_for_courses.map(&:bid).each do |bid| %>
             <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=bid.name%>">
               <%= link_to bid.name, course_for_bid_path(bid), :target => "_blank" %>
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 05d374a5b..f683607cf 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -2223,7 +2223,7 @@ ul.messages-for-user-reply li {
     box-shadow: 2px 2px 6px #b0b0b0 ;
     display: none;
     background: #13AEBF 0 0 no-repeat;
-    left: 115px;
+    left: 110px;
     padding-bottom: 5px;
     position: absolute;
     top: 0px;