From fd4a2b19c8cd8dfdeae2383cbc894446ff098522 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 25 Sep 2015 16:11:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E8=80=81=E5=B8=88=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 800f2ff9d..fe0b5ef84 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/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)) %>

From 9b5a362e24ace68ef2a98a4d5d795e63db9029c4 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 25 Sep 2015 16:57:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/file.html.erb | 58 +++++++++++++++++------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/app/views/attachments/file.html.erb b/app/views/attachments/file.html.erb
index 75fa1858c..0ce174545 100644
--- a/app/views/attachments/file.html.erb
+++ b/app/views/attachments/file.html.erb
@@ -1,26 +1,38 @@
-<h3><%=h @attachment.filename %></h3>
+<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">
-<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
-   <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
-<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
-   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
-   <span class="size">
-     <% if @attachment!=nil &&(@attachment.container_type == 'Document' || @attachment.container_type == 'WikiPage') &&
-        User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %>
-          <%= l(:review_assignments)+":" %><%=    link = link_to(l(:button_add), {:controller => 'code_review',
-                                          :action => 'assign', :action_type => 'attachment',
-                                          :id=>@attachment.project,
-                                          :change_id => '', :attachment_id => @attachment.id,
-                                         }, :class => 'icon icon-add') %>
-        <% end %>
-   </span></p>
+          <div class="attachments">
+            <p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
+              <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
+            <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
+              <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
+           <span class="size">
+             <% if @attachment!=nil &&(@attachment.container_type == 'Document' || @attachment.container_type == 'WikiPage') &&
+                     User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %>
+                  <%= l(:review_assignments)+":" %><%=    link = link_to(l(:button_add), {:controller => 'code_review',
+                                                                                          :action => 'assign', :action_type => 'attachment',
+                                                                                          :id=>@attachment.project,
+                                                                                          :change_id => '', :attachment_id => @attachment.id,
+                                                                                       }, :class => 'icon icon-add') %>
+                <% end %>
+           </span></p>
+          </div>
+          &nbsp;
+          <%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
+
+          <% html_title @attachment.filename %>
+
+          <% content_for :header_tags do -%>
+              <%= stylesheet_link_tag "scm" -%>
+          <% end -%>
+          <div style="clear:both;"></div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
-&nbsp;
-<%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
 
-<% html_title @attachment.filename %>
-
-<% content_for :header_tags do -%>
-    <%= stylesheet_link_tag "scm" -%>
-<% end -%>