modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/AbstractSearchBar.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
| 55 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
| 31 -----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
| 5
modules/enterprise/gui/coregui/src/main/webapp/css/search.css
| 11 --
5 files changed, 4 insertions(+), 100 deletions(-)
New commits:
commit 2a8710a5d7c0a1780ec77208d1d71afb5630b4c7
Author: Joseph Marques <joseph(a)redhat.com>
Date: Sun Dec 19 22:52:26 2010 -0500
remove offset so SearchBar sits in line properly
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
b/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
index 2f96535..45b13f3 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
@@ -59,7 +59,6 @@ div {
/*
- *
* search container elements
*/
@@ -74,8 +73,6 @@ div {
.searchBarBackgroundContainer {
position: absolute;
- top: 5px;
- left: 5px;
background-color: white;
border-style: inset;
border-color: gray;
commit 38b76483415e7644a0fa7b4a7e3c4f4180358d9c
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Dec 16 02:54:13 2010 -0500
fix SearchBar styling to eliminate JSF-style color border and correct inset
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
b/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
index cd75fbc..2f96535 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
@@ -61,13 +61,12 @@ div {
/*
*
* search container elements
- *
*/
.searchBarContainer {
width: 800px;
position: relative;
- background-color: rgb(233, 230, 225);
+ background-color: white;
height: 34px;
vertical-align: bottom;
z-index: 999999;
@@ -79,10 +78,7 @@ div {
left: 5px;
background-color: white;
border-style: inset;
- border-top-color: rgb(222, 222, 222);
- border-left-color: rgb(222, 222, 222);
- border-bottom-color: white;
- border-right-color: white;
+ border-color: gray;
border-width: 1px 1px 1px 1px;
padding: 0;
width: 785px;
commit cbeb637f476b69ba543bc283246f60bdbc6fd517
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Dec 16 02:28:27 2010 -0500
get rid of unused methods
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
index 23d9626..9e3e6eb 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
@@ -193,11 +193,6 @@ public class FlexSearchBar extends AbstractSearchBar {
// presume the enclosing page logic loads results without a button click
}
- public static native String getUserAgent()
- /*-{
- return navigator.userAgent.toLowerCase();
- }-*/;
-
public SavedSearchManager getSavedSearchManager() {
return savedSearchManager;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
index 9ce630b..b421132 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
@@ -184,11 +184,6 @@ public class SearchBar extends AbstractSearchBar {
// presume the enclosing page logic loads results without a button click
}
- public static native String getUserAgent()
- /*-{
- return navigator.userAgent.toLowerCase();
- }-*/;
-
public SavedSearchManager getSavedSearchManager() {
return savedSearchManager;
}
commit c69e48b06bd5ba26ba91aeb4be8b3be726cb1564
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Dec 16 02:26:14 2010 -0500
welcome msg redundant with SearchBar label, delete it and accompanying logic
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/AbstractSearchBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/AbstractSearchBar.java
index ac4a874..a0d44db 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/AbstractSearchBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/AbstractSearchBar.java
@@ -32,8 +32,6 @@ public abstract class AbstractSearchBar extends Composite {
public abstract SearchSubsystem getSearchSubsystem();
- public abstract String getWelcomeMessage();
-
public abstract String getSelectedTab();
public abstract void activateSavedSearch(String savedSearchName);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
index 172bd13..23d9626 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
@@ -62,8 +62,6 @@ public class FlexSearchBar extends AbstractSearchBar {
private static final Messages MSG = CoreGUI.getMessages();
- public String welcomeMessage;
-
public static final String DEFAULT_PATTERN_NAME =
MSG.view_searchBar_defaultPattern();
private static final String IMAGE_DIR = "/coregui/images/search/";
@@ -106,7 +104,7 @@ public class FlexSearchBar extends AbstractSearchBar {
if (event.getNativeEvent().getEventTarget().equals(searchButton)
&& event.getTypeInt() == Event.ONMOUSEDOWN) {
- prepareSearchExecution();
+ //prepareSearchExecution();
}
}
}
@@ -150,20 +148,6 @@ public class FlexSearchBar extends AbstractSearchBar {
savedSearchManager = new SavedSearchManager(this);
}
- private Element createDiv(Element parentDiv, String className, String id) {
- Element div = DOM.createDiv();
- if (parentDiv != null) {
- parentDiv.appendChild(div);
- }
- if (className != null) {
- div.addClassName(className);
- }
- if (id != null) {
- div.setId(id);
- }
- return div;
- }
-
private HorizontalPanel createHPanel(Panel parent, String className, String id) {
HorizontalPanel panel = new HorizontalPanel();
if (parent != null) {
@@ -179,15 +163,6 @@ public class FlexSearchBar extends AbstractSearchBar {
}
public void onSavedSearchManagerLoaded() {
- /*
- RootPanel.get("patternFieldContainer").add(autoCompletePatternField);
- RootPanel.get("patternNameFieldContainer").add(patternNameField);
- RootPanel.get("patternNameLabelContainer").add(patternNameLabel);
- RootPanel.get("starImageContainer").add(starImage);
- RootPanel.get("arrowImageContainer").add(arrowImage);
- RootPanel.get("savedSearchesContainer").add(savedSearchesPanel);
- */
-
sbc_sbbgc_sbcc_sbclhs_pfc.add(autoCompletePatternField);
sbc_sbbgc_sbcc_sbcrhs_pnfc.add(patternNameField);
sbc_sbbgc_sbcc_sbcrhs_pnlc.add(patternNameLabel);
@@ -202,7 +177,6 @@ public class FlexSearchBar extends AbstractSearchBar {
setupArrowImage();
setupSavedSearches();
- //
if (defaultSearchText != null) {
this.autoCompletePatternField.setText(defaultSearchText);
click(searchButton); // execute the search with this default search
expression
@@ -230,10 +204,6 @@ public class FlexSearchBar extends AbstractSearchBar {
public void setSearchSubsystem(SearchSubsystem searchSubsystem) {
this.searchSubsystem = searchSubsystem;
-
- this.welcomeMessage =
MSG.view_searchBar_welcomeMessage(this.searchSubsystem.getName());
-
- this.autoCompletePatternField.setText(welcomeMessage);
}
public SearchSubsystem getSearchSubsystem() {
@@ -264,17 +234,6 @@ public class FlexSearchBar extends AbstractSearchBar {
return defaultSavedSearchPatternId;
}
- public String getWelcomeMessage() {
- return welcomeMessage;
- }
-
- public void prepareSearchExecution() {
- String searchTerms = autoCompletePatternField.getText().toLowerCase().trim();
- if (searchTerms.equals(welcomeMessage)) {
- autoCompletePatternField.setText("");
- }
- }
-
private void setupAutoCompletingPatternField() {
autoCompletePatternField.getElement().setId("patternField");
autoCompletePatternField.setStyleName("patternField");
@@ -397,18 +356,11 @@ public class FlexSearchBar extends AbstractSearchBar {
}
public void onFocus(FocusEvent event) {
- // clear default search text if necessary
- if (autoCompletePatternField.getText().equals(welcomeMessage)) {
- autoCompletePatternField.setValue("", true);
- }
autoCompletePatternField.showSuggestionList();
savedSearchesPanel.hide();
}
public void onBlur(BlurEvent event) {
- if (autoCompletePatternField.getText().equals("")) {
- autoCompletePatternField.setValue(welcomeMessage, true);
- }
savedSearchesPanel.hide();
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
index 8be4f47..9ce630b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
@@ -61,8 +61,6 @@ public class SearchBar extends AbstractSearchBar {
private static final Messages MSG = CoreGUI.getMessages();
- public String welcomeMessage;
-
public static final String DEFAULT_PATTERN_NAME =
MSG.view_searchBar_defaultPattern();
private static final String IMAGE_DIR = "/coregui/images/search/";
@@ -118,7 +116,7 @@ public class SearchBar extends AbstractSearchBar {
if (event.getNativeEvent().getEventTarget().equals(searchButton)
&& event.getTypeInt() == Event.ONMOUSEDOWN) {
- prepareSearchExecution();
+ //prepareSearchExecution();
}
}
}
@@ -197,10 +195,6 @@ public class SearchBar extends AbstractSearchBar {
public void setSearchSubsystem(SearchSubsystem searchSubsystem) {
this.searchSubsystem = searchSubsystem;
-
- this.welcomeMessage =
MSG.view_searchBar_welcomeMessage(this.searchSubsystem.getName());
-
- this.autoCompletePatternField.setText(welcomeMessage);
}
public SearchSubsystem getSearchSubsystem() {
@@ -235,17 +229,6 @@ public class SearchBar extends AbstractSearchBar {
return defaultSavedSearchPatternId;
}
- public String getWelcomeMessage() {
- return welcomeMessage;
- }
-
- public void prepareSearchExecution() {
- String searchTerms = autoCompletePatternField.getText().toLowerCase().trim();
- if (searchTerms.equals(welcomeMessage)) {
- autoCompletePatternField.setText("");
- }
- }
-
private void setupAutoCompletingPatternField() {
autoCompletePatternField.getElement().setId("patternField");
autoCompletePatternField.setStyleName("patternField");
@@ -368,18 +351,11 @@ public class SearchBar extends AbstractSearchBar {
}
public void onFocus(FocusEvent event) {
- // clear default search text if necessary
- if (autoCompletePatternField.getText().equals(welcomeMessage)) {
- autoCompletePatternField.setValue("", true);
- }
autoCompletePatternField.showSuggestionList();
savedSearchesPanel.hide();
}
public void onBlur(BlurEvent event) {
- if (autoCompletePatternField.getText().equals("")) {
- autoCompletePatternField.setValue(welcomeMessage, true);
- }
savedSearchesPanel.hide();
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
index f2dab2f..454b8a1 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
@@ -700,11 +700,6 @@ public class SuggestTextBox_v3 extends Composite implements HasText,
HasAllFocus
SearchSuggestion searchSuggestion = extraSearchSuggestion(suggestion);
String currentText = getText().toLowerCase();
- if (searchBar.getWelcomeMessage().equals(currentText)) {
- setValue("", true);
- return;
- }
-
if (searchSuggestion.getKind() == SearchSuggestion.Kind.GlobalSavedSearch
|| searchSuggestion.getKind() == SearchSuggestion.Kind.UserSavedSearch) {
// execute saved searches immediately, since they presumably constitute
complete expressions