Permalink
Browse files

fix twitter + twitter layout

  • Loading branch information...
1 parent ba1fa0b commit 3c4228a69b83ebcca3e14f8cb8da58489971ce9e @rkh committed Jan 30, 2010
Showing with 14 additions and 10 deletions.
  1. +3 −0 init.rb
  2. +1 −1 vendor/oauth
  3. +10 −9 views/settings.haml
View
@@ -5,6 +5,9 @@
require "bithug/webserver"
require "config" unless ENV['RACK_ENV'] == 'test'
+require "yaml"
+JSON = YAML unless defined? JSON
+
Bithug::Webserver.configure do |app|
app.app_file = __FILE__
#Ohm.connect
Submodule oauth updated from 191452 to c1683d
View
@@ -27,19 +27,20 @@
- if defined? Bithug::Twitter::User and user.is_a? Bithug::Twitter::User
- if user.twitter_authorized?
- %h3 Your Twitter Connection
+ %h2 Your Twitter Connection
= user.twitter_user_name
%a{:href => "/#{user.name}/clear_twitter_connection"} Clear Account
- else
- %h3 Connect to Twitter
- - unless user.twitter_authorization_requested?
- Please visit the URL below and come back with the PIN to authorize Bithug
- to use your Twitter account
- %br
- %a{:href => user.twitter_request_authorization} twitter.com/oauth
- - else
+ %h2 Connect to Twitter
+ - if user.twitter_authorization_requested?
%form{:method => "post", :action => "/#{user.name}/connect_to_twitter"}
%label{:for => :pin} PIN:
%input{:type => :text, :name => :pin}
- %a{:href => "/#{user.name}/clear_twitter_connection"} Re-request Authentication PIN
+ %input{:type => :submit, :value => "continue"}
+ .info
+ %a{:href => "/#{user.name}/clear_twitter_connection"} Re-request Authentication PIN
+ - else
+ .info
+ Please visit the <a href="#{user.twitter_request_authorization}">Twitter</a> and come back with the PIN to authorize Bithug
+ to use your Twitter account

0 comments on commit 3c4228a

Please sign in to comment.