1.问卷列表页面动态显示，

2.问卷调查页面引起base_course的样式显示不正确
11 years ago · f54cf53663
parent 8080ca8064
commit f54cf53663
2 changed files with 63 additions and 13 deletions
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@ -1 +1,51 @@
-1111111111111
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>问卷调查_列表</title>
+  <%= stylesheet_link_tag  'polls', :media => 'all' %>
+</head>
+
+<body>
+<div class="polls_content" id="polls">
+  <div class="polls_head">
+    <h2>所有问卷
+      <span>（<%= @polls.count%>）</span>
+    </h2>
+    <a href="#" class="newbtn">新建问卷</a>
+  </div>
+  <div class="cl"></div>
+  <div class="polls_list">
+    <% @polls.each do |poll|%>
+        <ul>
+          <li>
+            <a href="#" class="polls_title fl">
+              <%= poll.polls_name%>
+            </a>
+          </li>
+          <li>
+            <a href="#" class="pollsbtn fl ml10">统计结果</a>
+          </li>
+          <li>
+            <a href="#" class="polls_de fr ml20 mr10">删除</a>
+          </li>
+          <li class="polls_date fr">
+            <%= format_time poll.created_at%>
+          </li>
+        </ul>
+        <div class="cl"></div>
+    <% end%>
+
+    <ul class="wlist" style=" border:none;">
+      <li><a href="#">下一页</a></li>
+      <li><a href="#">...</a></li>
+      <li><a href="#">2</a></li>
+      <li class="wlist_select" ><a href="#">1</a></li>
+      <li><a href="#">上一页</a></li>
+    </ul>
+    <div class="cl"></div>
+  </div><!--列表end-->
+
+</div><!--问卷内容end-->
+</body>
+</html>
--- 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;}