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

app/views/files/_new.html.erb

@@ -5,21 +5,32 @@
 <%= form_tag(project_files_path(project), :multipart => true, :class => "tabular") do %>
 <div class="box">
 
-<% if versions.any? %>
-<p><label for="version_id"><%=l(:field_version)%></label>
-<%= select_tag "version_id", content_tag('option', '') +
-                             options_from_collection_for_select(versions, "id", "name") %></p>
-<% end %>
+  <p>
+  <table>
+    <tr>
+      <% if versions.any? %>
+          <td><p><%= l(:field_version) %></p></td>
+          <td>
+            <%= select_tag "version_id", content_tag('option', '') +
+                    options_from_collection_for_select(versions, "id", "name"), {style: 'width:100px'} %>
+          </td>
+      <% end %>
+
+      <% if attachmenttypes.any? %>
+      <td><%= l(:attachment_type) %></label></td>
+      <td>
+             <%= select_tag "attachment_type",
+                           options_from_collection_for_select(attachmenttypes, "id",
+                                                              "typeName", 2), {style: 'width:100px'} %>
+      </td>
+      <% end %>
+    </tr>
+  </table>
+
 
-  <% if attachmenttypes.any? %>
-      <p>      <label for="attachment_type"><%=l(:attachment_type)%></label>
-        <%= select_tag "attachment_type",
-                options_from_collection_for_select(attachmenttypes, "id",
-                                                   "typeName") %>
-      </p>
-  <% end %>
+  </p>
 
-<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
+<p><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 </div>
 <%= submit_tag l(:button_add) %>
 <% end %>

app/views/files/_show_all_attachment.html.erb

@@ -20,6 +20,7 @@
     <%= 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>
@@ -51,15 +52,14 @@
               <%= link_to(image_tag('delete.png'), attachment_path(file),
                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
             </td>
-          </tr>
-          <tr>
-            <td class='description' colspan="6">
+            <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>
+              <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
+              </div>
             </td>
           </tr>
       <% end -%>

app/views/files/_sort_by_attachtypel.html.erb

@@ -20,6 +20,7 @@
     <%= 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>
@@ -47,17 +48,15 @@
         <%= link_to(image_tag('delete.png'), attachment_path(file),
         :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
       </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>
+    <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>
     <% end -%>
     <% end -%>

config/locales/zh.yml

@@ -143,7 +143,7 @@ zh:
   attachment_all: "全部"
   attachment_sufix_browse: "文件类型"
   attachment_browse: "内容类型"
-  attachment_type: '资源分类'
+  attachment_type: '分类'
   general_text_No: '否'
   general_text_Yes: '是'
   general_text_no: '否'

public/stylesheets/application.css

@@ -1319,7 +1319,7 @@ tr.entry td.filename_no_report { width: 70%; }
 tr.entry td.size { text-align: right; font-size: 90%; }
 tr.entry td.revision, tr.entry td.author { text-align: center; }
 tr.entry td.age { text-align: right; }
-tr.entry.file td.filename a { margin-left: 16px; }
+tr.entry.file td.filename a { margin-center: 16px; }
 tr.entry.file td.filename_no_report a { margin-left: 16px; }
 
 tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}