summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authortkimia <tkimia@purdue.edu>2014-04-22 17:42:57 -0400
committertkimia <tkimia@purdue.edu>2014-04-22 17:42:57 -0400
commitbb53f8ac2ab52301b32fe65ddc10a32f6bc730e8 (patch)
tree7e1f13fc9227093c7c2d5d60777cc7360fb34318 /app/views/layouts
parent44c8a2709c9eebe75f2d97ef2dee28a6f5966c9f (diff)
prelim search
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/application.html.erb12
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 %>