From 274295c948afe13fc5326283e3b932bbfffc1030 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 17 Mar 2015 14:55:21 +0800
Subject: [PATCH] =?UTF-8?q?#2033=20=E9=A1=B9=E7=9B=AE--=E6=9B=B4=E5=A4=9A-?=
 =?UTF-8?q?-=E6=96=B0=E9=97=BB=EF=BC=9A=E7=BC=96=E8=BE=91=E6=96=B0?=
 =?UTF-8?q?=E9=97=BB=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_form.html.erb  | 18 ++++++++++++++++++
 app/views/news/_form.html.erb         |  2 +-
 app/views/news/_project_show.html.erb |  4 ++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 0949899dd..22dc447f2 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -1,5 +1,22 @@
 <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
+  <% container.attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= 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;") %>
+      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%>
+      <%= if attachment.id.nil?
+            #待补充代码
+          else
+            link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
+          end
+      %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
@@ -17,6 +34,7 @@
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>
+
 <% end %>
 </span>
 <script type='text/javascript'>
diff --git a/app/views/news/_form.html.erb b/app/views/news/_form.html.erb
index 5e5cdf532..024360597 100644
--- a/app/views/news/_form.html.erb
+++ b/app/views/news/_form.html.erb
@@ -1,4 +1,4 @@
-<%= error_messages_for @news %>
+.<%= error_messages_for @news %>
 <div class="add_frame_header" >
 	<%= @project ? l(:label_news_new) : l(:bale_news_notice) %>
 </div>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 874e89e1f..bde061f31 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -72,9 +72,9 @@
                             :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
           <%= render :partial => 'form', :locals => { :f => f } %>
           <%#= submit_tag l(:button_save) %>
-          <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'whiteButton m3p10' %>
+          <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'ButtonColor m3p10' %>
           <%#= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %>
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'ButtonColor m3p10'%>
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>