From 864d969c155393c7a5410e18fde98531911e9f99 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 13 Oct 2014 14:52:07 +0800
Subject: [PATCH] =?UTF-8?q?#1173=20=E9=87=8D=E5=90=AF=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E3=80=81=E5=85=B3=E9=97=AD=E8=AF=BE=E7=A8=8B=E3=80=81=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E8=AF=BE=E7=A8=8B=E3=80=81=E9=80=80=E5=87=BA=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E7=AD=89=E6=8C=89=E9=92=AE=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb         |  1 -
 app/views/courses/finishcourse.js.erb         | 14 +++---
 app/views/layouts/_base_header.html.erb       | 43 +++++--------------
 app/views/layouts/_user_courses_list.html.erb | 14 ++++++
 app/views/layouts/_user_project_list.html.erb | 12 ++++++
 5 files changed, 43 insertions(+), 41 deletions(-)
 create mode 100644 app/views/layouts/_user_courses_list.html.erb
 create mode 100644 app/views/layouts/_user_project_list.html.erb

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 945b8c514..a9a02045f 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -544,7 +544,6 @@ class CoursesController < ApplicationController
 
   def finishcourse
     yesterday = Date.today.prev_day.to_time
-
     @course_prefs.endup_time = yesterday
     @save_flag = @course_prefs.save
     get_courses
diff --git a/app/views/courses/finishcourse.js.erb b/app/views/courses/finishcourse.js.erb
index 75c2b774d..46bc57e32 100644
--- a/app/views/courses/finishcourse.js.erb
+++ b/app/views/courses/finishcourse.js.erb
@@ -1,12 +1,12 @@
 <% if @save_flag %>
-<% if Rails.env.development? %>
-console.debug('课程修改成功：结束时间改为<%=Course.find_by_extra(@course.extra).try(:endup_time)%>');
-<% end %>
-$('#content-title-top-div').html("<%= j(render partial: 'users/my_course_ex', :locals => {:memberships => @memberships,:user=>@user,
-:memberships_doing=>@memberships_doing,:memberships_done=>@memberships_done} )%>")
-$('#finish_course_<%=@course.id%>').replaceWith("<%= j(render partial: 'courses/set_course_time', :locals => {:course => @course} )%>")
+    <% if Rails.env.development? %>
+        console.debug('课程修改成功：结束时间改为<%=Course.find_by_extra(@course.extra).try(:endup_time)%>');
+    <% end %>
+    $('#content-title-top-div').html("<%= j(render partial: 'users/my_course_ex', :locals => {:memberships => @memberships,:user=>@user,
+    :memberships_doing=>@memberships_doing,:memberships_done=>@memberships_done} )%>");
+    $('#finish_course_<%=@course.id%>').replaceWith("<%= j(render partial: 'courses/set_course_time', :locals => {:course => @course} )%>");
 <% else %>
-alert('权限不足，设置失败，请在论坛提交问题，等待管理员处理。');
+    alert('权限不足，设置失败，请在论坛提交问题，等待管理员处理。');
 <% end  %>
 
 
diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index b0daf8c88..c3b06759c 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -42,48 +42,25 @@
 			<ul class="sub_menu">
               <% if @show_course == 1 %>
 				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
-
-                <% hasCourse=false %>
-                <% User.current.courses.each do |course| %>
-                    <% if !course_endTime_timeout?(course) %>
-                          <% hasCourse=true %>
-                    <% end %>
-                <% end %>
-                <% if hasCourse %>
-				<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">
+                    <% hasCourse=false %>
                     <% User.current.courses.each do |course| %>
                         <% if !course_endTime_timeout?(course) %>
-                            <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=course.name%>"><%= link_to course.name, {:controller => 'courses',:action => 'show',id:course.id} %></li>
+                              <% hasCourse=true %>
                         <% end %>
                     <% end %>
-                  </ul>
-                </li>
-                <% end %>
-
+                      <%= render :partial => 'layouts/user_courses_list', :locals => {:hasCourse => hasCourse} %>
 				<% end -%>
               <% end %>
-
-              <% if User.current.projects.count>0 %>
-              <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">
-                <% else %>
-                    <ul class="project_sub_menu" style="top: 0px">
-                <% end %>
-                <% User.current.projects.each do |project| %>
-                      <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=project.name%>"><%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.project_domain } %></li>
-                 <% end %>
-                 </ul>
+              <%= render :partial => 'layouts/user_project_list', :locals => {:hasCourse => hasCourse} %>
+              <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>
-              <% end %>
-				<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>
 		<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;">
-			<%=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?%>
+			<%=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>
@@ -98,7 +75,7 @@
 <script type="text/javascript">
 	function setMessageCount () {
 		var mes = $('#loggedas .my-message')
-		mes.html(mes.html()+'('+<%=User.current.count_new_jour.to_s%>+")")
+		mes.html(mes.html()+ '(' + <%=User.current.count_new_jour.to_s%> + ")")
 	}
 
 	function addSlipMenu () {
diff --git a/app/views/layouts/_user_courses_list.html.erb b/app/views/layouts/_user_courses_list.html.erb
new file mode 100644
index 000000000..e5b0adb16
--- /dev/null
+++ b/app/views/layouts/_user_courses_list.html.erb
@@ -0,0 +1,14 @@
+<% if hasCourse %>
+    <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">
+        <% User.current.courses.each do |course| %>
+            <% if !course_endTime_timeout?(course) %>
+                <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=course.name%>">
+                  <%= link_to course.name, {:controller => 'courses',:action => 'show',id:course.id} %>
+                </li>
+            <% end %>
+        <% end %>
+      </ul>
+    </li>
+<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/_user_project_list.html.erb b/app/views/layouts/_user_project_list.html.erb
new file mode 100644
index 000000000..85eaec719
--- /dev/null
+++ b/app/views/layouts/_user_project_list.html.erb
@@ -0,0 +1,12 @@
+<% if User.current.projects.count>0 %>
+    <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} %>
+      <ul class="project_sub_menu" style="top:<%= hasCourse ? 35 : 0 %>px;">
+        <% User.current.projects.each do |project| %>
+            <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=project.name%>">
+              <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.project_domain } %>
+            </li>
+        <% end %>
+      </ul>
+    </li>
+<% end %>
\ No newline at end of file