Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

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%>">
+      </div>
-    <%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %>
+      <div style="float:left;max-width:220px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="<%= attachment.description%>">
-  </span>
+    <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+  </div>
   <span class="size">(
     <%= number_to_human_size attachment.filesize %>)
   </span>

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);

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})%>");
+$("#v_subject").focus();
+$("#v_subject").blur();

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">