Commit cff8cccd8f272d68a70b76f9096523b90f3138a4
1 parent
5fa8a733
Exists in
master
and in
29 other branches
Removed duplicated browse_content_menu
Showing
1 changed file
with
2 additions
and
12 deletions
Show diff stats
app/helpers/application_helper.rb
| @@ -1088,7 +1088,8 @@ module ApplicationHelper | @@ -1088,7 +1088,8 @@ module ApplicationHelper | ||
| 1088 | def search_contents_menu | 1088 | def search_contents_menu |
| 1089 | links = [ | 1089 | links = [ |
| 1090 | {s_('contents|More Recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}}, | 1090 | {s_('contents|More Recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}}, |
| 1091 | - {s_('contents|More Viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}} | 1091 | + {s_('contents|More Viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}}, |
| 1092 | + {s_('contents|Most Commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}} | ||
| 1092 | ] | 1093 | ] |
| 1093 | if logged_in? | 1094 | if logged_in? |
| 1094 | links.push(_('New Content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})})) | 1095 | links.push(_('New Content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})})) |
| @@ -1131,17 +1132,6 @@ module ApplicationHelper | @@ -1131,17 +1132,6 @@ module ApplicationHelper | ||
| 1131 | end | 1132 | end |
| 1132 | alias :browse_communities_menu :search_communities_menu | 1133 | alias :browse_communities_menu :search_communities_menu |
| 1133 | 1134 | ||
| 1134 | - def browse_contents_menu | ||
| 1135 | - links = [ | ||
| 1136 | - {s_('contents|More Comments') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_comments'})}}, | ||
| 1137 | - {s_('contents|More Views') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_views'})}}, | ||
| 1138 | - {s_('contents|More Recent') => {:href => url_for({:controller => 'browse', :action => 'contents', :filter => 'more_recent'})}} | ||
| 1139 | - ] | ||
| 1140 | - | ||
| 1141 | - link_to(content_tag(:span, _('Contents'), :class => 'icon-blog'), {:controller => "browse", :action => 'contents'}, :id => 'submenu-contents') + | ||
| 1142 | - link_to(content_tag(:span, _('Contents Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger') | ||
| 1143 | - end | ||
| 1144 | - | ||
| 1145 | def pagination_links(collection, options={}) | 1135 | def pagination_links(collection, options={}) |
| 1146 | options = {:previous_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options) | 1136 | options = {:previous_label => '« ' + _('Previous'), :next_label => _('Next') + ' »'}.merge(options) |
| 1147 | will_paginate(collection, options) | 1137 | will_paginate(collection, options) |