From 33365f7ea6829b536821ba1397aba1531ea1822b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 14 May 2015 16:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=97=B6=E9=99=84=E4=BB=B6=E6=98=BE=E7=A4=BA=E7=A7=BB?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_form.html.erb    |  3 +++
 app/views/homework_attach/edit.html.erb | 30 +++++++++++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 2e8800617..845e2b6a0 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -17,6 +17,7 @@
 
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
+    <div class="cl"></div>
   <% end %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
@@ -34,10 +35,12 @@
 
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
+    <div class="cl"></div>
   <% end %>
 <% end %>
 </span>
   <% project = project %>
+  <div class="cl"></div>
   <span class="add_attachment" style="font-weight:normal;">
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
     <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
diff --git a/app/views/homework_attach/edit.html.erb b/app/views/homework_attach/edit.html.erb
index e31c5008f..16b9d2c7e 100644
--- a/app/views/homework_attach/edit.html.erb
+++ b/app/views/homework_attach/edit.html.erb
@@ -75,16 +75,32 @@
             <%= f.text_area :description, :rows => 8, :name => "homework_description", :class => "w620",
                             :maxlength => 3000, :placeholder => "最多3000个汉字"  %>
           </p>
-          <p>
-            <label style="float: left;">
+            <!--<div class="cl"></div>-->
+          <!--<p>-->
+            <!--<label style="float: left;">-->
+              <!--&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：-->
+            <!--</label>-->
+            <!--<div style="float: left;padding-bottom: 15px;">-->
+              <!--<%#= render :partial => 'attachments/form', :locals => {:container => @homework}%>-->
+            <!--</div>-->
+          <!--</p>-->
+            <!--<div class="cl"></div>-->
+
+
+            <div class="cl"></div>
+            <label style="float: left;padding-left: 15px;">
               &nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：
             </label>
-            <div style="float: left;padding-bottom: 15px;">
-              <%= render :partial => 'attachments/form', :locals => {:container => @homework}%>
+            <!--<div style="float: left;margin-left: 5px;">-->
+              <!--<%#= render :partial => 'attachments/form',locals: {:container => @homework}%>-->
+            <!--</div>-->
+
+            <div style="float: left;">
+              <%= render :partial => 'attachments/form', :locals => {:container => @homework} %>
             </div>
-          </p>
             <div class="cl"></div>
-          <p>
+
+          <p style="padding-top: 10px;">
               <label>&nbsp;&nbsp;&nbsp;开发项目
                 <img src="/images/bid/pic_question.png" width="16" height="16"
                      title="项目是一种由用户创建的基于网络的协作空间，能够为个人或小组提供分布式的协同交流和资料管理等方面的支持。
@@ -101,7 +117,7 @@
             <span style="float: left;">
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             </span>
-            <a href="javascript:" class="tijiao" onclick="submit_homework_form();">
+            <a href="javascript:void(0)" class="tijiao" onclick="submit_homework_form();">
               <%= l(:label_button_ok)  %>
             </a>
             <a href="javascript:history.back()" class="tijiao">取&nbsp;&nbsp;消</a>