diff options
author | re4k <re4k@re4k.info> | 2013-04-22 00:10:18 +0900 |
---|---|---|
committer | re4k <re4k@re4k.info> | 2013-04-22 00:10:18 +0900 |
commit | 667d88c12805d2a1f5b62b9ff4e04d6e9ba595fe (patch) | |
tree | de23f79ab04ed533364561f3fe44afa49c216797 /app/views/layouts/_base.html.haml | |
parent | 88026553952be01d4b5e46d59c66444d93ad1410 (diff) | |
download | aclog-667d88c12805d2a1f5b62b9ff4e04d6e9ba595fe.tar.gz |
Unify format of hash, refactor some controller/helper methods
Diffstat (limited to 'app/views/layouts/_base.html.haml')
-rw-r--r-- | app/views/layouts/_base.html.haml | 16 |
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 |