From b9cafc05790f8e5d5d76fa8ad77a89d4a21e901c Mon Sep 17 00:00:00 2001
From: Michael Sofaer and Raphael Sofaer
 <msofaer@pivotallabs.com+rsofaer@gmail.com>
Date: Fri, 26 Nov 2010 17:16:11 -0500
Subject: [PATCH] Revert "removing the form for user creation thru signup". 
 Shutting down magent is a less annoying solution.

This reverts commit 4c96e12a317c513a2cf9fd18c9149aea58fee164.
---
 app/views/invitations/edit.html.haml | 28 +++++++++++++---------------
 config/locales/diaspora/en.yml       |  1 -
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/views/invitations/edit.html.haml b/app/views/invitations/edit.html.haml
index 1f9c01d40..1eac967f6 100644
--- a/app/views/invitations/edit.html.haml
+++ b/app/views/invitations/edit.html.haml
@@ -1,16 +1,14 @@
-%h1= t('.invitations_closed')
+= form_for(resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :put }) do |f|
+  %p
+    = f.label :username
+    = f.text_field :username
+  %p
+    = f.label :password
+    = f.password_field :password
+  %p
+    = f.label :password_confirmation
+    = f.password_field :password_confirmation
 
--#= form_for(resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :put }) do |f|
-  -#%p
-    -#= f.label :username
-    -#= f.text_field :username
-  -#%p
-    -#= f.label :password
-    -#= f.password_field :password
-  -#%p
-    -#= f.label :password_confirmation
-    -#= f.password_field :password_confirmation
-
-    -#= f.hidden_field :invitation_token
-  -#= f.submit t('.sign_up')
--#= render :partial => "devise/shared/links"
+    = f.hidden_field :invitation_token
+  = f.submit t('.sign_up')
+= render :partial => "devise/shared/links"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index e0e00110e..5ab9a9400 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -284,7 +284,6 @@ en:
           not_found: "Invitation token not found"
       edit:
           sign_up: "sign_up"
-          invitations_closed: "Invitations for this Diaspora Pod are closed right now.  Don't worry, your invite will still work, please try again in about a week."
   status_messages:
       new_status_message:
           tell_me_something_good: "tell me something good"