Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix Issue 3078 with non-standard bookmarks navigation #625

Merged
merged 1 commit into from

2 participants

@sarken
Collaborator

Issue 3078 with bookmarks index navigation actions appearance varying from other index navigation: http://code.google.com/p/otwarchive/issues/detail?id=3078

@CristinaRO
Collaborator

Looks good.

@CristinaRO CristinaRO merged commit 4719dec into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 14, 2012
  1. @sarken
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 6 deletions.
  1. +4 −6 app/views/bookmarks/index.html.erb
View
10 app/views/bookmarks/index.html.erb
@@ -20,13 +20,11 @@
<% if current_user.is_a?(User) %>
<li><%= link_to ts("Bookmark External Work"), new_external_work_path %></li>
<% end %>
- <!--BACK END pls regularise this with other navigation to show both options at all times and span_if_current-->
<li>
- <% if params[:recs_only] %>
- <%= link_to ts("View All Bookmarks"), url_for(params.merge :recs_only => false) %>
- <% else %>
- <%= link_to ts("View Recs Only"), url_for(params.merge :recs_only => true) %>
- <% end %>
+ <%= span_if_current(ts("View All Bookmarks"), url_for(params.merge :recs_only => false), params[:recs_only].blank?) %>
+ </li>
+ <li>
+ <%= span_if_current ts("View Recs Only"), url_for(params.merge :recs_only => true) %>
</li>
<% if params[:tag_id] %>
<%= taggable_list(params[:tag_id], "bookmarks") %>
Something went wrong with that request. Please try again.