From d8e6b4a92f4a1f116e348f8152980d4489a7ae69 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 11:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=8F=96=E6=B6=88=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E9=97=AE=E5=8D=B7=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E9=97=AE=E5=8D=B7=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/index.html.erb | 6 ++++--
 public/stylesheets/polls.css  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index fc36a8abf..0b49cd92d 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -10,9 +10,11 @@
 <div class="polls_content" id="polls">
   <div class="polls_head">
     <h2>所有问卷
-      <span>（<%= @polls.count%>）</span>
+      <span>（<%= @obj_count%>）</span>
     </h2>
-    <%= link_to l(:label_new_poll), new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => "newbtn" %>
+    <% if @is_teacher%>
+        <%= link_to l(:label_new_poll), new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => "newbtn" %>
+    <% end%>
   </div>
   <div class="cl"></div>
   <div class="polls_list">
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 494d9cb60..641d1726d 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -31,7 +31,7 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 ul.wlist li{float: left;}
 ul.wlist li a{ border:1px solid #15bccf; padding:4px; margin-left:3px;}
 ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
-.wlist_select { background-color:#64bdd9; color:#fff; padding:0 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
+.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
 
 /*问卷页面*/
 .polls_box{ border:1px solid #dcdcdc; padding:15px 30px;}