From 52acd8981f3d6a84fc979bd68c0a5f694e16320d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 27 Mar 2015 15:41:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_new_form.html.erb | 55 +++++++++++++-----------
 app/views/news/_course_form.html.erb     |  7 +--
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/app/views/attachments/_new_form.html.erb b/app/views/attachments/_new_form.html.erb
index e0c668368..696d223fd 100644
--- a/app/views/attachments/_new_form.html.erb
+++ b/app/views/attachments/_new_form.html.erb
@@ -1,4 +1,5 @@
-<span id="attachments_fields" class="attachments_fields">
+<div class="fl">
+  <span id="attachments_fields" class="attachments_fields">
     <% if defined?(container) && container && container.saved_attachments %>
       <% container.attachments.each_with_index do |attachment, i| %>
         <span id="attachments_p<%= i %>">
@@ -10,7 +11,7 @@
           <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
         </span>
   <% end %>
-      <% container.saved_attachments.each_with_index do |attachment, i| %>
+        <% container.saved_attachments.each_with_index do |attachment, i| %>
         <span id="attachments_p<%= i %>">
           <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
           <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
@@ -22,35 +23,37 @@
   <% end %>
 <% end %>
 </span>
-<% project = project %>
-<span class="add_attachment" style="font-weight:normal;">
+  <% project = project %>
+  <span class="add_attachment" style="font-weight:normal;">
   <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
-  <%= file_field_tag 'attachments[dummy][file]',
-                     :id => '_file',
-                     :class => 'file_selector',
-                     :multiple => true,
-                     :onchange => 'addInputFiles(this);',
-                     :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',:project =>project),
-                             :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)
-                     } %>
-  <span id="upload_file_count">
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => 'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFiles(this);',
+                       :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',:project =>project),
+                               :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)
+                       } %>
+    <span id="upload_file_count">
       <%= l(:label_no_file_uploaded)%>
     </span>
     (<%= l(:label_max_size) %>:
-  <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </span>
 
-<% content_for :header_tags do %>
-    <%= javascript_include_tag 'attachments' %>
-<% end %>
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
 
 
+
+</div>
\ No newline at end of file
diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb
index 4f67c0ce6..54d0a1b69 100644
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@@ -5,13 +5,14 @@
   </li>
   <li class="ml45">
     <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
-    <textarea id="news_description" name="news[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="hwork_text fl" onkeyup="regexDescription();"><%= is_new ? '' : @news.description %></textarea>
+    <textarea id="news_description" name="news[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="hwork_text fl" onkeyup="regexDescription();" maxlength="6000"><%= is_new ? '' : @news.description %></textarea>
     <span id="description_notice_span" class="ml55"></span>
   </li>
   <div class="cl"></div>
   <li class="ml45">
-    <label>&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
-    <%= render :partial => 'attachments/form', :locals => {:container => @news} %>
+    <label class="fl">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
+    <%= render :partial => 'attachments/new_form', :locals => {:container => @news} %>
+    <div class="cl"></div>
   </li>
   <li class=" ml90" >
     <% if is_new %>