Refactor

Add search (partial)

1 files changed, 4 insertions, 2 deletions

diff --git a/app/views/layouts/_base.html.haml b/app/views/layouts/_base.html.haml
index 8997bd5..e3cee24 100644
--- a/app/views/layouts/_base.html.haml
+++ b/app/views/layouts/_base.html.haml
@@ -12,10 +12,12 @@
             = link_to "aclog", :controller => "main", :action => "index"
           %ul.nav.pull-right
             %li
+              = link_to "search", :controller => "search", :action => "search"
+            %li
               = link_to "about", :controller => "main", :action => "about"
-            - if session[:screen_name]
+            - if session[:user_id]
               %li= link_to "logout", :controller => "sessions", :action => "destroy"
-              %li= link_to "@#{session[:screen_name]}", :controller => "users", :action => "best", :screen_name => session[:screen_name]
+              %li= link_to_user_page session[:account].user.screen_name
             - else
               %li= link_to "login", "/i/login"
     .container