From 301e44c6958325743e742dea154660b831c63c0f Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Thu, 16 Apr 2015 12:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=84=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=8A=9F=E8=83=BD=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_form.html.erb |  3 +++
 app/views/issues/_edit.html.erb      | 17 +++++++++--------
 app/views/issues/show.html.erb       |  1 +
 public/stylesheets/project.css       |  6 +++++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index d3ce35caf..7e86b098b 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -32,6 +32,9 @@
       %>
       <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
 
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
 <% end %>
 </span>
   <script type='text/javascript'>
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index 02c262dbe..3f5b30ecd 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -4,34 +4,35 @@
     <!--编辑的整个属性-->
     <% if @edit_allowed || !@allowed_statuses.empty? %>
         <div id="all_attributes" style="display:none;">
-            <%= render :partial => 'form', :locals => {:f => f} %>
+          <%= render :partial => 'form', :locals => {:f => f} %>
         </div>
     <% end %><!--end-->
-    <div class="ping_C mb10"> </div>
+    <div class="ping_C mb10"></div>
     <!--<fieldset><legend><%#= l(:field_notes) %></legend>-->
     <!--回复框-->
     <% if @journals.present? %>
         <div id="history">
-          <%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
+          <%= render :partial => 'history', :locals => {:issue => @issue, :journals => @journals} %>
         </div>
     <% end %>
-    <%= f.text_area :notes, :style =>"width:99%;", :rows => "5", :no_label => true %>
-
+    <fieldset><legend>说明</legend>
+    <%= f.text_area :notes, :style => "width:99%;", :rows => "5", :no_label => true %>
+    </fieldset>
     <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
     <!--<label for="issue_private_notes"><%#= f.check_box :private_notes, :no_label => true %> <%#= l(:field_private_notes) %></label>-->
     <!--<%# end %>-->
 
-    <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
+    <%= call_hook(:view_issues_edit_notes_bottom, {:issue => @issue, :notes => @notes, :form => f}) %>
     <!--</fieldset>-->
 
     <!--<fieldset><legend><%#= l(:label_attachment_plural) %></legend>-->
-    <p style="padding-top: 5px;"><%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
+    <!--<p style="padding-top: 5px;"><%= render :partial => 'attachments/new_form', :locals => {:container => @issue} %>-->
     <!--</fieldset>-->
 
     <div class="cl"></div>
     <%= f.hidden_field :lock_version %>
     <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
-    <%= hidden_field_tag 'reference_user_id', params[:reference_user_id]%>
+    <%= hidden_field_tag 'reference_user_id', params[:reference_user_id] %>
 <% end %>
 
 <div id="preview" class="wiki"></div>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 520439c94..e170cb717 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -115,6 +115,7 @@
       </div>
   <% end %>
   <!--留言-->
+  <br>
   <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="$('#issue-form').submit();">
     <%= l(:button_submit) %>
   </a>
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index f0490002f..da5211fad 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -339,7 +339,8 @@ a:hover.st_add{ color:#ff8e15;}
     padding-top: 2px;
     padding-bottom: 3px;
 }
-
+fieldset {border: 1px solid #e4e4e4; margin:0;}
+legend {color: #484848;}
 /*  新建问题 */
 .label{ width:80px; text-align:right; font-size:14px;    display:block; float:left;}
 .label02{ width:110px; text-align:right; font-size:14px;    display:block; float:left;}
@@ -490,3 +491,6 @@ p.percent {
     padding-top: 5px;
     font-size: 0.9em;
 }
+
+/*导出*/
+a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
\ No newline at end of file