diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-27 20:52:01 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-27 20:52:01 -0400 |
| commit | e526f5b62b3dc91ca30eb0382c071227b74baddf (patch) | |
| tree | 6b25931d6b08446ea13a04c490485e50aeed6219 /app/views/layouts/application.html.erb | |
| parent | 12b9f96b4003ec384e1583e4d6d53fcb8d5f960c (diff) | |
| parent | 4d47e5e7b5d838173dd3ab68c293c03e03811392 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/layouts/application.html.erb')
| -rw-r--r-- | app/views/layouts/application.html.erb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cf55c18..9eea734 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -28,13 +28,16 @@ <% if signed_in? %> <%= link_to current_user.user_name, current_user, :class => "user" %> <%= link_to "Messages", pms_path, :class => "signup" %> - <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %> <% if current_user.can? :edit_server %> <%= link_to "Server settings", edit_server_path, :class => "server" %> <% end %> <% if current_user.can? :create_alert %> - <%= link_to "Create Alert", new_alert_path, :class => "signin" %> + <%= link_to "Create Alert", new_alert_path, :class => "create-alert" %> <% end %> + <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %> + <%= link_to "", alerts_path, :class => "alerts"%> + + <% else %> <%= link_to "Log in", new_session_path, :class => "signin" %> <%= link_to "Sign up", new_user_path, :class => "signup" %> |