From 4bedc81524efc9d19ce9a3ef4ce55e53517a1477 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 23 Oct 2015 16:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_student_work_attachment_form.html.erb    | 70 +++++++++----------
 public/stylesheets/new_user.css               |  1 +
 public/stylesheets/public.css                 |  1 +
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/app/views/student_work/_student_work_attachment_form.html.erb b/app/views/student_work/_student_work_attachment_form.html.erb
index 7802f6eb6..265ff9be7 100644
--- a/app/views/student_work/_student_work_attachment_form.html.erb
+++ b/app/views/student_work/_student_work_attachment_form.html.erb
@@ -1,35 +1,35 @@
-<div class="fl">
-  <span id="attachments_fields<%= work.id%>" xmlns="http://www.w3.org/1999/html">
-  </span>
-  <div class="cl"></div>
-  <span class="add_attachment" style="font-weight:normal;">
-    <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file#{work.id}').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
-    <%= file_field_tag 'attachments[dummy][file]',
-                       :id => "_file#{work.id}",
-                       :class => 'file_selector',
-                       :multiple => true,
-                       :onchange => "addInputFiles_board(this, '#{work.id}');",
-                       :style => 'display:none',
-                       :data => {
-                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
-                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
-                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                               :upload_path => uploads_path(:format => 'js'),
-                               :description_placeholder => l(:label_optional_description),
-                               :field_is_public => l(:field_is_public),
-                               :are_you_sure => l(:text_are_you_sure),
-                               :file_count => l(:label_file_count),
-                               :delete_all_files => l(:text_are_you_sure_all),
-                               :containerid => "#{work.id}"
-                       } %>
-    <span id="upload_file_count<%= work.id%>">
-      <%= l(:label_no_file_uploaded) %>
-    </span>
-    (<%= l(:label_max_size) %>:
-    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
-  </span>
-  <% content_for :header_tags do %>
-      <%= javascript_include_tag 'attachments' %>
-  <% end %>
-</div>
-
+<div class="fl">
+  <span id="attachments_fields<%= work.id%>" xmlns="http://www.w3.org/1999/html">
+  </span>
+  <div class="cl"></div>
+  <span class="add_attachment" style="font-weight:normal;">
+    <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file#{work.id}').click();",:onmouseover => 'this.focus()',:class => 'sub_btn mb0' %>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => "_file#{work.id}",
+                       :class => 'file_selector',
+                       :multiple => true,
+                       :onchange => "addInputFiles_board(this, '#{work.id}');",
+                       :style => 'display:none',
+                       :data => {
+                               :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                               :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                               :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                               :upload_path => uploads_path(:format => 'js'),
+                               :description_placeholder => l(:label_optional_description),
+                               :field_is_public => l(:field_is_public),
+                               :are_you_sure => l(:text_are_you_sure),
+                               :file_count => l(:label_file_count),
+                               :delete_all_files => l(:text_are_you_sure_all),
+                               :containerid => "#{work.id}"
+                       } %>
+    <span id="upload_file_count<%= work.id%>">
+      <%= l(:label_no_file_uploaded) %>
+    </span>
+    (<%= l(:label_max_size) %>:
+    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+  </span>
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index c1ddfa457..a3b7d7e76 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -105,6 +105,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .mt12 { margin-top:12px;}
 .mt15 {margin-top:15px;}
 .mt19 {margin-top:19px !important;}
+.mb0 {margin-bottom: 0px !important;}
 .mb4{ margin-bottom:4px;}
 .mb5{ margin-bottom:5px;}
 .mb8 {margin-bottom:8px !important;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 630b96bcd..d45b6f94d 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -108,6 +108,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt15 {margin-top:15px;}
 .mt19 {margin-top:19px !important;}
 .ml70{margin-left: 70px;}
+.mb0 {margin-bottom: 0px !important;}
 .mb4{ margin-bottom:4px;}
 .mb5{ margin-bottom:5px;}
 .mb8 {margin-bottom:8px;}