From bb53f8ac2ab52301b32fe65ddc10a32f6bc730e8 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Tue, 22 Apr 2014 17:42:57 -0400
Subject: prelim search
---
app/views/layouts/application.html.erb | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'app/views/layouts')
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 %>
--
cgit v1.2.3-2-g168b