Merge branch 'master' of https://github.com/hotsh/rstat.us

controllers/static_controller.rb

@@ -10,4 +10,8 @@ class Rstatus
   get "/contact" do
     haml :contact
   end
+
+  get "/help" do
+    haml :help
+  end
 end

test/rstatus_test.rb

@@ -547,6 +547,16 @@ def test_user_password_reset_email_needed
     assert_match "/users/password_reset", page.current_url
   end
 
+  def test_user_password_reset_email_does_not_show
+    u = Factory(:user, :email => "[email protected]")
+    a = Factory(:authorization, :user => u)
+    log_in(u, a.uid)
+
+    visit "/users/password_reset"
+
+    assert_equal page.has_selector?("input[name=email]"), false
+  end
+
   def test_user_password_reset_passwords_dont_match
     u = Factory(:user, :email => "[email protected]")
     log_in_email(u)

views/help.haml

@@ -0,0 +1,54 @@
+%h2 Help
+
+%h3 I logged in with facebook and my username looks like this profile.php?id=00000000
+
+%p 
+  You can use the username reset to change your username
+  %a{:href => "/reset-username"} http://rstat.us/reset-username
+  %br
+  Note: This is only for users that have a blank username or a facebook url. Username resets will be added at a later date.
+
+%h3 My username is blank
+
+%p 
+  You can use the username reset to change your username
+  %a{:href => "/reset-username"} http://rstat.us/reset-username
+  %br
+  Note: This is only for users that have a blank username or a facebook url. Username resets will be added at a later date.
+
+%h3 I signed in with twitter or facebook, but I want use the rstat.us login
+
+%p
+  You can enable username/password logins by setting your password in the 
+  - if logged_in?
+    %a{:href => "/users/#{current_user.username}/edit"} edit profile screen
+  - else
+    edit profile screen.
+  You will be prompted to enter an email address for password recovery.
+
+%h3 How can I link my twitter or facebook account to my rstat.us account?
+
+%p
+  You can link your twitter or facebook account in your
+  - if logged_in?
+    %a{:href => "/users/#{current_user.username}/edit"} edit profile screen
+  - else
+    edit profile screen.
+
+%h3 Do you have an api?
+
+%p
+  We currently do not have an api, but we hope to add one soon. If you would like to help please
+  %a{:href => "https://github.com/hotsh/rstat.us"} check out the repo
+
+%h3 I would really like the site to do <something>
+
+%p
+  Let us know! Log a ticket at
+  %a{:href => "http://rstatus.lighthouseapp.com/projects/73488-rstatus/overview"} lighthouse
+
+%hr
+
+%p 
+  If you did not find answers to your questions log a ticket at 
+  %a{:href => "http://rstatus.lighthouseapp.com/projects/73488-rstatus/overview"} lighthouse