修复bug:

1,竞赛通知，点击取消也能成功添加
2， “删除”二字竖的排列
3， 编辑竞赛显示为“新闻”

Signed-off-by: alan <547533434@qq.com>

app/views/contestnotifications/edit.html.erb

@@ -1,4 +1,4 @@
-<h3><%=l(:label_news)%></h3>
+<h3><%=l(:label_edit_contest_notice)%></h3>
 
 <%= labelled_form_for @contestnotification,
                       :url =>  contest_contestnotification_path,

app/views/contestnotifications/show.html.erb

@@ -1,4 +1,8 @@
-
+<script>
+    function cancel() {
+        $("#add_contestnotification").hide();
+    }
+</script>
 <div class="contextual">
 	<%= link_to(l(:button_edit),
                 edit_contest_contestnotification_path(@contest, @contestnotification),
@@ -27,7 +31,7 @@
 
 <div id="notificationcomments" style="margin-bottom:16px;">
 
-	<div style="margin:15px">
+	<div style="margin:15px" id ="add_contestnotification">
 		<span class="font_description">
           <%= textilizable(@contestnotification, :description) %>
         </span>
@@ -62,7 +66,17 @@
 		</div>
 		<p>
 			<%= submit_tag l(:button_add) %>
-			<%= submit_tag l(:button_cancel), :onclick => "cancel();" %>
+
+            <!--modified by longjun 点击取消时收回添加回复的部分-->
+
+          <%= submit_tag l(:button_cancel),
+                         :name => nil,
+                         :onclick => "cancel();",
+                         :type => 'button',
+                         :class => "enterprise",
+                         :onmouseout => "this.style.backgroundPosition = 'left top'",
+                         :onmouseover => "this.style.backgroundPosition = 'left -30px'"
+          %>
 		</p>
 		<% end %>
 		
@@ -97,7 +111,8 @@
                       </span>
                         <%= l(:label_comment_plural) %>
                     </td>
-                    <td>
+                    <!--modified by longjun 删除变成竖的，IE浏览器兼容，将宽度设置为40px-->
+                    <td width="40px">
                       <% if notificationcomment.author==User.current|| User.current.admin? %>
                           <%= link_to(l(:label_bid_respond_delete),
                                       contest_contestnotification_notificationcomment_path(@contest, @contestnotification,notificationcomment),

config/locales/zh.yml

@@ -705,6 +705,7 @@ zh:
   label_report_plural: 报表
   label_news: 新闻
   label_news_new: 添加新闻
+  label_edit_contest_notice: 编辑竞赛通知
   bale_news_notice: 添加通知 #huang
   bale_edit_notice: 修改通知
   label_news_notice: 发布课程通知
@@ -2045,6 +2046,7 @@ zh:
   label_contest_settings: 配置竞赛
   label_contest_delete: 删除竞赛
   label_noawards_current: 暂未评奖
+
   
   label_softapplication: 应用软件
   label_attending_contest: 参加竞赛