From 6b1116dfd13d143268c43641fa61f0a9df126d62 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 22 Jul 2016 16:00:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=92=8C=E5=90=8D=E7=A7=B0=E7=9A=84=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_syllabus_eng_name.html.erb |  6 +++---
 app/views/layouts/_syllabus_title.html.erb    | 11 +++++------
 app/views/layouts/base_syllabus.html.erb      |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/views/layouts/_syllabus_eng_name.html.erb b/app/views/layouts/_syllabus_eng_name.html.erb
index 75fa9643a..0668f74e6 100644
--- a/app/views/layouts/_syllabus_eng_name.html.erb
+++ b/app/views/layouts/_syllabus_eng_name.html.erb
@@ -1,9 +1,9 @@
-<p><% if syllabus.eng_name && !syllabus.eng_name.empty? %>
+<p style="position:relative; display:inline;"><% if syllabus.eng_name && !syllabus.eng_name.empty? %>
     <span><%=syllabus.eng_name %></span>
 <% else%>
-    <!--<span style="color: #888">课程英文名称</span> -->
+    <span style="color: #888">课程英文名称</span>
 <% end %>
 <% if User.current == syllabus.user || User.current.admin? %>
-    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_ng_name_png", :class => "none", :onclick => "show_edit_eng_name();"%>
+    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_ng_name_png", :style => "width:15px; position:absolute; right: -20px; top: 5px;", :class => "none", :onclick => "show_edit_eng_name();"%>
 <% end %>
 </p>
\ No newline at end of file
diff --git a/app/views/layouts/_syllabus_title.html.erb b/app/views/layouts/_syllabus_title.html.erb
index ec8623db2..6407a19a2 100644
--- a/app/views/layouts/_syllabus_title.html.erb
+++ b/app/views/layouts/_syllabus_title.html.erb
@@ -1,6 +1,5 @@
-<h2 >课程名称：<%=syllabus.title %>
-
-<% if User.current == syllabus.user || User.current.admin? %>
-    <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_title_png", :class => "none", :onclick => "show_edit_title('#{syllabus.title}');"%>
-<% end %>
-</h2>
\ No newline at end of file
+<h2 style="position:relative; display:inline;">课程名称：<%=syllabus.title %>
+  <% if User.current == syllabus.user || User.current.admin? %>
+      <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);",:id => "syllabus_edit_title_png", :class => "none", :style => "width:15px; position:absolute; right: -20px; top: 15px;", :onclick => "show_edit_title('#{syllabus.title}');"%>
+  <% end %>
+</h2>
diff --git a/app/views/layouts/base_syllabus.html.erb b/app/views/layouts/base_syllabus.html.erb
index 4fe2228ef..cf4aac86d 100644
--- a/app/views/layouts/base_syllabus.html.erb
+++ b/app/views/layouts/base_syllabus.html.erb
@@ -10,7 +10,7 @@
   <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','syllabus','sy_public',:media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
-  <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus'%>
+  <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus','cookie'%>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
@@ -42,7 +42,7 @@
 
 <div class="sy_contanier">
   <div class="sy_top">
-    <div class="sy_top_con"> <!-- onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();" -->
+    <div class="sy_top_con" onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();"> <!-- onmouseover="$('#syllabus_edit_title_png').show();$('#syllabus_edit_ng_name_png').show();" onmouseout="$('#syllabus_edit_title_png').hide();$('#syllabus_edit_ng_name_png').hide();" -->
       <%=render :partial => 'layouts/syllabus_info' %>
     </div>
   </div>