3 files changed, 18 insertions, 9 deletions
diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml
index 79628b3a9..6baed3c25 100644
--- a/app/views/user/_signin.rhtml
+++ b/app/views/user/_signin.rhtml
@@ -3,9 +3,9 @@
 <% form_tag({:action => "signin"}, {:id => "signin_form"}) do %>
     <%= foi_error_messages_for :user_signin %>
 
-    <% if not sign_in_as_existing_user %>
+    <!--<% if not sign_in_as_existing_user %>
     <h2><%= _('If you\'ve used {{site_name}} before', :site_name=>site_name)%></h2>
-    <% end %>
+    <% end %>-->
 
     <p>
     <label class="form_label" for="user_signin_email"><%= _('Your e-mail:')%></label>
diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml
index 6b0a1f8c7..9c228d684 100644
--- a/app/views/user/_signup.rhtml
+++ b/app/views/user/_signup.rhtml
@@ -3,7 +3,7 @@
 <% form_tag({:action => "signup"}, {:id => "signup_form"}) do %>
     <%= foi_error_messages_for :user_signup %>
 
-    <h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2>
+    <!--<h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2>-->
 
     <p>
         <label class="form_label" for="user_signup_email"><%= _('Your e-mail:')%></label>
diff --git a/app/views/user/sign.rhtml b/app/views/user/sign.rhtml
index b76edbc64..1140d961a 100644
--- a/app/views/user/sign.rhtml
+++ b/app/views/user/sign.rhtml
@@ -21,17 +21,26 @@
 
     <div id="sign_together">
 
-        <p id="sign_in_reason">
+        <!--<p id="sign_in_reason">
         <% if @post_redirect.reason_params[:web].empty? %>
             <%= _(' Please sign in or make a new account.') %>
         <% else %>
             <%= @post_redirect.reason_params[:web] %>,  <%= _('please sign in or make a new account.') %>
         <% end %>
-        </p>
-
-        <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %>
-        <%= render :partial => 'signup' %>
-
+        </p>-->
+        
+        <div id="left_half">
+          <h1>Sign in</h1>
+          <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %>
+        </div>
+        <div id="middle_strip">
+          - or -
+        </div>
+        <div id="right_half">
+          <h1>Sign up</h2>
+          <%= render :partial => 'signup' %>
+        </div>
+        <div style="clear:both"></div>
     </div>
 
 <% end %>