From 4c5d2d50559d05df48abac44e6bad426497c8482 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 9 Jun 2015 17:08:00 +0800
Subject: [PATCH] =?UTF-8?q?poll=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E5=AF=BC=E5=87=BA?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/poll/_poll.html.erb | 9 +++++++--
public/stylesheets/polls.css | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index 14f351182..180fed0f0 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -25,8 +25,6 @@
<%= link_to(l(:button_delete), poll,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %>
-
<%= link_to "导出", export_poll_poll_path(poll.id,:format => "xls"), :class => "polls_de fr ml5"%>
-
<% if poll.polls_status == 1 %>
<%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml5"%>
<% else%>
@@ -39,6 +37,13 @@
关闭
<% end%>
+ <% if poll.polls_status == 1%>
+ 导出
+ <% elsif poll.polls_status == 2 || poll.polls_status == 3 %>
+ <%= link_to "导出", export_poll_poll_path(poll.id,:format => "xls"), :class => "polls_de fr ml5"%>
+ <% end%>
+
+
<%= format_date poll.created_at.to_date%>
<% else%>
<% if poll.polls_status == 2%>
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index f1b5023bd..353ec3937 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -127,7 +127,7 @@ a:hover.btn_de{ background:#ff5d31;}
a.btn_pu{ border:1px solid #3cb761; color:#3cb761; }
a:hover.btn_pu{ background:#3cb761;}
.pollsbtn_grey{ border:1px solid #b1b1b1; color:#b1b1b1; padding:0px 9px; height:19px; padding-top:3px; }
-.polls_title_w { width:330px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
+.polls_title_w { width:300px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
.polls_title_st { max-width:530px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
.polls_de_grey{ color:#b1b1b1; margin-top:3px;}
.ml5{ margin-left:5px;}