Fix request views, refactor identical forms into partial.

Rakefile

@@ -7,6 +7,5 @@
 
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
-ENV['GNUPGHOME'] = File.expand_path("../../gpg/diaspora-#{Rails.env}/", __FILE__)
 
 Diaspora::Application.load_tasks

app/views/people/_person.html.haml

@@ -18,10 +18,7 @@
         - elsif current_user.pending_requests.find_by_person_id(person.id)
           = link_to =t('.pending_request'), aspects_manage_path
         - else
-          = form_tag(requests_path) do
+          = render :partial => 'requests/new_request_to_person', :locals => {:aspects => @aspects, :person => person}
-            = select_tag(:aspect_id, @aspects_dropdown_array.join.html_safe)
-            = hidden_field_tag :destination_handle, :value => person.diaspora_handle
-            = submit_tag t('.add_friend')
 
     .info
       = person.diaspora_handle

app/views/people/show.html.haml

@@ -30,10 +30,7 @@
           .description
             = t('.request_people')
          
-        = form_tag(requests_path) do
+        = render :partial =>'requests/new_request_to_person', :locals => {:aspects => @aspects, :person => @person}
-          = select_tag(:aspect_id, @aspects_dropdown_array.join.html_safe)
-          = hidden_field_tag :destination_handle, :value => @person.diaspora_handle
-          = submit_tag t('.add_friend')
 
       - else
         %h3

app/views/requests/_new_request_to_person.haml

@@ -0,0 +1,10 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+= form_tag(requests_path) do
+  - pp person
+  - pp aspects
+  = select_tag(:aspect_id, options_from_collection_for_select(aspects, "id", "name"))
+  = hidden_field_tag :destination_handle, :value => person.diaspora_handle
+  = submit_tag t('people.person.add_friend')