Merge branch 'cxt_course' into develop

app/views/users/_user_syllabus_list.html.erb

@@ -17,7 +17,6 @@
     <div class="cl"></div>
   </div>
 
-
     <% if @syllabus.any? %>
         <% @syllabus.each_with_index do |syllabus, index|%>
           <div class="syllabus_courses_box">
@@ -27,7 +26,6 @@
                 <span class="<%=index == 0 ? 'icons_sy_open' : 'icons_sy_close' %> fl mr5"></span>
                 <h3 class="syllabus_courses_title fl"><%=syllabus.title %></h3>
               </div>
-              <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr',:target => '_blank', :title => '查看课程' %>
               <p class="fl sy_p_grey">更新时间：<%=format_date syllabus.updated_at %>
                 <span class="mr10"></span>创建老师：<%=syllabus.user.show_name %>
                 <span class="mr10"></span>班级：<%=courses.count %>
@@ -49,7 +47,7 @@
                                   <div class="cl"></div>
                                 </div>
                                 <div class="">
-                                  <p class="fl grayTxt ">更新：<%=format_date(Time.at(course.time)) %><span class="mr10"></span>学期：<%=current_time_and_term(course) %></p>
+                                  <p class="fl grayTxt ">更新：<%=course.time %><span class="mr10"></span>学期：<%=current_time_and_term(course) %></p>
                                   <p class="list-info fr grayTxt"><span><%=studentCount course %></span><span>学生</span><span>|</span><span><%=visable_course_homework course %></span><span>作业</span><span>|</span><span><%=visable_attachemnts_incourse(@course).count %></span><span>资源</span></p>
                                   <div class="cl"></div>
                                 </div>
@@ -67,8 +65,11 @@
                 <% end %>
               </ul>
             </div><!--syllabus_class_box end-->
+
+
+            <%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr',:target =>'_blank', :title => '查看课程' %>
           </div>
-      <% end %>
+        <% end %>
         <div>
           <ul class="wlist" id="pages" >
             <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
@@ -88,25 +89,29 @@
         if (rightHeight < leftHeight) {
             var diffHeight = leftHeight - rightHeight;
             var tmpHeight = $(".syllabus_box").height() + diffHeight;
-            $(".syllabus_box").css("height", tmpHeight);
+            $(".syllabus_box").css("minHeight", tmpHeight);
         }
-        $(".sy_courses_open").toggle(function(){
-            //$(this).hide();
-            $(this).parent().next().hide();
-            $(this).children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
-            //$(this).parent().next().show();
-        },function(){
-            $(this).parent().next().show();
-            $(this).children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
-        });
-        $(".sy_courses_close").toggle(function(){
-            //$(this).hide();
-            $(this).parent().next().show();
-            $(this).children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
-            //$(this).parent().next().show();
-        },function(){
-            $(this).parent().next().hide();
-            $(this).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>

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>