diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-22 19:13:01 -0400 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-22 19:13:01 -0400 |
commit | 38c2ff9637018d88db7083c76c133da3a72f4c31 (patch) | |
tree | ae5c381e7fe9493abfe8fa6c700df64648246fe2 /app/views/layouts/application.html.erb | |
parent | 3e86ffe1113a096541ea94567bffee79368fb863 (diff) | |
parent | 5c6d6dca48bf3d54f145e859e6d4c8b1befe1f09 (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 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e6b5b25..fb5c1c5 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,15 +13,20 @@ BetterDragSort.makeListSortable(document.getElementById("boxes")); }; </script> -<header><nav> +<header> + <nav> + <%# This is the logo %> <div class="navbar-brand"><%= link_to('Leaguer', root_path) %></div> + + <%# This is the search bar #%> <div> <%= form_tag("/search", method: "get", :class => "search") do %> <%= text_field_tag(:query, nil, :placeholder => "Search") %> - <%= submit_tag("Go") %> + <%= submit_tag("Go", :name=>nil) %> <% end %> </div> + <%# these are the log in buttons #%> <div id="log-buttons"> <% if signed_in? %> <%= link_to current_user.user_name, current_user, :class => "user" %> @@ -34,7 +39,8 @@ <%= link_to "Sign up", new_user_path, :class => "signup" %> <% end %> </div> -</nav></header> + </nav> +</header> <% if notice %><div id="notice"><p><%= notice %></p></div><% end %> |