From 900f1080a2239a7690a828831b35e97ad994962d Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Thu, 8 Jul 2010 14:38:26 -0700
Subject: [PATCH] DG MS; fixed destroy links for status messages, added link
 for requests on top nav

---
 app/views/layouts/application.html.haml             | 10 ++++++----
 app/views/person_requests/_person_request.html.haml |  7 +++++--
 app/views/status_messages/_status_message.html.haml |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index bc9bcb039..7365d8b39 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,8 +2,8 @@
 %html
   %head
     %title
-      = "diaspora "
-      = "- #{User.first.real_name}" if User.first
+      = User.first.real_name if User.first
+      = " | diaspora"
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
     
     = stylesheet_link_tag "blueprint/screen", :media => 'screen'
@@ -16,8 +16,8 @@
     = csrf_meta_tag
     = yield(:head)
 
-  
-  = javascript_include_tag 'satisfaction' , 'satisfaction-display'
+    = javascript_include_tag 'satisfaction' , 'satisfaction-display'
+
   %body
     %header
       .container
@@ -32,6 +32,8 @@
           - if user_signed_in?
             =User.first.real_name
             |
+            = link_to "requests", person_requests_path
+            |
             = link_to "logout", destroy_user_session_path
           - else
             = link_to "login", new_user_session_path
diff --git a/app/views/person_requests/_person_request.html.haml b/app/views/person_requests/_person_request.html.haml
index b492c539c..29f16e264 100644
--- a/app/views/person_requests/_person_request.html.haml
+++ b/app/views/person_requests/_person_request.html.haml
@@ -1,2 +1,5 @@
-%li.message{:id => person_request.id} 
-  = person_request.inspect
+%li.message{:id => person_request.id, :class => "mine"}
+  = person_request.url
+
+  .destroy_link
+    = link_to 'Ignore', person_request_path(person_request), :confirm => 'Are you sure?', :method => :delete, :remote => true
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index 1333640f9..1434ca0d2 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -11,4 +11,4 @@
 
   - if mine?(post)
     .destroy_link
-      = link_to 'Delete', status_message_url(post), :confirm => 'Are you sure?', :method => :delete, :remote => true
+      = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true