From 3d8aa620a5c9b3746585b8dbb3aa37d2819ed5f8 Mon Sep 17 00:00:00 2001
From: kaizheng <18763216000@163.com>
Date: Sat, 3 Aug 2013 20:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E4=BA=AB=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shares_controller.rb       |  4 +--
 app/models/share.rb                        |  2 +-
 app/views/shares/_form.html.erb            |  8 ++----
 app/views/shares/index.html.erb            | 10 +++++---
 app/views/shares/show.html.erb             |  9 ++-----
 db/migrate/20130801081314_create_shares.rb |  3 +--
 db/schema.rb                               | 29 ++++++++++++++++------
 7 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/app/controllers/shares_controller.rb b/app/controllers/shares_controller.rb
index 9a76d26b..55b9e237 100644
--- a/app/controllers/shares_controller.rb
+++ b/app/controllers/shares_controller.rb
@@ -27,8 +27,8 @@ class SharesController < ApplicationController
     @share = Share.new
     
     #add by mkz 抓取参数传给share
-    @share[:access_token] = params[:access_token]
-    @share[:comment] = params[:comment]
+   
+    @share[:created_on] = params[:created_on]
     @share[:title] = params[:title]
     @share[:url] = params[:url]
     @share[:share_type] = params[:share_type]
diff --git a/app/models/share.rb b/app/models/share.rb
index f597ae79..58f4f1aa 100644
--- a/app/models/share.rb
+++ b/app/models/share.rb
@@ -1,3 +1,3 @@
 class Share < ActiveRecord::Base
-  attr_accessible :access_token, :comment, :share_type, :title, :url
+  attr_accessible :created_on, :share_type, :title, :url
 end
diff --git a/app/views/shares/_form.html.erb b/app/views/shares/_form.html.erb
index 3cf30386..50f680f0 100644
--- a/app/views/shares/_form.html.erb
+++ b/app/views/shares/_form.html.erb
@@ -12,12 +12,8 @@
   <% end %>
 
   <div class="field">
-    <%= f.label :access_token %><br />
-    <%= f.text_field :access_token %>
-  </div>
-  <div class="field">
-    <%= f.label :comment %><br />
-    <%= f.text_field :comment %>
+    <%= f.label :created_on %><br />
+    <%= f.text_field :created_on %>
   </div>
   <div class="field">
     <%= f.label :url %><br />
diff --git a/app/views/shares/index.html.erb b/app/views/shares/index.html.erb
index fe06463b..7411bb25 100644
--- a/app/views/shares/index.html.erb
+++ b/app/views/shares/index.html.erb
@@ -2,8 +2,7 @@
 
 <table>
   <tr>
-    <th>Access token</th>
-    <th>Comment</th>
+    <th>Created On</th>
     <th>Url</th>
     <th>Title</th>
     <th>Share type</th>
@@ -14,8 +13,7 @@
 
 <% @shares.each do |share| %>
   <tr>
-    <td><%= share.access_token %></td>
-    <td><%= share.comment %></td>
+    <td><%= share.created_on %></td>
     <td><%= share.url %></td>
     <td><%= share.title %></td>
     <td><%= share.share_type %></td>
@@ -26,6 +24,10 @@
 <% end %>
 </table>
 
+<a href=javascript:window.open('http://localhost:3000/shares/new?from=3&title='+encodeURIComponent(document.title)+'&url='+encodeURIComponent(document.location.href)+'&jumpback=2&noui=1','favit','');void(0)><img src="genghuancheng" alt="QQshuqian" border="0" height="16" width="16"></a>
+
 <br />
 
 <%= link_to 'New Share', new_share_path %>
+
+<a href=javascript:window.open('http://localhost:3000/shares/new?title='+encodeURIComponent(document.title)+'&url='+encodeURIComponent(document.location.href)+'&jumpback=2&noui=1','favit','');void(0)><img src="genghuancheng" alt="QQshuqian" border="0" height="16" width="16"></a>
\ No newline at end of file
diff --git a/app/views/shares/show.html.erb b/app/views/shares/show.html.erb
index 7744914e..46dc92f7 100644
--- a/app/views/shares/show.html.erb
+++ b/app/views/shares/show.html.erb
@@ -1,13 +1,8 @@
 <p id="notice"><%= notice %></p>
 
 <p>
-  <b>Access token:</b>
-  <%= @share.access_token %>
-</p>
-
-<p>
-  <b>Comment:</b>
-  <%= @share.comment %>
+  <b>Created On:</b>
+  <%= @share.created_on %>
 </p>
 
 <p>
diff --git a/db/migrate/20130801081314_create_shares.rb b/db/migrate/20130801081314_create_shares.rb
index 755de055..00567a1c 100644
--- a/db/migrate/20130801081314_create_shares.rb
+++ b/db/migrate/20130801081314_create_shares.rb
@@ -1,8 +1,7 @@
 class CreateShares < ActiveRecord::Migration
   def change
     create_table :shares do |t|
-      t.string :access_token
-      t.string :comment
+      t.date :created_on
       t.string :url
       t.string :title
       t.integer :share_type
diff --git a/db/schema.rb b/db/schema.rb
index 4bae3d3b..524436fa 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 => 20130801081314) do
+ActiveRecord::Schema.define(:version => 20130802011758) do
 
   create_table "a_user_watchers", :force => true do |t|
     t.string   "name"
@@ -516,13 +516,12 @@ ActiveRecord::Schema.define(:version => 20130801081314) do
   add_index "settings", ["name"], :name => "index_settings_on_name"
 
   create_table "shares", :force => true do |t|
-    t.string   "access_token"
-    t.string   "comment"
-    t.string   "url"
+    t.date     "created_on"
     t.string   "title"
-    t.integer  "share_type"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+    t.string   "share_type"
+    t.string   "url"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "students", :force => true do |t|
@@ -587,6 +586,22 @@ ActiveRecord::Schema.define(:version => 20130801081314) do
     t.integer "fields_bits",                 :default => 0
   end
 
+  create_table "user_extensions", :force => true do |t|
+    t.integer  "user_id"
+    t.text     "brief_introduction"
+    t.text     "gender"
+    t.date     "birthdate"
+    t.text     "occupation"
+    t.text     "location"
+    t.integer  "zip_code"
+    t.float    "work_experitions"
+    t.integer  "qq"
+    t.integer  "praise_num"
+    t.integer  "tread_num"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
   create_table "user_preferences", :force => true do |t|
     t.integer "user_id",   :default => 0,     :null => false
     t.text    "others"