Fix: 修正开放注册后，三方帐号为注册用户登陆错无的问题；

Mod: Timeline 一些小事件把字体改小；
Add: 加入 Github帐号 绑定功能；

app/controllers/users_controller.rb

@@ -68,10 +68,11 @@ def unfollow
   def auth_callback
 		auth = request.env["omniauth.auth"]  
 		redirect_to root_path if auth.blank?
+    provider_name = auth['provider'].gsub(/^t/,"").titleize
 
 		if current_user
       Authorization.create_from_hash(auth, current_user)
-      flash[:notice] = "成功绑定了 #{auth['provider']} 帐号。"
+      flash[:notice] = "成功绑定了 #{provider_name} 帐号。"
 			redirect_to edit_user_registration_path
 		elsif @user = Authorization.find_from_hash(auth)
       sign_in @user
@@ -80,9 +81,14 @@ def auth_callback
 		else
       if Setting.allow_register
         @new_user = Authorization.create_from_hash(auth, current_user) #Create a new user
-        sign_in @new_user
-        flash[:notice] = "欢迎来自 #{auth['provider']} 的用户，你的帐号已经创建成功。"
-        redirect_to "/"
+        if @new_user.errors.blank?
+          sign_in @new_user
+          flash[:notice] = "欢迎来自 #{provider_name} 的用户，你的帐号已经创建成功。"
+          redirect_to "/"
+        else
+          flash[:notice] = "#{provider_name}的帐号提供信息不全，无法直接登陆，请先注册。"
+          redirect_to "/register"
+        end
       else
         flash[:alert] = "你还没有注册用户。"
         redirect_back_or_default "/login"

app/models/user.rb

@@ -55,10 +55,15 @@ def password_required?
   mount_uploader :avatar, AvatarUploader
 
   def self.create_from_hash(auth)  
+    Rails.logger.debug { "---------#{auth}"}
 		user = User.new
 		user.name = auth["user_info"]["name"]  
 		user.email = auth['user_info']['email']
-		user.save(false)
+    if user.email.blank?
+      user.errors.add("Email","三方网站没有提供你的Email信息，无法直接注册。")
+      return user
+    end
+		user.save
 		user.reset_persistence_token! #set persistence_token else sessions will not be created
 		user
   end  
@@ -67,8 +72,10 @@ def self.create_from_hash(auth)
   # 此方法用于处理开始注册是自动生成 slug, 因为没表单,只能自动
   def auto_slug
     if self.slug.blank?
-      self.slug = self.email.split("@")[0]
-      self.slug = self.slug.safe_slug
+      if !self.email.blank?
+        self.slug = self.email.split("@")[0]
+        self.slug = self.slug.safe_slug
+      end
       # 如果 slug 被 safe_slug 后是空的,就用 id 代替
       if self.slug.blank?
         self.slug = self.id.to_s

app/views/logs/_log.html.erb

@@ -69,9 +69,9 @@ when "UserLog"
 %>	
 	<div class="ask" ask-id="<%= log.id %>">
 		<% if ["FOLLOW_TOPIC", "UNFOLLOW_TOPIC"].include?(action) %>
-	  <div class="title"><%= user_name_tag(log.user) %> <%= action == "FOLLOW_TOPIC" ? "关注" : "取消关注" %>了话题 <a href="/topics/<%= item.name %>">#<%= item.name %></a></div>
+	  <div class="title small_title"><%= user_name_tag(log.user) %> <%= action == "FOLLOW_TOPIC" ? "关注" : "取消关注" %>了话题 <a href="/topics/<%= item.name %>">#<%= item.name %></a></div>
 		<% elsif ["FOLLOW_USER", "UNFOLLOW_USER"].include?(action) %>
-	  <div class="title"><%= user_name_tag(log.user) %> <%= action == "FOLLOW_USER" ? "关注" : "取消关注" %>了 <%= user_name_tag(item) %></div>
+	  <div class="title small_title"><%= user_name_tag(log.user) %> <%= action == "FOLLOW_USER" ? "关注" : "取消关注" %>了 <%= user_name_tag(item) %></div>
 		<% else %>
       <div class="title"><a href="/asks/<%= item.id %>"><%= item.title %></a></div>
       <div class="info">
@@ -146,7 +146,7 @@ when "TopicLog"
 	if !item.nil?
 %>
 	<div class="ask" ask-id="<%= log.id %>">
-	  <div class="title"><%= user_name_tag(log.user) %> 创建了话题 <a href="/topics/<%= item.name %>">#<%= item.name %></a></div>
+	  <div class="title small_title"><%= user_name_tag(log.user) %> 创建了话题 <a href="/topics/<%= item.name %>">#<%= item.name %></a></div>
 	</div>
 <%
 	end

app/views/shared/_omniauth_links.html.erb

@@ -3,6 +3,7 @@
   <% if not current_user %>
     <ul>
       <li class="google"><a href="/auth/google">Google帐号</a></li>
+      <li class="github"><a href="/auth/github">Github</a></li>
       <li class="douban"><a href="/auth/douban">豆瓣</a></li>
       <li class="tqq"><a href="/auth/tqq">QQ帐号(腾讯微博)</a></li>
       <li class="tsina"><a href="/auth/tsina">新浪微博</a></li>
@@ -16,6 +17,11 @@
       <% else %>
         <li class="google"><a href="#" class="disabled">Google帐号</a><span>[已绑定]</span></li>
       <% end %>
+      <% if not current_user.auths.index("github") %>
+        <li class="github"><a href="/auth/github">Github</a></li>
+      <% else %>
+        <li class="github"><a href="#" class="disabled">Github</a><span>[已绑定]</span></li>
+      <% end %>
       <% if not current_user.auths.index("douban") %>
         <li class="douban"><a href="/auth/douban">豆瓣</a></li>
       <% else %>

config/initializers/omniauth.rb

@@ -6,4 +6,5 @@
   provider :tqq, 'd474e02630a849a5bbbf13bca0f9795f', '279bad9e954cc2b3f9988df534b4be49'
   provider :t163, 'BMO70rvqyCs0Pby5', 'AwRwtzF1eRPVrZa5rzusedS8JdM79pNj'
   provider :tsohu, 'XtA4sAn6dpVnqIMNucge', 'URzg4g)Vj9M(9VdMarXIZddgQ8!(5m8cehkH^WB0'
+  provider :github, '11f1ad7b2ef9263b2ead', '4f07422d1e499126e2fb247dd547b670e01a47d1'
 end

public/stylesheets/front.css

@@ -92,6 +92,7 @@ address, blockquote {
 .ask a.topic:hover { background:#19558D; color:#FFF; }
 
 .ask .title { font-size: 1.3em; line-height: 1.2em; margin: 2px 0 5px; }
+.ask .small_title { font-size:12px; margin:0px; color:#999; }
 .ask .title h1 { font-size: 1.2em; line-height: 1.2em; display:inline;  }
 .ask .info { color: #999; margin:3px 0;  }
 .ask .last_answer { margin-top:5px; }
@@ -299,6 +300,7 @@ a.user img.normal { width:100px; height:100px; }
 #omniauth_links li.t163 a { background-position:0 -80px; }
 #omniauth_links li.tsohu a { background-position:0 -96px; }
 #omniauth_links li.google a { background-position:0 -48px; }
+#omniauth_links li.github a { background-position:0 -113px; }
 #omniauth_links li span { color:#999; margin-left:3px; }
 
 .search_result_dropdown {}