From 624a7f7bddd94dcca6b77f0e70ddb18b6cbf8bc6 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Wed, 21 May 2014 11:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E8=B5=84=E6=BA=90=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=E7=9A=84tag=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=80=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_show_all_attachment.html.erb |  8 +++----
 app/views/files/_sort_by_attachtypel.html.erb | 21 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/views/files/_show_all_attachment.html.erb b/app/views/files/_show_all_attachment.html.erb
index d34f95f78..07dc6a27f 100644
--- a/app/views/files/_show_all_attachment.html.erb
+++ b/app/views/files/_show_all_attachment.html.erb
@@ -20,7 +20,6 @@
     <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
-    <%= sort_header_tag('tags', :caption => l(:label_tag), :id => "vzebra-tag") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
   </thead>
@@ -52,14 +51,15 @@
               <%= link_to(image_tag('delete.png'), attachment_path(file),
                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
             </td>
-            <td class='filename'  style="font-size: 13px; ">
+          </tr>
+          <tr>
+            <td class='description' colspan="6">
               <div class="tags_area">
                 <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
                 <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
                 <div class="tags_gradint"></div>
               </div>
-              <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
-              </div>
+              <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a></div>
             </td>
           </tr>
       <% end -%>
diff --git a/app/views/files/_sort_by_attachtypel.html.erb b/app/views/files/_sort_by_attachtypel.html.erb
index 9df26d7ed..01c57c490 100644
--- a/app/views/files/_sort_by_attachtypel.html.erb
+++ b/app/views/files/_sort_by_attachtypel.html.erb
@@ -20,7 +20,6 @@
     <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope =>"col", :id=> "vzebra-contenttype")%>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
-    <%= sort_header_tag('tags', :caption => l(:label_tag), :id => "vzebra-tag") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
 </thead>
@@ -48,15 +47,17 @@
         <%= link_to(image_tag('delete.png'), attachment_path(file),
         :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
       </td>
-    <td class='filename'  style="font-size: 13px; ">
-      <div class="tags_area">
-        <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
-        <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
-        <div class="tags_gradint"></div>
-      </div>
-      <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
-      </div>
-    </td>
+    </tr>
+    <tr>
+      <td class='description' colspan="6">
+        <div class="tags_area">
+          <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
+          <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
+          <div class="tags_gradint"></div>
+        </div>
+        <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
+        </div>
+      </td>
     </tr>
     <% end -%>
     <% end -%>