Bug 518946 - [faceted search] remove (or improve) the ORing of terms choice from the search results, r=asuth, a=blocker
--- a/mail/base/content/glodaFacetBindings.xml
+++ b/mail/base/content/glodaFacetBindings.xml
@@ -84,25 +84,16 @@
if (iTerm)
spanify(criteriaText, "explanation-fulltext-criteria");
spanify(term, "explanation-fulltext-term");
}
if (labelPost)
spanify(labelPost, "explanation-fulltext-label");
- if (aMsgSearcher.fulltextTerms.length > 1) {
- spanify(
- glodaFacetStrings.get("glodaFacetView.constraints.query.fulltext." +
- (aMsgSearcher.andTerms ? "changeToOrLabel" : "changeToAndLabel")),
- "explanation-change-label")
- .onclick = function() {
- FacetContext.toggleFulltextCriteria();
- };
- }
]]></body>
</method>
<method name="setQuery">
<parameter name="aMsgQuery" />
<body><![CDATA[
try {
while (this.lastChild)
this.removeChild(this.lastChild);
--- a/mail/base/content/glodaFacetView.css
+++ b/mail/base/content/glodaFacetView.css
@@ -129,32 +129,16 @@ h1, h2, h3 {
cursor: default;
}
#filter-header-label {
margin: 0;
margin-top: 1em;
}
-.explanation-change-label {
- display: inline-block;
- color: black;
- font-size: 60%;
- padding: 3px;
- margin: 0 0.1em;
- margin-left: 1em;
- border: 1px solid grey;
- -moz-border-radius: 4px;
-}
-
-.explanation-change-label:hover {
- cursor: pointer;
- background-color: #aed5ff;
-}
-
.facetious[uninitialized] {
display: none;
}
.facetious {
display: list-item; /* take the whole column width */
list-style: none;
padding: 2px;
--- a/mail/locales/en-US/chrome/messenger/glodaFacetView.properties
+++ b/mail/locales/en-US/chrome/messenger/glodaFacetView.properties
@@ -43,18 +43,16 @@
glodaFacetView.tab.query.label=Search
# LOCALIZATION NOTE(glodaFacetView.constraints.query.fulltext.label):
# The label to display to describe when our base query was a fulltext search
# across messages. The value is displayed following the label.
glodaFacetView.constraints.query.fulltext.label=Searching for #1
glodaFacetView.constraints.query.fulltext.andJoinWord=and
glodaFacetView.constraints.query.fulltext.orJoinWord=or
-glodaFacetView.constraints.query.fulltext.changeToAndLabel=require all terms instead
-glodaFacetView.constraints.query.fulltext.changeToOrLabel=require any of the terms instead
# LOCALIZATION NOTE(glodaFacetView.constraints.query.initial):
# The label to display to describe when our base query is not a full-text
# search. Additional labels are appended describing each constraint.
glodaFacetView.constraints.query.initial=Searching for messages
# LOCALIZATION NOTE(glodaFacetView.constraints.query.involves.label):
# The label to display to describe when our base query was on messages