Tweaking User model

app/models/user.rb

@@ -27,7 +27,7 @@ def rated_projects
     return project_list
   end
 
-  named_scope :registered, :conditions => {:state => "active"}  
+  named_scope :registered, :conditions => ["state = 'active' OR state = 'pending'"]
   named_scope :nil_password, :conditions => {:crypted_password => nil}
 
   # Virtual attribute for the unencrypted password

app/views/users/show.html.haml

@@ -12,13 +12,14 @@
 
   #body_right
     - if current_or_anon_user == @user
-      - if @user.active?
+      - if @user.anonymous?
         - right_box do
-          = partial "users/parts/about_user", :user => @user
+          = br
+          %h2= link_to "Create an Account!", new_user_url
+          %p In order to save your bookmarks, and share your profile with others, sign up now!
       - else
         - right_box do
-          = br
-          %h2= link_to "Make an Account!", new_user_url
+          = partial "users/parts/about_user", :user => @user
     - else
       - right_box do
         %h3== #{name_display(@user)} Profile