From 990c37061bb7cad212ab3738cca0d44396e52d10 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 3 Nov 2014 18:34:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_new.html.erb                | 12 +++++++-----
 app/views/homework_attach/_addjour.html.erb | 15 +++++++--------
 app/views/homework_attach/_show.html.erb    |  2 --
 config/locales/en.yml                       |  3 ++-
 config/locales/zh.yml                       |  3 ++-
 public/stylesheets/css.css                  |  3 ++-
 6 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/app/views/bids/_new.html.erb b/app/views/bids/_new.html.erb
index 86e8b457d..ef81d8f64 100644
--- a/app/views/bids/_new.html.erb
+++ b/app/views/bids/_new.html.erb
@@ -16,8 +16,6 @@
     function submit1(button)
     {
         $('#jours_submit').parent().submit();
-//        button.submit();
-        alert("d");
     }
 </script>
 
@@ -40,12 +38,16 @@
 	    <td><%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_max_length), :style => "resize: none;", :class => 'noline'%></td>
 	    <% end %>
 	</tr>
+  <tr>
+    <td><%= f.text_field :reference_user_id, :style=>"display:none"%>
+      <a href="#" class="ping_sub" onclick = "clearMessage('bid_message_message');"><%= l(:button_clear_meassge) %></a>
+      <a href="#" class="ping_sub" id="jours_submit" onclick="submit1();"><%= l(:label_responses) %></a></td>
+  </tr>
 </table>
-<%= f.text_field :reference_user_id, :style=>"display:none"%>
 
 <!-- modified by bai 525px -->
-        <a href="#" class="ping_sub" id="jours_submit" onclick="submit1();">留言</a>
-		<a href="#" class="ping_sub" onclick = "clearMessage('bid_message_message');"><%= l(:button_clear_meassge) %></a>
+
+
 <!-- end -->
 
 <% else %>
diff --git a/app/views/homework_attach/_addjour.html.erb b/app/views/homework_attach/_addjour.html.erb
index 2519f6a15..cbc189ef5 100644
--- a/app/views/homework_attach/_addjour.html.erb
+++ b/app/views/homework_attach/_addjour.html.erb
@@ -49,6 +49,11 @@
             $('#' + id).val(content);
         }
     }
+
+    function submit1(button)
+    {
+        $('#jours_submit').parent().submit();
+    }
 </script>
 
 <%= form_for('new_form', :remote => true, :method => :post,
@@ -67,14 +72,8 @@
                      :style => "resize: none;", :class => 'noline', :placeholder => l(:text_caracters_maximum,:count=>250)%>
         <%= f.text_field :reference_user_id, :style=>"display:none"%>
         <div style="float:right">
-          <%= submit_tag l(:button_leave_meassge),
-                                              :name => nil , :class => "enterprise",
-                                              :onmouseout => "this.style.backgroundPosition = 'left top'",
-                                              :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
-          <%= submit_tag l(:button_clear_meassge), :name => nil, :class => "enterprise",
-                             :onclick => "clearMessage('new_form_user_message');",
-                             :onmouseout => "this.style.backgroundPosition = 'left top'",
-                             :onmouseover => "this.style.backgroundPosition = 'left -31px'" %>
+          <a href="#" class="ping_sub1" id="jours_submit" onclick="submit1();"><%= l(:label_submit_comments) %></a>
+
         </div>
     <% else %>
         <div style="font-size: 14px;margin:10px;text-align: center">
diff --git a/app/views/homework_attach/_show.html.erb b/app/views/homework_attach/_show.html.erb
index 9a828aa61..6dc06cfe4 100644
--- a/app/views/homework_attach/_show.html.erb
+++ b/app/views/homework_attach/_show.html.erb
@@ -70,8 +70,6 @@
     </div>
     <div class="cl"></div>
     <%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => @is_comprehensive_evaluation} %>
-    <!-- <textarea id="ta_msg_content" name="content" placeholder="最多250个字"></textarea>
-    <a href="#" class="ping_sub">提交评论</a> -->
     <div class="cl"></div>
   </div><!---ping_con end--->
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 18a4819c5..94272b1fd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1850,4 +1850,5 @@ en:
   label_homework_without_description: The homework without any description!
   label_teacher_comments: Teacher comments
   label_anonymous_comments: Anonymous comments
-  label_anonymous: Anonymous
\ No newline at end of file
+  label_anonymous: Anonymous
+  label_submit_comments: Submit_comments
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index a92832065..a11ded73a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2182,4 +2182,5 @@ zh:
   label_sure_exit_homework: 是否确认退出该作业
   label_teacher_comments: 教师评论
   label_anonymous_comments: 匿评
-  label_anonymous: 匿名
\ No newline at end of file
+  label_anonymous: 匿名
+  label_submit_comments: 提交评论
\ No newline at end of file
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index 6c72186bd..9279c7098 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -83,7 +83,8 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
 .ping_star span a{ float:right; width:20px; height:20px; background:url(images/star.png) -2px 0 no-repeat; margin-right:3px;}
 .ping_star span a:hover{background:url(images/star.png) -24px 0 no-repeat;}
 .ping_con textarea{ width:455px; height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;}
-a.ping_sub{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;}
+a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px;  background:#15bccf; color:#fff; text-align:center;}
+a.ping_sub1{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;}
 a:hover.ping_sub{ background:#14a8b9;}
 .recall{ border-top:1px solid #CCC; padding:5px 0;}
 .recall_head{ float:left;}