Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

db/schema.rb

@@ -23,6 +23,18 @@ ActiveRecord::Schema.define(:version => 20150121030451) 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

public/stylesheets/polls.css

@@ -53,7 +53,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 .ur_inputs label{ padding-left:10px;word-break: break-all; word-wrap: break-word;}
 .ur_inputs input{ margin-right:5px;}
 .ur_text{ height:30px;}
-.ur_textbox{ border:1px solid #dcdcdc !important; color:#676765;}
+.ur_textbox{ border:1px solid #dcdcdc !important; color:#676765; word-break:break-all; word-wrap:break-word;}
 .ur_buttons{ width:250px; margin:20px auto 10px;}
 a.ur_button{ display:block; width:106px; height:37px; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:3px;  float:left; margin-right:15px;}
 a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}