From 629c4aaaa1352f79b71c2963157ed3385a0bf55f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 13:30:50 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81#1814=20=E6=9C=AA=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E5=8D=B7=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E7=9A=84=E9=97=AE=E5=8D=B7=E6=80=BB=E6=95=B0=E4=B8=AD?=
 =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E5=A4=8D=E9=97=AE=E5=8D=B7=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E8=BF=87=E9=95=BF=EF=BC=8C=E9=97=AE=E5=8D=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=203=E3=80=81?=
 =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B8=83=E7=9A=84=E9=97=AE=E5=8D=B7=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb |  6 ++-
 app/views/poll/index.html.erb      | 76 +++++++++++++++---------------
 public/stylesheets/polls.css       |  2 +-
 3 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 6a4ba0cc5..ce031f586 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -7,7 +7,11 @@ class PollController < ApplicationController
   def index
     if @course
       @is_teacher = User.current.allowed_to?(:as_teacher,@course)
-      polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
+      if @is_teacher
+        polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
+      else
+        polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id} and polls_status = 2")
+      end
       @polls = paginateHelper polls,10 #分页
       respond_to do |format|
         format.html{render :layout => 'base_courses'}
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 0e5e956ca..e57674c7a 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -11,46 +11,46 @@
   <div class="cl"></div>
   <div class="polls_list">
     <% @polls.each do |poll|%>
-
-          <% unless !@is_teacher && poll.polls_status != 2 %>
-            <ul id="polls_<%= poll.id %>">
-              <li>
-                <% if @is_teacher %>
-                    <% if has_commit_poll?(poll.id ,User.current) %>
-                        <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
-                    <% else %>
-                        <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
-                    <% end %>
+        <ul id="polls_<%= poll.id %>">
+          <li title="<%= poll.polls_name %>">
+            <% if @is_teacher %>
+                <% if has_commit_poll?(poll.id ,User.current) %>
+                    <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
                 <% else %>
-                    <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %>
-                        <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
-                    <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %>
-                        <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
-                    <% end %>
+                    <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
                 <% end %>
-              </li>
-              <li>
-                <%if @is_teacher%>
-                    <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
-                <% end%>
-              </li>
-              <li>
-                <% if @is_teacher && poll.polls_status == 1 #新建状态的问卷可删除%>
-                    <%= link_to(l(:button_delete), poll,
-                                method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml20 mr10")  %>
-                <% end%>
-              </li>
-              <li>
-                <% if @is_teacher && poll.polls_status == 1 #新建状态的问卷可编辑%>
-                    <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
-                <% end%>
-              </li>
-              <li class="polls_date fr">
-                <%= format_time poll.created_at%>
-              </li>
-            </ul>
-          <% end %>
-
+            <% else %>
+                <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %>
+                    <sapn class="polls_title fl" >
+                      <%= poll.polls_name %>
+                    </sapn>
+                <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %>
+                    <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+                <% end %>
+            <% end %>
+          </li>
+          <li>
+            <%if @is_teacher && poll.polls_status == 2%>
+                <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
+            <% end%>
+          </li>
+          <li>
+            <% if @is_teacher %>
+                <!--新建状态的问卷可删除-->
+                <%= link_to(l(:button_delete), poll,
+                            method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml20 mr10")  %>
+            <% end%>
+          </li>
+          <li>
+            <% if @is_teacher && poll.polls_status == 1%>
+                <!--新建状态的问卷可编辑-->
+                <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
+            <% end%>
+          </li>
+          <li class="polls_date fr">
+            <%= format_time poll.created_at%>
+          </li>
+        </ul>
         <div class="cl"></div>
     <% end%>
 
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 5864a9801..324fb2bb9 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -26,7 +26,7 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 a.newbtn{ float:right; display:block; width:80px; height:30px; background:#64bdd9; color:#fff; font-size:14px; margin:10px; text-align:center;}
 a:hover.newbtn{ background:#55a1b9; text-decoration:none;}
 .polls_list ul{ padding-left:10px; border-bottom:1px dashed #c9c9c9; height:32px; padding-top:8px;}
-a.polls_title{ font-weight:bold; color:#3e6d8e;}
+a.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 .polls_title{ font-weight:bold; color:#3e6d8e;}
 a.pollsbtn{ display:block; width:66px; height:22px; text-align:center; border:1px solid #64bdd9; color:#64bdd9;}
 a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;}