From d2f4b38eb6fd68a67940b8ffe735d8f7437acde1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Oct 2014 10:57:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5new=E9=A1=B5=E9=9D=A2=E4=BB=A3=E7=A0=81=EF=BC=9A=201.?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0js=E9=AA=8C=E8=AF=81=EF=BC=8C=202.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8D=B4=E6=8F=90=E4=BA=A4=E9=80=9A=E7=9F=A5=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/_form.html.erb | 51 +++++++++++++++++
 app/views/contestnotifications/index.html.erb | 55 +------------------
 app/views/contestnotifications/new.html.erb   | 16 ++++--
 3 files changed, 65 insertions(+), 57 deletions(-)

diff --git a/app/views/contestnotifications/_form.html.erb b/app/views/contestnotifications/_form.html.erb
index 908d1138d..f3861f034 100644
--- a/app/views/contestnotifications/_form.html.erb
+++ b/app/views/contestnotifications/_form.html.erb
@@ -1,4 +1,55 @@
 <%= error_messages_for @contestnotifications %>
+<script type="text/javascript">
+    function regexTitle()
+    {
+        var title = $.trim($("#contestnotification_title").val());
+        if(title.length ==0)
+        {
+            $("#title_span").text("<%= l(:label_no_contest_news_title) %>");
+            $("#title_span").css('color','#ff0000');
+            $("#title_span").focus();
+            return false;
+        }
+        else if(title.length <= 254)
+        {
+            $("#title_span").text("<%= l(:label_field_correct) %>");
+            $("#title_span").css('color','#008000');
+            return true;
+        }
+        else
+        {
+            $("#title_span").text("<%= l(:label_contest_news_title_condition) %>");
+            $("#title_span").css('color','#ff0000');
+            $("#title_span").focus();
+            return false;
+        }
+    }
+    //验证描述：不能为空，不能多余5000个字符
+    function regexDescription()
+    {
+        var description = $.trim($("#contestnotification_description").val());
+        if(description.length ==0)
+        {
+            $("#description_span").text("<%= l(:label_no_contest_news_description) %>");
+            $("#description_span").css('color','#ff0000');
+            $("#description_span").focus();
+            return false;
+        }
+        else if(description.length <= 5000)
+        {
+            $("#description_span").text("<%= l(:label_field_correct) %>");
+            $("#description_span").css('color','#008000');
+            return true;
+        }
+        else
+        {
+            $("#description_span").text("<%= l(:label_contest_news_condition) %>");
+            $("#description_span").css('color','#ff0000');
+            $("#description_span").focus();
+            return false;
+        }
+    }
+</script>
 <div class="add_frame_header" >
 	<%= l(:bale_news_notice) %>
 </div>
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index a678d87e8..50de15698 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -1,60 +1,11 @@
 <script type="text/javascript">
-    function regexTitle()
+    function submitContestNews()
     {
-        var title = $.trim($("#contestnotification_title").val());
-        if(title.length ==0)
+        if(regexTitle() && regexDescription())
         {
-            $("#title_span").text("<%= l(:label_no_contest_news_title) %>");
-            $("#title_span").css('color','#ff0000');
-            $("#title_span").focus();
-            return false;
-        }
-        else if(title.length <= 254)
-        {
-            $("#title_span").text("<%= l(:label_field_correct) %>");
-            $("#title_span").css('color','#008000');
-            return true;
-        }
-        else
-        {
-            $("#title_span").text("<%= l(:label_contest_news_title_condition) %>");
-            $("#title_span").css('color','#ff0000');
-            $("#title_span").focus();
-            return false;
-        }
-    }
-    //验证描述：不能为空，不能多余5000个字符
-    function regexDescription()
-    {
-        var description = $.trim($("#contestnotification_description").val());
-        if(description.length ==0)
-        {
-            $("#description_span").text("<%= l(:label_no_contest_news_description) %>");
-            $("#description_span").css('color','#ff0000');
-            $("#description_span").focus();
-            return false;
-        }
-        else if(description.length <= 5000)
-        {
-            $("#description_span").text("<%= l(:label_field_correct) %>");
-            $("#description_span").css('color','#008000');
-            return true;
-        }
-        else
-        {
-            $("#description_span").text("<%= l(:label_contest_news_condition) %>");
-            $("#description_span").css('color','#ff0000');
-            $("#description_span").focus();
-            return false;
+            $("#contestnotifications-form").submit();
         }
     }
-        function submitContestNews()
-        {
-            if(regexTitle() && regexDescription())
-            {
-                $("#contestnotifications-form").submit();
-            }
-        }
 </script>
 
 <span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
diff --git a/app/views/contestnotifications/new.html.erb b/app/views/contestnotifications/new.html.erb
index 5008a61d7..310a68d77 100644
--- a/app/views/contestnotifications/new.html.erb
+++ b/app/views/contestnotifications/new.html.erb
@@ -1,11 +1,17 @@
-
+<script type="text/javascript">
+    function submitContestNews()
+    {
+        if(regexTitle() && regexDescription())
+        {
+            $("#contestnotifications-form").submit();
+        }
+    }
+</script>
 <%= labelled_form_for @contestnotification,
                       :url => contest_contestnotifications_path(@contest),
                       :html => { :id => 'contestnotifications-form', :multipart => true } do |f| %>
   <%= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
-  <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-    <input type="button" onclick="$('#add-contestnotifications').hide(); return false;" class="enterprise" value="<%= l(:button_cancel)%>"/>
-
-
+    <input type="button" onclick="submitContestNews();" class="enterprise" value="<%= l(:button_create)%>"/>
+  <%= link_to l(:button_cancel),  contest_contestnotifications_path(@contest.id) %>
 <% end %>
 <div id="preview" class="wiki"></div>