kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#692] Cleanup layout structure from rebase

This commit is contained in:
Eric Davis 2011-12-09 14:15:03 -08:00
parent 971277b507
commit b312bf387a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/layouts/base.rhtml
View File

@ -40,7 +40,7 @@
<%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %> <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
<%= text_field_tag 'q', @question, :size => 20, :class => 'search_field', :placeholder => l(:search_input_placeholder), :accesskey => accesskey(:quick_search) %> <%= text_field_tag 'q', @question, :size => 20, :class => 'search_field', :placeholder => l(:search_input_placeholder), :accesskey => accesskey(:quick_search) %>
<% end %> <% end %>
</ul> </div>
<% if User.current.logged? || !Setting.login_required? %> <% if User.current.logged? || !Setting.login_required? %>
<ul id="account-nav"> <ul id="account-nav">
@ -70,14 +70,7 @@
</ul> </ul>
</li> </li>
<li> <li>
<label for='q'> <%= render_menu_node(help_menu_item) %>
<%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search), :class => 'search' %>
</label>
<% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get, :id => 'nav-search' ) do %>
<%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
<%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %>
<% end %>
<%= render_menu_node(help_menu_item) %>
<% unless User.current.logged? %> <% unless User.current.logged? %>
<li> <li>
<%= link_to l(:label_login), {:controller => 'account', :action => 'login'}, :class => 'login' %> <%= link_to l(:label_login), {:controller => 'account', :action => 'login'}, :class => 'login' %>