From 933ad22cd263d114cf31cbdb6ea1f47a36e597e9 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 15 Jan 2015 18:35:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E5=90=8E=E6=8F=90=E7=A4=BA=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_commit_alert.html.erb | 36 +++++----------------------
 app/views/poll/commit_poll.js.erb     |  4 +--
 app/views/poll/show.html.erb          | 14 ++++++++++-
 3 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/app/views/poll/_commit_alert.html.erb b/app/views/poll/_commit_alert.html.erb
index 46982006c..76bbda416 100644
--- a/app/views/poll/_commit_alert.html.erb
+++ b/app/views/poll/_commit_alert.html.erb
@@ -1,36 +1,12 @@
 <div id="popbox" style="text-align: center;margin-top: 25px">
   <% if status == 0 %>
-    <h2>提交成功!</h2>
-    <%= link_to "确定", poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course'),:style => 'height: 28px;
-display: block;
-width: 80px;
-color: #fff;
-background: #15bccf;
-text-align: center;
-padding-top: 4px;
-float: left;
-margin-right: 10px;'%>
+    <h3 style="font-weight: normal;color: green">提交成功!</h3>
+    <%= link_to "确定", poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course'),:class => 'commit'%>
   <% elsif status == 1 %>
-    <h2 style="font-weight: normal">您还有尚未作答的题目请完成后在提交!</h2>
-    <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:style => 'height: 28px;
-display: block;
-width: 80px;
-color: #fff;
-background: #15bccf;
-text-align: center;
-padding-top: 4px;
-float: left;
-margin-right: 10px;'%>
+    <h3 style="font-weight: normal;color: red">您还有尚未作答的题目请完成后在提交!</h3>
+    <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
   <% else %>
-    <h2 style="color: #0000ff">发生未知错误，请检查您的网络。</h2>
-      <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:style => 'height: 28px;
-display: block;
-width: 80px;
-color: #fff;
-background: #15bccf;
-text-align: center;
-padding-top: 4px;
-float: left;
-margin-right: 10px;'%>
+    <h3 style="font-weight: normal;color: red">发生未知错误，请检查您的网络。</h3>
+      <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
   <% end %>
 </div>
diff --git a/app/views/poll/commit_poll.js.erb b/app/views/poll/commit_poll.js.erb
index 185967513..f7a1b56fe 100644
--- a/app/views/poll/commit_poll.js.erb
+++ b/app/views/poll/commit_poll.js.erb
@@ -1,6 +1,6 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status}) %>');
-showModal('ajax-modal', '513px');
-$('#ajax-modal').css('height','200px');
+showModal('ajax-modal', '400px');
+$('#ajax-modal').css('height','100px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='#' onclick='hidden_atert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 4f9bc75aa..24a04ac8d 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -5,7 +5,19 @@
   <title>问卷调查_问卷页面</title>
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
   <style type="text/css">
-      .alert_box{width:480px;height:180px;position:fixed;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+    .alert_box{width:480px;height:180px;position:fixed;z-index:100;left:55%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+    .commit{
+        height: 28px;
+        display: block;
+        width: 80px;
+        color: #fff !important;
+        background: #15bccf;
+        text-align: center;
+        padding-top: 4px;
+        margin-left: 130px;
+        margin-top: 4px;
+        margin-right: 10px;
+    }
   </style>
   <script type="text/javascript">
       function hidden_atert_form(cur_page,cur_type)