From f54cf536632c8b380180b07b66c92400e922971a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 12 Jan 2015 17:25:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=97=AE=E5=8D=B7=E5=88=97=E8=A1=A8=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA=EF=BC=8C=202.?=
=?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5=E9=A1=B5=E9=9D=A2=E5=BC=95?=
=?UTF-8?q?=E8=B5=B7base=5Fcourse=E7=9A=84=E6=A0=B7=E5=BC=8F=E6=98=BE?=
=?UTF-8?q?=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 | 52 ++++++++++++++++++++++++++++++++++-
public/stylesheets/polls.css | 24 ++++++++--------
2 files changed, 63 insertions(+), 13 deletions(-)
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 3c78c257e..68d16f4f7 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -1 +1,51 @@
-1111111111111
\ No newline at end of file
+
+
+
+
+
+
所有问卷
+ (<%= @polls.count%>)
+
+
新建问卷
+
+
+
+ <% @polls.each do |poll|%>
+
+
+ <% end%>
+
+
+
+
+
+
+
+
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 8621c20dc..9d3059245 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -1,17 +1,17 @@
/* CSS Document */
-body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+#polls{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
-div,img,tr,td{ border:0;}
-table,tr,td{border:0; cellspacing:0; cellpadding:0;}
-ul,li{ list-style-type:none}
-.cl{ clear:both; overflow:hidden; }
-a{ text-decoration:none; }
-a:hover{ text-decoration:underline; }
-.ml10{ margin-left:10px;}
-.ml20{ margin-left:20px;}
-.mr10{ margin-right:10px;}
-.fl{ float: left;}
-.fr{ float:right;}
+#polls div,img,tr,td{ border:0;}
+#polls table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+#polls ul,li{ list-style-type:none}
+#polls .cl{ clear:both; overflow:hidden; }
+#polls a{ text-decoration:none; }
+#polls a:hover{ text-decoration:underline; }
+#polls .ml10{ margin-left:10px;}
+#polls .ml20{ margin-left:20px;}
+#polls .mr10{ margin-right:10px;}
+#polls .fl{ float: left;}
+#polls .fr{ float:right;}
/*问卷列表*/
.polls_content{ width:677px;}