From 60b07432926d330981a15a041fbc959807bf032d Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 14 Jan 2015 09:48:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=9C=A8=E7=81=AB=E7=8B=90=E4=B8=AD=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/show.html.erb |  4 ++++
 db/schema.rb                 | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 66fcd3bcd..a0c111a79 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -25,6 +25,7 @@
         <div class="ur_title">
           <span class="title_index">第1题：</span> 单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题  <span class="ur_required" title="必答">*</span>
         </div>
+        <div class="cl"></div>
         <div class="ur_inputs">
           <table class="ur_table" >
             <tbody>
@@ -52,6 +53,7 @@
         <div class="ur_title">
           <span class="title_index">第2题：</span> 多选题  <span class="ur_required" title="必答">*</span>
         </div>
+        <div class="cl"></div>
         <div class="ur_inputs">
           <table class="ur_table">
             <tbody>
@@ -80,6 +82,7 @@
         <div class="ur_title">
           <span class="title_index">第3题：</span> 单行主观
         </div>
+        <div class="cl"></div>
         <div class="ur_inputs">
           <input class="ur_text ur_textbox" type="text" size="" maxlength=""value="">
         </div>
@@ -90,6 +93,7 @@
           <div class="ur_title">
             <span class="title_index">第4题：</span> 多行主观
           </div>
+          <div class="cl"></div>
           <div class="ur_inputs">
             <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>
           </div>
diff --git a/db/schema.rb b/db/schema.rb
index 9c6f4eac3..a58602e37 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150112024820) do
+ActiveRecord::Schema.define(:version => 20150112080435) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -23,6 +23,18 @@ ActiveRecord::Schema.define(:version => 20150112024820) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
+  create_table "api_keys", :force => true do |t|
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.integer  "user_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
+  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
+
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false