组织资源栏目添加文件标签功能

app/views/files/_org_subfield_list.html.erb

@@ -14,7 +14,6 @@
   </p>
 </div>
 <div class="cl"></div>
-
 <!--<div class="files_tag" id="files_tag">-->
   <!--<%#= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => course,:tag_name => @tag_name}%>-->
 <!--</div>-->
@@ -40,11 +39,10 @@
               <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
             </div>
             <div class="cl"></div>
-            <!--<div class="tag_h">-->
+            <div class="tag_h">
-              <!--&lt;!&ndash; container_type = 1 代表是课程里的资源 &ndash;&gt;-->
+              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
-              <!--<%#= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>-->
+              <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
-              <!--<%#= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>-->
+            </div>
-            <!--</div>-->
             <div class="cl"></div>
           </div><!---re_con_box end-->
       <% end %>

app/views/files/_subfield_files.html.erb

@@ -70,7 +70,7 @@
     <div class="re_top" style="width:710px;">
       <%= form_tag( search_files_in_subfield_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search f_l",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
-          <%= submit_tag "栏目内搜索", :class => "re_schbtn b_lblue",:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
+          <%= submit_tag "栏目内搜索", :class => "re_schbtn b_lblue",:style => 'width:72px;',:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
           <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
       <% end %>
       <%# if is_org_subfield_teacher(User.current,@org_subfield) || (@org_subfield.publish_resource==1 && User.current.member_of_org_subfield?(@org_subfield) ) %>  <!-- show_window('light','fade','20%','35%')-->
@@ -88,7 +88,7 @@
     </div><!---re_top end-->
     <div class="cl"></div>
 
-    <div class="re_con" id="org_subfield_list">
+    <div class="reCon" id="org_subfield_list">
       <%= render :partial => 'org_subfield_list',:locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments}  %>
     </div><!---re_con end-->