Unify format of hash, refactor some controller/helper methods

1 files changed, 8 insertions, 8 deletions

diff --git a/app/views/layouts/_base.html.haml b/app/views/layouts/_base.html.haml
index ddae521..d0c876c 100644
--- a/app/views/layouts/_base.html.haml
+++ b/app/views/layouts/_base.html.haml
@@ -1,7 +1,7 @@
 !!! xml
 %html{xmlns: "http://www.w3.org/1999/xhtml"}
   %head
-    %title= raw @title.to_s + " - aclog"
+    %title= strip_tags(@title.to_s) + " - aclog"
     = stylesheet_link_tag "application"
     = javascript_include_tag "twitter"
     = javascript_include_tag "application"
@@ -10,17 +10,17 @@
       .navbar-inner
         .container
           .brand
-            = link_to "aclog", :controller => "main", :action => "index"
+            = link_to "aclog", controller: "main", action: "index"
           %ul.nav.pull-right
             %li
-              = link_to "report", :controller => "report", :action => "index"
+              = link_to "report", controller: "report", action: "index"
             %li
-              = link_to "search", :controller => "search", :action => "search"
+              = link_to "search", controller: "search", action: "search"
             %li
-              = link_to "about", :controller => "main", :action => "about"
-            - if session[:user_id]
-              %li= link_to "logout", :controller => "sessions", :action => "destroy"
-              %li= link_to_user_page session[:account].user.screen_name
+              = link_to "about", controller: "main", action: "about"
+            - if logged_in?
+              %li= link_to "logout", controller: "sessions", action: "destroy"
+              %li= link_to session[:account].user.screen_name, user_path(session[:account].user.screen_name)
             - else
               %li= link_to "login", "/i/login"
     .container