diff options
author | Seb Bacon <seb@mysociety.org> | 2012-01-09 09:37:48 +0000 |
---|---|---|
committer | Seb Bacon <seb@mysociety.org> | 2012-01-09 09:37:48 +0000 |
commit | 4f8ff37a127d5f82e63f500a84d22e8b07ab8843 (patch) | |
tree | 568a051bdf11be4099e2ac023aa0cb0d2c28594f /app/views/general/_topnav.rhtml | |
parent | db9eb3724242e82d4275418002e135f6b1c056e9 (diff) | |
parent | 848483381694e67999e446d3784b0c32dfdc3f8d (diff) |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'app/views/general/_topnav.rhtml')
-rw-r--r-- | app/views/general/_topnav.rhtml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/general/_topnav.rhtml b/app/views/general/_topnav.rhtml index 619ff3593..8ef928bba 100644 --- a/app/views/general/_topnav.rhtml +++ b/app/views/general/_topnav.rhtml @@ -1,10 +1,10 @@ <div id="topnav"> <ul id="navigation"> - <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] != 'blog' %>"><%= link_to _("Home"), frontpage_url %></li> + <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] != 'blog' and params[:action] != 'search' %>"><%= link_to _("Home"), frontpage_url %></li> <li class="<%= 'selected' if params[:controller] == 'request' and ['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("Make a request"), select_authority_url, :id => 'make-request-link' %></li> <li class="<%= 'selected' if params[:controller] == 'request' and !['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("View requests"), request_list_successful_url %></li> <li class="<%= 'selected' if params[:controller] == 'public_body' %>"><%= link_to _("View authorities"), list_public_bodies_default %></li> <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] == 'blog' %>"><%= link_to _("Read blog"), blog_url %></li> <li class="<%= 'selected' if params[:controller] == 'help' %>"><%= link_to _("Help"), help_about_url %></li> </ul> -</div>
\ No newline at end of file +</div> |