From edae8f1e66bce20f0d03b3961c17ac9ce724d7d0 Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Wed, 8 Sep 2010 11:58:03 -0700
Subject: [PATCH] DG MS; fixed a view bug in user edit page.  page also
 displays diaspora username .

---
 app/models/user.rb                   |  4 ++++
 app/views/requests/_new_request.haml |  7 +++++--
 app/views/users/edit.html.haml       | 11 ++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 6466e5d3e..a8c7411c9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -261,6 +261,10 @@ class User
     terse
   end
 
+  def diaspora_handle
+    "#{self.username}@#{self.terse_url}"
+  end
+
   def do_bad_things
     self.password_confirmation = self.password
   end 
diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml
index 13aba98d9..87b9776b8 100644
--- a/app/views/requests/_new_request.haml
+++ b/app/views/requests/_new_request.haml
@@ -5,9 +5,12 @@
 = form_for Request.new do |f|
   = f.error_messages
 
-  Enter a Diaspora URL, Diaspora username, or random email address:  
+  Enter a Diaspora username:  
+  %br
+  %i= "Your Diaspora username is: #{current_user.diaspora_handle}"
+
   %p
-    = f.label :destination_url, "Your Diaspora URL is: #{current_user.username}@#{request.host}"
+    = f.label :destination_url, "Friend's username"
     = f.text_field :destination_url
   = f.hidden_field :group_id, :value => @group.id
   = f.submit
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index e4c884d83..d8866d275 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -25,8 +25,13 @@
             = link_to image_tag(photo.url(:thumb_medium)), "#"
     =will_paginate @photos
 
-
     %h3 Info
+
+    %p
+      %b
+        DIASPORA USERNAME:
+        = @user.diaspora_handle
+
     %p
       = p.label :first_name
       = p.text_field :first_name, :value => @profile.first_name
@@ -38,10 +43,6 @@
     = f.label :email
     = f.text_field :email
 
-  %p
-    = f.label :url
-    = f.text_field :url
-
   #submit_block
     = link_to "Cancel", root_path
     or