diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 7b9282081..a501d619e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -67,7 +67,6 @@ = text_field_tag 'q' %li= link_to current_user.real_name, current_user.person - %li= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count) %li= link_to "edit profile", edit_user_path(current_user) %li= link_to "logout", destroy_user_session_path @@ -102,7 +101,3 @@ .span-19.prepend-5.last = render "posts/debug" - - #notification_badge.requests - = link_to "requests (#{@request_count})", requests_path - diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml index 13016044d..0148e9b1b 100644 --- a/app/views/shared/_aspect_nav.haml +++ b/app/views/shared/_aspect_nav.haml @@ -32,7 +32,7 @@ = link_to "All Aspects", root_url %li{ :style => "margin-right:0;" } - = link_to "manage", edit_aspect_path(Aspect.first), :class => "edit_aspect_button", :title => "Manage your Aspects" + = link_to ( (@request_count == 0)? "manage" : "manage (#{@request_count})"), edit_aspect_path(Aspect.first), :class => "edit_aspect_button", :class => new_request(@request_count), :title => "Manage your Aspects" .yo{ :style => "display:none;"} #add_aspect_pane diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 99f07051b..dc4dc3712 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -483,6 +483,8 @@ h1.big_text { background-color: #efefef; } #aspect_nav ul > li.selected a a { color: black; } + #aspect_nav .new_requests { + color: red; } #global_search { display: inline; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 786d9faa6..d5c0d06e3 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -654,7 +654,8 @@ h1.big_text :color #efefef a :color #000 - + .new_requests + :color red #global_search :display inline