From 02b4029e8c6035525f911882a0e55d1c9e475b1d Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Thu, 17 Jul 2014 15:05:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_course_file.html.erb  | 6 ++++--
 app/views/files/_project_file.html.erb | 5 ++++-
 config/locales/en.yml                  | 1 +
 config/locales/zh.yml                  | 1 +
 public/stylesheets/application.css     | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index d9913539f..a1547bc2b 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -11,7 +11,9 @@
   <div id="file_buttons" class="nhidden">
     <%= link_to(l(:label_upload_files), 'javascript:void(0);', :class => 'icon m5p5 button_submit', :onclick => "$('#relation_file_div').slideUp();$('#upload_file_div').slideToggle('slow');") if User.current.allowed_to?(:manage_files, @course) %>
     <%= link_to(l(:label_relation_files), 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @course) %>
-
+    <p></p>
+    <div class="box" id="files-box">
+      <label for="files-box" style="font-weight:bold;">&nbsp;&nbsp;<%= l(:label_files_filter) %></label>
     <% if attachmenttypes.any? %>
         &nbsp; &nbsp; &nbsp;
         <label for="attachment_browse_label"><%= l(:attachment_browse) %></label>
@@ -24,7 +26,7 @@
         <%= select_tag "attach_sufix_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_for_select(sufixtypes),
                        :onchange => "course_attachment_contenttypes_searchex(this.value)" %>
     <% end %>
-
+    </div>
     <div id="upload_file_div" class="relation_file_div hidden">
       <%= render :partial => 'course_new', locals: {course: @course} %>
     </div>
diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb
index 1212db052..67067a638 100644
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@@ -11,7 +11,9 @@
   <div id="file_buttons" class="nhidden">
     <%= link_to(l(:label_upload_files), 'javascript:void(0);', :class => 'icon m5p5 button_submit', :onclick => "$('#relation_file_div').slideUp();$('#upload_file_div').slideToggle('slow');") if User.current.allowed_to?(:manage_files, @project) %>
     <%= link_to(l(:label_relation_files), 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @project) %>
-
+    <p></p>
+    <div class="box" id="files-box">
+      <label for="files-box" style="font-weight:bold;">&nbsp;&nbsp;<%= l(:label_files_filter) %></label>
     <% if attachmenttypes.any? %>
         &nbsp; &nbsp; &nbsp;
         <label for="attachment_browse_label"><%= l(:attachment_browse) %></label>
@@ -24,6 +26,7 @@
         <%= select_tag "attach_sufix_browse", content_tag(:option, l(:attachment_all), :value => '0') +options_for_select(sufixtypes),
                        :onchange => "attachment_contenttypes_searchex(this.value)" %>
     <% end %>
+    </div>
 
     <div id="upload_file_div" class="relation_file_div hidden">
       <%= render :partial => 'new', locals: {project: @project} %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index db673c69c..6c07f5723 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -937,6 +937,7 @@ en:
   label_cross_project_hierarchy: With project hierarchy
   label_cross_project_system: With all projects
   label_gantt_progress_line: Progress line
+  label_files_filter: Files Filter：
 
   button_login: Login
   button_submit: Submit
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 96c7b0560..c701ce41a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1742,6 +1742,7 @@ zh:
   label_file_number: 文档的数量
   label_code_submit_number: 代码提交数量
   label_topic_number: 讨论区帖子数量
+  label_files_filter: 资源过滤：
   
   label_course_contribute_to: 参与了 %{project_count} 个项目：
   label_x_course_contribute_to:
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index aae90eb4e..a8d030b6b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1852,7 +1852,7 @@ span.required {color: #bb0000;}
 a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
 a.remove-upload:hover {text-decoration:none !important;}
 #attachments_fields input.is_public_checkbox {width:20px;}
-#attachments_fields span.ispublic-label {display:inline-block;width:50px;margin-left:10px; }
+#attachments_fields span.ispublic-label {display:inline-block;width:30px;margin-left:10px; }
 
 /*gcm upload file count and deleteall*/
 #upload_file_count #count {color:red; font-size:1.5em;}