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

app/controllers/tags_controller.rb

@@ -317,6 +317,14 @@ class TagsController < ApplicationController
     when '8'
       @obj = OpenSourceProject.find_by_id(obj_id)
       @obj_pages, @open_source_projects_results, @results_count = for_pagination(get_open_source_projects_by_tag(selected_tags))
+    when '10'
+        @obj = Attachment.find_by_id(obj_id)
+
+        # modifed by Long Jun
+        # this is used to find the attachments that came from the same project and tagged with the same tag.
+        #@result = get_attachments_by_project_tag(selected_tags, @obj)
+        @result = get_attachments_by_tag(selected_tags)
+        @obj_pages, @attachments_results, @results_count = for_pagination(@result)
     when '9' then
       @obj = Course.find_by_id(obj_id)
       @obj_pages, @courses_results, @results_count = for_pagination(get_courses_by_tag(selected_tags))

app/views/attachments/_form_course.html.erb

@@ -38,7 +38,7 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
 <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:class =>"sub_btn" %>
+<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
 <%= file_field_tag 'attachments[dummy][file]',
       :id => '_file',
       :class => 'file_selector',

app/views/files/_attachement_list.html.erb

@@ -22,7 +22,7 @@
 </span>
 </div>
 
-<button name="button" class="f_l ml10" onclick="_file.click()" onmouseover="this.focus()" type="button"><%= l(:label_browse)%></button>
+<button name="button" class="sub_btn" onclick="_file.click()" onmouseover="this.focus()" type="button"><%= l(:label_browse)%></button>
 <%= file_field_tag 'attachments[dummy][file]',
                    :id => '_file',
                    :class => 'file_selector',

app/views/tags/remove_tag_new.js.erb

@@ -1,6 +1,11 @@
 //本js使用的新的tag显示方法
 <% if @object_flag == "6"%>
 $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
+<% end %>
+<% if @object_flag == "10"%>
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
 $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
                      :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
 <% end %>

public/javascripts/attachments.js

@@ -21,7 +21,6 @@ function addFile(inputEl, file, eagerUpload) {
     var fileSpan = $('<span>', { 'id': 'attachments_' + attachmentId, 'class':'attachment' });
 
     fileSpan.append(
-        $('<input>', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
         $('<input>', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
         $('<input>', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('descriptionPlaceholder') } ).toggle(!eagerUpload),
         $('<span >'+$(inputEl).data('fieldIsPublic')+':</span>').attr({  'class': 'ispublic-label' }) ,