diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-22 18:17:47 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-22 18:17:47 -0400 |
| commit | 7f452e8d99a86af2e3dc2f743158951092aedeb7 (patch) | |
| tree | 103f3cb57b05c5a580c3a5152a2a97f5a8070d1e /app/views/layouts/application.html.erb | |
| parent | 7fe1f6a809d68648bede431b84692bf7d8bb0c01 (diff) | |
| parent | 7deb9c1c7acadf9a5b638313f51ba9dc60624672 (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 %> |