From bda87bbeabfe83320e270e6748fe9b1731fadc1e Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 26 Jul 2010 18:13:20 -0700
Subject: [PATCH] MS switched request new links to just the request link

---
 app/views/albums/show.html.haml     |   2 +-
 app/views/people/_sidebar.html.haml |   2 +-
 app/views/people/index.html.haml    |   2 +-
 gpg/diaspora-test/pubring.gpg       | Bin 38446 -> 37380 bytes
 spec/factories.rb                   |   2 +-
 spec/lib/diaspora_parser_spec.rb    |   1 +
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 0a90b024e..65a8a292c 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -2,7 +2,7 @@
   = link_to 'albums', albums_path
   >>
   = @album.name 
-  %h5= "last updated: #{how_long_ago(@album)}"
+  %h4= "last updated: #{how_long_ago(@album)}"
 -unless mine? @album
   %h4= 'by ' + @album.person.real_name
 -if mine? @album
diff --git a/app/views/people/_sidebar.html.haml b/app/views/people/_sidebar.html.haml
index 69836d534..f9a205e1c 100644
--- a/app/views/people/_sidebar.html.haml
+++ b/app/views/people/_sidebar.html.haml
@@ -12,5 +12,5 @@
   - for author in @subscribed_persons
     %li= link_to author.username, author_path(author)
 
-= link_to "add a new person", new_request_path
+= link_to "add a new person", requests_path
 
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index efb46e644..b688b3c5d 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -13,7 +13,7 @@
       %td= link_to 'Show', person
       %td= link_to 'Destroy', person, :confirm => 'Are you sure?', :method => :delete
 
-%p= link_to "Add a friend", new_request_path
+%p= link_to "Add a friend", requests_path
 
 #pagination
   = will_paginate @people
diff --git a/gpg/diaspora-test/pubring.gpg b/gpg/diaspora-test/pubring.gpg
index 413a37f87c212997fa5d9f104ba7c7e9c90756ac..7fe0816872d13da360d5edd77d6ca74a2615731a 100644
GIT binary patch
delta 9
QcmZ3thN)!<(*~AF02Gr0%>V!Z

delta 1038
zcmZo!!nAG;(*~AF^)ne4v3Pe(ixy;Ic>m<RXy8Q=&v_3QzF5sHU^x9{!KDn9v@VN_
z+C_>NvKI*J_#gPy{bS~~t8oWRmR`x6^C>8ZapS9f&$k|YsC=pVhPBB`C8tNcwMUmN
zWm(`|I5%OMu4`)b^TcM|U8b3l0Sev)X3?FiQi`5Gxn!ApZ`bm|iFU8+!yZiIRLp#H
z=Edzceuf2qDm*s*;(yIvW-_zgdbweQ?uCLt=6~wOYebB!b-$}?FFTjYAp42A|IC$j
zGgTC8xDsxKiQSmoztE_s;lawneG@eO3fIis7yCr$n$LPG=lSmvA7}p8&$?Cj?c21b
zeS-5AzVj2y*ea^0r7h>>Ti&xxzOFtnbipm2g2VG$G7J;j&Wq=Izpq;^_~k<8^40%l
zO?4DgURqtyY{~r3u&myoiKXdB68rc6mD~R;$!Phrb$RvNPx1ff$iMMi7FJkT#WAZk
z{^FZM4i};}8mL*knLaC#M?fv4{Qra4?|=L_!vnlmuTa{h{E72(jJotcr{;;dded)d
z$H%odTHe!qen$DVo`6t?vSC|-)aI2vdot%NQd+X1{-(;?zuOYt&B?LZqVAZIS(2#`
zl$e!Rl$fhvlL+GK6+yTT>A8uSIeN+Yxpo~%EW(0J3`(p_plF?ZfK#FVM8ERYJ9B+*
zNw+b~FE7-oW$gc<5y@+mdwb<`RZ*5hz;OS~&$U!;*ZsuW0~4%GzyI@dv;7ghfr){6
zi#DpQ8pX*O`T02t*{PM9P$v{Q<W-jHrKXgk*gR8!Nm`kWo0Ef`nQ8JVPBFL}3g$8_
zxbf(Vuve3#RBS@#p?sr@_dav1FJzdX=xQL<X65A=*V`j<*hEKQ8JEXukQ;U~@`6*S
z01Lx8sm!FJ%nANC*KE6%q|<qdtHDf4y7~F@PV<XXMfP74UVB>RbTy-6tcPrg`^=?P
zvt8fweO~`2^vAY+^=3|0tdsWWN554FjJtdC=t|4?hF>~^#h&}Ns-Ifa{_u@*i-+%~
z$+}nl7I+<0weETSXY&f#I7{viMjYFj_BP!RYF^Ent#O=znVp4U&P{H=E{5Qz-?$&|
zDQLabJk?BO*%cwbX9@rR*8URUz4YT~Rh%Y|BAawjc3-Jlc--;DYcAF2)(7w3eA~yH
zzuP*0<Jp-tw;5gscX^dw`K&WVjKk}J^?|nzg1VxaYgfd1mwo1!v3@;2Ij#7}qrF1a
zdsMf$TWnA85}ocmvuDvyosNwio-7i;DCUGjF_Sb80~e<NERyHtFwA#(r5XK2DWFBF
qI83m~P~5(iU*>cW!#t}NmCu)6T$T}?*S&9pO<Yuh@DgcI2m=88=F5oy

diff --git a/spec/factories.rb b/spec/factories.rb
index d59cfd3fc..b1b61bdcb 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -14,7 +14,7 @@ Factory.define :person do |p|
   p.email "bob-person@aol.com"
   p.active true
   p.sequence(:url)  {|n|"http://google-#{n}.com/"}
-  p.key_fingerprint GPGME::list_keys("Aditi").first.subkeys.first.fingerprint
+  p.key_fingerprint "fffffffffffffffffooooooooooooooo"
   p.profile Profile.new( :first_name => "Robert", :last_name => "Grimm" )
 end
 
diff --git a/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb
index b01f6f247..337d5b862 100644
--- a/spec/lib/diaspora_parser_spec.rb
+++ b/spec/lib/diaspora_parser_spec.rb
@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 include ApplicationHelper 
+include Diaspora::DiasporaParser
 
 describe Diaspora::DiasporaParser do
   before do