From 261ebb916c21ec51e8987bc445d91d0ea960c187 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 27 Apr 2015 20:25:28 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BD=93login=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E5=8C=BF=E8=AF=84=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=98=9F=E6=98=9F=E6=8D=A2=E8=A1=8C=202=E3=80=81?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8=E7=9A=84=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=B8=8E?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E5=88=9B=E5=BB=BA=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_form.html.erb       | 10 +---------
 app/views/bids/_homework.html.erb          | 11 -----------
 app/views/homework_attach/_review.html.erb |  2 +-
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
index 7e86b098b..2e8800617 100644
--- a/app/views/attachments/_form.html.erb
+++ b/app/views/attachments/_form.html.erb
@@ -18,7 +18,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 %>" 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;") %>
@@ -37,14 +37,6 @@
   <% end %>
 <% end %>
 </span>
-  <script type='text/javascript'>
-      //    function CompatibleSend()
-      //    {
-      //        var obj=document.getElementById("_file");
-      //        var file= $(obj).clone();
-      //        file.click();
-      //    }
-  </script>
   <% project = project %>
   <span class="add_attachment" style="font-weight:normal;">
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb
index a7a703c05..0cb1ff7cc 100644
--- a/app/views/bids/_homework.html.erb
+++ b/app/views/bids/_homework.html.erb
@@ -1,16 +1,5 @@
 <%= render_flash_messages %>
 <div id="put-bid-form" style="display: none">
-	<%= form_for HomeworkAttach.new, :url => {:controller => 'bids', :action => 'add_homework'},	:update => "bidding_project_list",	:complete => '$("#put-bid-form").hide();', :html => {:multipart => true, :id => 'add_homework_form'} do |f| %>
-        <fieldset>
-            <legend>
-                <%= l(:label_attachment_plural) %>
-            </legend>
-            <p id="put-bid-form-partial">
-                <%= render :partial => 'attachments/form' %>
-            </p>
-        </fieldset>
-        <%= submit_tag l(:button_create), :onclick => "return true" %>
-	<% end %>
 	<script type="text/javascript">
 		function j_submit () {
 			alert('start');
diff --git a/app/views/homework_attach/_review.html.erb b/app/views/homework_attach/_review.html.erb
index 921f16c8e..4849dab76 100644
--- a/app/views/homework_attach/_review.html.erb
+++ b/app/views/homework_attach/_review.html.erb
@@ -15,7 +15,7 @@
             <div class="ping_distop">
               <span>
                 <% if show_name %>
-                  <%= link_to user, user_path(user),:style => " font-weight:bold; color:#15bccf; margin-right:5px; background:none;", :target => "_blank"%>
+                  <%= link_to user, user_path(user),:style => " font-weight:bold; color:#15bccf; margin-right:5px; background:none;max-width: 40px;overflow: hidden;", :target => "_blank", title: user%>
                 <% else%>
                   <span style=" font-weight:bold; color:#15bccf; margin-right:5px; background:none;">
                     <%= l(:label_anonymous) %>