diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 19:51:46 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 19:51:46 -0500 |
| commit | d73a82b74685df29eb37c1a8b250951827dc164b (patch) | |
| tree | e9fc3e56cc60e4262f4870e834b7dbc5f13e31d2 /app/views/layouts/application.html.erb | |
| parent | 7ea754bef9e07405a86ce3fc9b0597fef3c1aa35 (diff) | |
| parent | 6db29eb669a85e5b0aac7a1e8879781a1cb77772 (diff) | |
I REALLY hope I'm not overwriting anything
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/custom.css.scss
Diffstat (limited to 'app/views/layouts/application.html.erb')
| -rw-r--r-- | app/views/layouts/application.html.erb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9cc30bc..75a9d4e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,7 +9,7 @@ </head> <body> <header><nav> - <div class="navbar-brand no-dec"><%= link_to('Leaguer', root_path, nil) %></div> + <div class="navbar-brand no-dec"><%= link_to('Leaguer', root_path, :style => "color:white") %></div> <div> <%= form_tag("/search", method: "get", :class => "navbar-form navbar-right") do %> <%= text_field_tag(:query, nil, :placeholder => "Search") %> @@ -19,12 +19,11 @@ <div id="log-buttons"> <% if signed_in? %> - <%= current_user.user_name.upcase %> - <%= link_to "Sign out", "/signout", method: "delete", :class => "signout", :role => "button" %> + <%= link_to current_user.user_name, current_user, :class => "user" %> + <%= render "common/signout" %> <% else %> - <%= link_to "Log in", new_session_path, :class => "signin", :role => "button" %> - <%= link_to "Sign up", new_user_path, :class => "signup", :role => "button" - %> + <%= link_to "Log in", new_session_path, :class => "signin" %> + <%= link_to "Sign up", new_user_path, :class => "signup" %> <% end %> </div> </nav></header> |