From 895058f38ecb81c2a0eca44b12fba663516264a0 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 19 May 2015 11:30:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2154:=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E4=B8=8A=E4=BC=A0=E8=AF=BE=E4=BB=B6=EF=BC=8C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E8=B5=84=E6=BA=90=E6=95=B0=E7=BB=9F=E8=AE=A1=E6=9C=AA?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/create.js.erb           | 2 ++
 app/views/layouts/base_courses.html.erb | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index b00ae3612..87bf5b864 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -27,6 +27,8 @@ $('#upload_file_div').slideToggle('slow');
   <%elsif  @course%>
     closeModal();
     $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
+    $("#courses_files_count_info").html("<%= @all_attachments.count%>");
+    $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
   <% end %>
 <% end %>
 $(document).ready(img_thumbnails);
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 6820ccaf3..070a99d08 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -95,7 +95,7 @@
           <span>|&nbsp;</span>
           <%= l(:label_account_identity_student)%>（<%= course_student_link student_num %>）
           <span>|&nbsp;</span>
-          <%= l(:project_module_attachments)%>（<%= link_to course_file_num, course_files_path(@course), :class => 'info_foot_num c_blue' %>）</div>
+          <%= l(:project_module_attachments)%>（<%= link_to course_file_num, course_files_path(@course), :class => 'info_foot_num c_blue',:id=>'courses_files_count_info' %>）</div>
         <div class="cl"></div>
       </div><!--课程信息 end-->
       <div class="info_box">
@@ -127,7 +127,7 @@
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %>
-          <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange" %>
+          <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %>
           <%= link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white') if is_teacher %>
         </div>
         <div class="subNav">

From f3da7979f85389097abf2c0d84ba8bb230b88ab7 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 19 May 2015 12:22:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2476=20:=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE--=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA=EF=BC=9A?=
 =?UTF-8?q?=E5=85=B3=E4=BA=8E=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_project_file_links.html.erb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index a18d819da..fe0e9ab97 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -28,7 +28,8 @@
 <div class="attachments" style="font-weight:normal;">
   <% is_float ||= false %>
   <% for attachment in attachments %>
-      <p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+      <div style="float:left;">
+      <p style="height:14px;line-height:10px;width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
         <%if is_float%>
           <div style="max-width:55%;white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;float: left;">
       <% end%>
@@ -50,9 +51,10 @@
                       :id => attachment,
                       :filename => attachment.filename%>
       <% end %>
-      <span title="<%= attachment.description%>">
-    <%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %>
-  </span>
+      </div>
+      <div style="float:left;max-width:220px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="<%= attachment.description%>">
+    <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+  </div>
   <span class="size">(
     <%= number_to_human_size attachment.filesize %>)
   </span>

From 5184f9a31a830f87ff69cf4e7687fb369e35b27f Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 19 May 2015 13:06:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2622:=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE--=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA=EF=BC=9A?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=97=AE=E9=A2=98=E5=88=97=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E4=B8=AD=E6=9F=90=E9=A1=B5=EF=BC=8C=E6=80=BB=E6=98=AF?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=AF=A5=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9C=80?=
 =?UTF-8?q?=E4=B8=8B=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/index.js.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/issues/index.js.erb b/app/views/issues/index.js.erb
index 34d2eb760..012d01c20 100644
--- a/app/views/issues/index.js.erb
+++ b/app/views/issues/index.js.erb
@@ -1 +1,3 @@
-$("#issue_list").html("<%= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count})%>");
\ No newline at end of file
+$("#issue_list").html("<%= escape_javascript(render :partial => 'issues/list',:locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count})%>");
+$("#v_subject").focus();
+$("#v_subject").blur();
\ No newline at end of file