diff --git a/app/views/files/_new.html.erb b/app/views/files/_new.html.erb
index 4c1b97fa..9d62ca37 100644
--- a/app/views/files/_new.html.erb
+++ b/app/views/files/_new.html.erb
@@ -5,21 +5,32 @@
<%= form_tag(project_files_path(project), :multipart => true, :class => "tabular") do %>
-<% if versions.any? %>
-
-<%= select_tag "version_id", content_tag('option', '') +
- options_from_collection_for_select(versions, "id", "name") %>
-<% end %>
+
+
+
+ <% if versions.any? %>
+ <%= l(:field_version) %> |
+
+ <%= select_tag "version_id", content_tag('option', '') +
+ options_from_collection_for_select(versions, "id", "name"), {style: 'width:100px'} %>
+ |
+ <% end %>
- <% if attachmenttypes.any? %>
-
- <%= select_tag "attachment_type",
- options_from_collection_for_select(attachmenttypes, "id",
- "typeName") %>
-
- <% end %>
+ <% if attachmenttypes.any? %>
+ <%= l(:attachment_type) %> |
+
+ <%= select_tag "attachment_type",
+ options_from_collection_for_select(attachmenttypes, "id",
+ "typeName", 2), {style: 'width:100px'} %>
+ |
+ <% end %>
+
+
-
<%= render :partial => 'attachments/form' %>
+
+
+
+
<%=l(:label_attachment_plural)%><%= render :partial => 'attachments/form' %>
<%= submit_tag l(:button_add) %>
<% end %>
diff --git a/app/views/files/_show_all_attachment.html.erb b/app/views/files/_show_all_attachment.html.erb
index 07dc6a27..d34f95f7 100644
--- a/app/views/files/_show_all_attachment.html.erb
+++ b/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") %>
@@ -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 %>
-
-
-
+ |
-
+
|
<% end -%>
diff --git a/app/views/files/_sort_by_attachtypel.html.erb b/app/views/files/_sort_by_attachtypel.html.erb
index 01c57c49..9df26d7e 100644
--- a/app/views/files/_sort_by_attachtypel.html.erb
+++ b/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") %>
@@ -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 %>
-
-
-
-
-
- |
+
+
+
+ |
<% end -%>
<% end -%>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 3d8a0e54..666b2874 100644
--- a/config/locales/zh.yml
+++ b/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: '否'
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7b0a0099..d786101b 100644
--- a/public/stylesheets/application.css
+++ b/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;}