Commit 666639e0

@@ -6,9 +6,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <%= link_to root_path, class: 'brand', style: 'color:hotpink;' do %>
-        Cakeside
-      <% end %>
+      <%= link_to "Cakeside", root_path, class: 'brand', style: 'color:hotpink;' %>
       <div class="nav-collapse collapse">
         <p class="navbar-text pull-right">
         <% if user_signed_in? %>
@@ -21,16 +19,16 @@
         <% end %>
         </p>
         <ul class="nav">
+          <li>
+            <%= form_tag(search_path, method: :get, name: "search", class: "navbar-search pull-left") do %>
+              <%= text_field_tag 'q', @search, class: 'search-query', placeholder: 'Search' %>
+            <% end %>
+          </li>
           <% @categories.each do |category| %>
               <li class="<%= "active" if params["slug"] == category.slug %>"><%= link_to category.name.pluralize, category_path(category) %></li>
           <% end %>
           <li class="<%= "active" if params["controller"] == "profiles" %>"> <%= link_to "Artists", profiles_path %> </li>
           <li class="<%= "active" if params["controller"] == "tutorials" %>"> <%= link_to "Tutorials", tutorials_path %> </li>
-          <li>
-            <%= form_tag(search_path, :method => "get", :name => "search", :class => "navbar-search pull-left") do %>
-              <input name="q" type="text" class="search-query" placeholder="Search" value="<%= @search %>" />
-            <% end %>
-          </li>
           <li>
             <%= link_to user_signed_in? ? my_root_path(anchor: 'cakes/new') : login_path do %>
               <i class="icon-edit icon-large"></i> Add Creation