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

app/views/files/_course_file.html.erb

@@ -13,7 +13,37 @@
     <%= link_to(l(:label_upload_files), 'javascript:void(0);', :class => 'icon m5p5 button_submit', :onclick => "$('#relation_file_div').slideUp();$('#upload_file_div').slideToggle('slow');") if User.current.allowed_to?(:manage_files, @course) %>
     <%= link_to(l(:label_relation_files), 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @course) %>
     <p></p>
+    <div id="upload_file_div" class="relation_file_div hidden">
+      <%= render :partial => 'course_new', locals: {course: @course} %>
+    </div>
 
+    <div id="relation_file_div" class="relation_file_div hidden">
+      <fieldset>
+        <legend>搜索</legend>
+        <%= form_tag(
+                    attachments_autocomplete_path(:format => 'js'),
+                    :remote => true,
+                    :method => :post) do %>
+            <%= label_tag(:attach_search, "按关键字搜索:") %>
+            <%= text_field_tag(:attach_search) %>
+            <%#= submit_tag("Search") %>
+        <% end -%>
+        <%= form_tag course_attach_relation_path(:format => 'js'),
+                     method: :post,
+                     remote: true,
+                     id: "relation_file_form",
+                     :class => 'hidden' do %>
+            <%= hidden_field_tag(:class_name, 'course') %>
+            <%= hidden_field_tag(:class_id, params[:course_id]) %>
+            <div id="relation_file">
+            </div>
+            <div class="kclearfix" style='margin-top: 10px;'>
+              <%= submit_tag(l(:button_add)) -%>
+            </div>
+        <% end -%>
+      </fieldset>
+      <div class="line_under" style="margin:20px 0px;"></div>
+    </div>
 
   </div>
   <div class="box" id="files-box">

app/views/files/_course_new.html.erb

@@ -20,28 +20,6 @@
 <% end %>
 <div class="line_under" style="margin:20px 0px;"></div>
 
-
-  <fieldset>
-	<legend><%=l(:label_attachment_new)%></legend>
-		<% attachmenttypes = course.attachmenttypes %>
-		<%= error_messages_for 'attachment' %>
-		<%= form_tag(course_files_path(course), :multipart => true,:remote => true,:method => :post,:name=>"upload_form", :class => "tabular") do %>
-	
-		  <p>
-		    <% if attachmenttypes.any? %>
-		        <%= l(:attachment_type) %></label>
-		        <%= select_tag "attachment_type",
-		                       options_from_collection_for_select(attachmenttypes, "id",
-		                                                          "typeName", 2), {style: 'width:100px'} %>
-		   <% end %>
-		  </p>
-		
-		<p><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
-	
-		<%= submit_tag l(:button_add) %>
-		<% end %>
-   </fieldset>
-
 <script type='text/javascript'>
     function tagAddClick(id,objId,objTag)
     {