Merge branch 'develop' into szzh

app/views/attachments/file.html.erb

@@ -1,3 +1,8 @@
+<div id="wrapper">
+  <div id="wrapper2">
+    <div id="wrapper3">
+      <div id="main" class="nosidebar">
+        <div id="content_">
           <h3><%=h @attachment.filename %></h3>
 
           <div class="attachments">
@@ -24,3 +29,10 @@
           <% content_for :header_tags do -%>
               <%= stylesheet_link_tag "scm" -%>
           <% end -%>
+          <div style="clear:both;"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+

app/views/layouts/base_courses.html.erb

@@ -1,5 +1,5 @@
 <%# course_model %>
-<% teacher_num = teacherCount(@course) %>
+<% teacher_num = searchTeacherAndAssistant(@course).count %>
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>