Commit 587415cdcf8929fedb71b1f242c0ff3866ed950e
1 parent
a8726645
Exists in
master
and in
29 other branches
Reorder search and navigation links to a common ordering
Ideally we want to merge both of them somehow...
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
app/controllers/public/search_controller.rb
| @@ -175,9 +175,9 @@ class SearchController < PublicController | @@ -175,9 +175,9 @@ class SearchController < PublicController | ||
| 175 | 175 | ||
| 176 | AVAILABLE_SEARCHES = ActiveSupport::OrderedHash[ | 176 | AVAILABLE_SEARCHES = ActiveSupport::OrderedHash[ |
| 177 | :articles, _('Contents'), | 177 | :articles, _('Contents'), |
| 178 | - :enterprises, _('Enterprises'), | ||
| 179 | :people, _('People'), | 178 | :people, _('People'), |
| 180 | :communities, _('Communities'), | 179 | :communities, _('Communities'), |
| 180 | + :enterprises, _('Enterprises'), | ||
| 181 | :products, _('Products and Services'), | 181 | :products, _('Products and Services'), |
| 182 | :events, _('Events'), | 182 | :events, _('Events'), |
| 183 | ] | 183 | ] |
public/designs/themes/base/navigation.html.erb
| 1 | <li> | 1 | <li> |
| 2 | + <%= search_contents_menu %> | ||
| 3 | +</li> | ||
| 4 | +<li> | ||
| 2 | <%= search_people_menu %> | 5 | <%= search_people_menu %> |
| 3 | </li> | 6 | </li> |
| 4 | <li> | 7 | <li> |
| 5 | <%= search_communities_menu %> | 8 | <%= search_communities_menu %> |
| 6 | </li> | 9 | </li> |
| 7 | -<li> | ||
| 8 | - <%= search_contents_menu %> | ||
| 9 | -</li> | ||
| 10 | <li><a href="/search/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li> | 10 | <li><a href="/search/events"><span class='icon-menu-events'><%= _('Events') %></span></a></li> |