53d0059a
896a69d
@@ -11,36 +11,32 @@ <ul class="nav"> <li><a href="/">Home</a></li> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Categories<b class="caret"></b></a> - <ul class="dropdown-menu"> - <% Category.all.each do |category| %> - <li><a href="/categories/<%= category.slug %>"><%= category.name %></a></li> - <% end %> - </ul> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Categories<b class="caret"></b></a> + <ul class="dropdown-menu"> + <% Category.all.each do |category| %> + <li><a href="/categories/<%= category.slug %>"><%= category.name %></a></li> + <% end %> + </ul> </li> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Help<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="/privacy.html">Privacy Policy</a></li> - <li class="divider"></li> - <li><a href="/terms.html">Terms and Conditions</a></li> - </ul> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Help<b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="/privacy.html">Privacy Policy</a></li> + <li class="divider"></li> + <li><a href="/terms.html">Terms and Conditions</a></li> + </ul> </li> </ul> <%= form_tag(search_index_path, :method => "get", :name => "search", :class => "navbar-search pull-left") do %> <input name="q" type="text" class="search-query" placeholder="Search" /> - <%# <input type="submit" value="search" />%> <% end %> - </div><!--/ .nav-collapse --> + </div> <ul class="nav pull-right"> <li class="hidden-phone"><%= link_to "Add Creation", new_creation_path, :style => "color:#48ce62;" %></li> <li class="divider-vertical hidden-phone"></li> <% if user_signed_in? %> <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#"> - <%= current_user.name %> - <b class="caret"></b> - </a> + <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= current_user.name %><b class="caret"></b></a> <ul class="dropdown-menu"> <li><%= link_to "My Profile", profiles_mine_path %></li> <li><%= link_to "My Favorites", profiles_favorites_path %></li> @@ -54,5 +50,5 @@ <% end %> </ul> </div> - </div><!-- /navbar-inner --> -</div><!-- /navbar --> + </div> +</div>