diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-04-27 23:45:07 -0400 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-04-27 23:45:07 -0400 |
| commit | 7a3fe845d568f6eab1e7a55239daed3685797c2e (patch) | |
| tree | 18f84996ddf5c02af9d7fc1c829d85d6c62a2f18 /app/views/layouts/application.html.erb | |
| parent | d38f6fa6262803f3c6380a43f32de4889fcacaec (diff) | |
| parent | 1c37ae521e29a5e0869aba52d324ed0cd4a830a6 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/Leaguer
Conflicts:
app/views/tournaments/_form.html.erb
Diffstat (limited to 'app/views/layouts/application.html.erb')
| -rw-r--r-- | app/views/layouts/application.html.erb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9eea734..f3535e9 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -35,9 +35,8 @@ <%= 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"%> - - + <%# if there is an unread alert then I wanna be able to show the notification icon by saying :style => display:inline. This will be Done by Guntas once he figures out how to get unread alerts. Psuedo if alerts.unread > 0 then display else don't.%> + <%= link_to "", alerts_path, :class => "alerts", :id => "alerts-ajax"%> <% else %> <%= link_to "Log in", new_session_path, :class => "signin" %> <%= link_to "Sign up", new_user_path, :class => "signup" %> |