From 7633761bbed8b1a43dd30e5d4228263408e520e6 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 1 Jul 2016 13:54:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_syllabus_list.html.erb | 41 +++++++++++---------
 app/views/users/user_newfeedback.html.erb    |  2 +-
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index 153e11592..a9854566e 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -17,9 +17,9 @@
     <div class="cl"></div>
   </div>
 
-  <div class="syllabus_courses_box">
     <% if @syllabus.any? %>
         <% @syllabus.each_with_index do |syllabus, index|%>
+          <div class="syllabus_courses_box">
             <% courses = @courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS time").order("time desc") %>
             <div class="syllabus_courses_list">
               <div class="<%=index == 0 ? 'sy_courses_open' : 'sy_courses_close' %>">
@@ -68,6 +68,7 @@
 
 
             <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr', :title => '管理课程' %>
+          </div>
         <% end %>
         <div>
           <ul class="wlist" id="pages" >
@@ -78,7 +79,6 @@
     <% else %>
         <p class="nodata"><%= l(:label_no_data) %></p>
     <% end %>
-  </div>
 </div>
 
 <script type="text/javascript">
@@ -91,22 +91,27 @@
             var tmpHeight = $(".syllabus_box").height() + diffHeight;
             $(".syllabus_box").css("height", tmpHeight);
         }
-        $(".syllabus_courses_list").toggle(function(){
-            $(this).next().hide();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
-            //$(this).parent().next().show();
-        },function(){
-            $(this).next().show();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
-        });
-        $(".sy_courses_close").toggle(function(){
-            //$(this).hide();
-            $(this).next().show();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
-            //$(this).parent().next().show();
-        },function(){
-            $(this).next().hide();
-            $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+
+        $(".syllabus_courses_list").each(function(){
+            var syStaust = $(this).children(":first-child");
+
+            if (syStaust.hasClass("sy_courses_open")){
+                $(this).toggle(function(){
+                    $(this).next().hide();
+                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+                },function(){
+                    $(this).next().show();
+                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+                });
+            }else{
+                $(this).toggle(function(){
+                    $(this).next().show();
+                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
+                },function(){
+                    $(this).next().hide();
+                    $(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
+                });
+            }
         });
     });
 </script>
\ No newline at end of file
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index 24f625e03..ddf686b6a 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -19,7 +19,7 @@
         <%= form_for('new_form',:url =>  leave_user_message_path(@user.id), :html =>{:id => "user_feedback_new"}, :method => "post") do |f|%>
             <%=render :partial => "jour_form", :locals => {:f => f} %>
             <input id="private_flag" name="private" type="hidden" value="0"/>
-            <a href="javascript:void(0);" class="blue_n_btn fr" id="submit_feedback_user" style="margin-top:6px;" >留言</a>
+            <a href="javascript:void(0);" class="blue_n_btn fr mt5" id="submit_feedback_user" >留言</a>
             <a href="javascript:void(0);" class="greyBtn2 postReplySubmit mt5 mr15" id="private_submit_feedback_user">私信</a>
         <% end %>
       </div>

From afe16cc99c2ae25f1d40d05ab72dcd69332f7ae1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 1 Jul 2016 14:13:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84js=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_syllabus_list.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_syllabus_list.html.erb b/app/views/users/_user_syllabus_list.html.erb
index a9854566e..3cc7bf61c 100644
--- a/app/views/users/_user_syllabus_list.html.erb
+++ b/app/views/users/_user_syllabus_list.html.erb
@@ -67,7 +67,7 @@
             </div><!--syllabus_class_box end-->
 
 
-            <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr', :title => '管理课程' %>
+            <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr',:target =>'_blank', :title => '查看课程' %>
           </div>
         <% end %>
         <div>
@@ -89,7 +89,7 @@
         if (rightHeight < leftHeight) {
             var diffHeight = leftHeight - rightHeight;
             var tmpHeight = $(".syllabus_box").height() + diffHeight;
-            $(".syllabus_box").css("height", tmpHeight);
+            $(".syllabus_box").css("minHeight", tmpHeight);
         }
 
         $(".syllabus_courses_list").each(function(){