Skip to content

Commit

Permalink
remove link from constraints text
Browse files Browse the repository at this point in the history
  • Loading branch information
mejackreed authored and cbeer committed Jul 7, 2014
1 parent b10011a commit 077f38b
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 30 deletions.
3 changes: 2 additions & 1 deletion app/assets/stylesheets/blacklight/_catalog.css.scss
Expand Up @@ -56,6 +56,7 @@ span.constraints-label {
&:hover, &:active {
background-color: $btn-default-bg;
border-color: $btn-default-border;
box-shadow: none;
}
}

Expand Down Expand Up @@ -188,4 +189,4 @@ label.toggle_bookmark
.caption {
@extend .sr-only;
}
}
}
49 changes: 24 additions & 25 deletions app/views/catalog/_constraints_element.html.erb
@@ -1,34 +1,33 @@
<%- # local params:
# label
<% # local params:
# label
# value
# options =>
# :remove => url for a remove constraint link
# :classes => array of classes to add to container span
options ||= {}
-%>
%>

<span class="btn-group appliedFilter constraint <%= options[:classes].join(" ") if options[:classes] %>">
<a href="#" class="constraint-value btn btn-sm btn-default btn-disabled">
<%- unless label.blank? -%>
<span class="filterName"><%= label %></span>
<%- end -%>
<%- unless value.blank? -%>
<span class="filterValue"><%= value %></span>
<%- end -%>
</a>
<span class="constraint-value btn btn-sm btn-default btn-disabled">
<% unless label.blank? %>
<span class="filterName"><%= label %></span>
<% end %>
<% unless value.blank? %>
<span class="filterValue"><%= value %></span>
<% end %>
</span>
<% unless options[:remove].blank? %>
<% accessible_remove_label = content_tag :span, class: 'sr-only' do
if label.blank?
t('blacklight.search.filters.remove.value', value: value)
else
t('blacklight.search.filters.remove.label_value', label: label, value: value)
end
end
%>
<%- unless options[:remove].blank? -%>
<% accessible_remove_label = content_tag :span, :class => 'sr-only' do
if label.blank?
t('blacklight.search.filters.remove.value', :value => value)
else
t('blacklight.search.filters.remove.label_value', :label => label, :value => value)
end
end
%>
<%= link_to(content_tag(:span, '', :class => 'glyphicon glyphicon-remove') + accessible_remove_label,
options[:remove], :class => 'btn btn-default btn-sm remove dropdown-toggle'
) %>
<%- end -%>
<%= link_to(content_tag(:span, '', class: 'glyphicon glyphicon-remove') + accessible_remove_label,
options[:remove], class: 'btn btn-default btn-sm remove dropdown-toggle'
) %>
<%- end -%>
</span>
10 changes: 6 additions & 4 deletions spec/views/catalog/_constraints_element.html.erb_spec.rb
Expand Up @@ -7,8 +7,10 @@
end
it "should render label and value" do
expect(rendered).to have_selector("span.appliedFilter.constraint") do |s|
expect(s).to have_css("span.constraint-value")
expect(s).to_not have_css("a.constraint-value")
expect(s).to have_selector "span.filterName", :content => "my label"
expect(s).to have_selector "span.filterValue", :content => "my value"
expect(s).to have_selector "span.filterValue", :content => "my value"
end
end
end
Expand All @@ -20,7 +22,7 @@
it "should include remove link" do
expect(rendered).to have_selector("span.appliedFilter") do |s|
expect(s).to have_selector(".remove[href='http://remove']")
end
end
end

it "should have an accessible remove label" do
Expand All @@ -37,7 +39,7 @@
it "should not include checkmark" do
expect(rendered).to have_selector("span.appliedFilter") do |s|
expect(s).to_not have_selector("img[src$='checkmark.gif']")
end
end
end
end

Expand All @@ -60,6 +62,6 @@
end

end


end

0 comments on commit 077f38b

Please sign in to comment.