From 70a1839e74d1b39c26113226eb4587f0bcbee4e7 Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Fri, 8 Aug 2014 09:30:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=95=8C=E9=9D=A2-=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=EF=BC=88=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9=E7=9B=AE=E3=80=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=EF=BC=89=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_header.html.erb | 14 +++++++-------
 config/locales/en.yml                   |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index fafc49c0a..3a7a6a8ee 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -27,7 +27,7 @@
 		#@nav_dispaly_user_label = 1
 	end
 %>
-<div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">	
+<div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">
 	<div class="welcome_logo">
 		<%=link_to image_tag("/images/logo.png",weight:"36px", height: "36px")%>
 	</div>
@@ -44,8 +44,8 @@
 				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
                  <% hasCourse=true%>
 
-				<li  id="course_loggedas_li"><%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %>
-                  <ul class="course_sub_menu">
+				<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, host: Setting.course_domain} %>
+                    <ul class="course_sub_menu">
                     <% User.current.courses.each do |course| %>
                         <% if !course_endTime_timeout?(course) %>
                             <li><%= link_to course.name.truncate(10, omission: '...'), {:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %></li>
@@ -56,7 +56,7 @@
 
 				<% end -%>
               <% end %>
-              <li id="project_loggedas_li"><%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %>
+              <li id="project_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %>
 
                 <% if hasCourse %>
                     <ul class="project_sub_menu" style="top: 35px">
@@ -68,7 +68,7 @@
                   <% end %>
                  </ul>
               </li>
-				<li><%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%>
+				<li style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%>
                 </li>
 			</ul>
 		</li>
@@ -76,9 +76,9 @@
 			<%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')', { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.user_domain }, {:class => 'my-message'} if User.current.logged?%>
 		</li>
 	</ul>
-	</div>	
+	</div>
 	<% end -%>
-	<%#= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>			
+	<%#= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
 	<%= render_dynamic_nav if User.current.logged? || !Setting.login_required? -%>
 	<%# 自建导航条在base页面中以 (@nav_dispaly......) 开头变量设定， 全局搜索即可发现 %>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 33e1eda9b..1d7b01d4f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1158,6 +1158,7 @@ en:
   #huang
   label_file_new: Download
   label_user_edit: "Edit information"
+  label_my_course: "My Course"
   label_user_info: "User information"   #huang 添加
   label_user_watcher: "Following"  # huang添加的  # modified by bai
   label_user_fans: "Followed by"   # modified by bai