diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-23 13:19:56 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-23 13:19:56 -0400 |
| commit | 9d6dc1e5959590eeca5f9ea19cf731d73c735bd6 (patch) | |
| tree | fd135e0f543a7f78388c91992fcfa85b5b7564dd /app/views/layouts/application.html.erb | |
| parent | b2ceff6667461a6db587c4077ef56bdb4fe9f44b (diff) | |
| parent | 21d6ddb3b2e85fa24f331dbf547133a34b0d37bd (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/layouts/application.html.erb')
| -rw-r--r-- | app/views/layouts/application.html.erb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index eca33b8..c45fb20 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,15 +4,12 @@ <title>Leaguer</title> <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> <%= javascript_include_tag "application", "data-turbolinks-track" => true %> + <%= javascript_include_tag "#{params[:controller]}", "data-turbolinks-track" => true %>%> + <%= javascript_include_tag "#{params[:controller]}_#{params[:action]}", "data-turbolinks-track" => true %>%> <%= csrf_meta_tags %> <%= yield :head %> </head> <body> -<script> - window.onload = function() { - BetterDragSort.makeListSortable(document.getElementById("boxes")); - }; -</script> <header> <nav> <%# This is the logo %> @@ -21,8 +18,8 @@ <%# This is the search bar #%> <div> <%= form_tag("/search", method: "get", :class => "search") do %> - <%= text_field_tag(:query, nil, :placeholder => "Search") %> - <%= submit_tag("Go", :name=>nil) %> + <%= text_field_tag(:query, params[:query]) %> + <%= submit_tag("Search", :name=>nil) %> <% end %> </div> |