From 893d92ac722dc9ecd25fd5214d8a1c6719081479 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Wed, 6 Feb 2013 11:39:03 +1100
Subject: [PATCH] Added 'Settings' to top nav

---
 app/controllers/members_controller.rb  |  3 +++
 app/views/layouts/_header.html.haml    | 10 ++++++++--
 spec/views/layouts/application_spec.rb |  8 ++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 40a50f161..d80e688cb 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -25,4 +25,7 @@ class MembersController < ApplicationController
     end
   end
 
+  def edit
+  end
+
 end
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 6a931c173..497b228c4 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -17,8 +17,14 @@
             %li= link_to("Plant something", new_planting_path)
           %li.divider-vertical
           - if member_signed_in?
-            %li= link_to current_member.login_name, member_path(current_member)
-            %li= link_to "Log out", destroy_member_session_path, :method => :delete
+            %li.dropdown<
+              %a.dropdown-toggle{'data-toggle' => 'dropdown', :href => member_path(current_member)}
+                = current_member.login_name
+                %b.caret
+              %ul.dropdown-menu
+                %li= link_to "Profile", member_path(current_member)
+                %li= link_to "Settings", url_for(:controller => 'members', :action => 'edit', :id => current_member)
+                %li= link_to "Log out", destroy_member_session_path, :method => :delete
           - else
             %li.pull-right= link_to 'Sign up', new_member_registration_path
             %li.pull-right= link_to 'Log in', new_member_session_path
diff --git a/spec/views/layouts/application_spec.rb b/spec/views/layouts/application_spec.rb
index eb70be5c2..02ca091a6 100644
--- a/spec/views/layouts/application_spec.rb
+++ b/spec/views/layouts/application_spec.rb
@@ -41,6 +41,14 @@ describe 'layouts/application.html.haml', :type => "view" do
       rendered.should contain 'Plant something'
     end
 
+    it "should show member's name" do
+      assert_select("a[href=/members/#{@member.login_name}]", "Profile")
+    end
+
+    it "should show settings link" do
+      assert_select "a[href=/members/#{@member.login_name}/edit]", "Settings"
+    end
+
     it 'should show logout link' do
       rendered.should contain 'Log out'
     end