modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java | 56 +++++++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 3 3 files changed, 47 insertions(+), 14 deletions(-)
New commits: commit 7a161e217c55ec77420303be7a4db2c84ec359d7 Author: John Mazzitelli mazz@redhat.com Date: Mon Mar 28 18:21:42 2011 -0400
add a refresh button on the right so a user can call CoreGUI.refresh(). this should help refresh left-hand trees when they go out of sync with changes to the inventory
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java index 62c3509..5a9d3fc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java @@ -87,11 +87,35 @@ public class Footer extends LocatableHLayout {
addMember(getMessageCenterButton());
+ addMember(getRefreshButton()); + addMember(createHSpacer(0));
alertsMessage.schedule(60000); }
+ private LocatableVLayout getRefreshButton() { + LocatableVLayout layout = new LocatableVLayout(extendLocatorId("refreshLayout")); + layout.setHeight100(); + layout.setAlign(Alignment.CENTER); + layout.setAutoWidth(); + + LocatableIButton button = new LocatableIButton(extendLocatorId("refreshButton"), ""); + button.setAlign(Alignment.CENTER); + button.setAutoFit(true); + button.setIcon("[SKIN]/actions/refresh.png"); + button.setPrompt(CoreGUI.getMessages().common_button_refresh()); + button.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + CoreGUI.refresh(); + } + }); + + layout.addMember(button); + return layout; + } + private LocatableVLayout getMessageCenterButton() { LocatableVLayout layout = new LocatableVLayout(extendLocatorId("layout")); layout.setMembersMargin(5);
commit 1d30fe194971feb08733847e7b2425a925b749cc Author: John Mazzitelli mazz@redhat.com Date: Mon Mar 28 18:13:19 2011 -0400
- shrink the global alerts indicator to just be the icon - the alert flag hover text tells you the count and reminds the user they can click the icon to get the recent alerts report - when there are no recent alerts, the flag is grey - the alert flag is moved to the right where the rest of the components are - the message bar now has 100% width allowing for the message to stretch if the browser is maximized
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java index 2f31bb8..62c3509 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java @@ -28,6 +28,7 @@ import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.alert.Alert; +import org.rhq.core.domain.alert.AlertPriority; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.Criteria.Restriction; import org.rhq.core.domain.util.PageList; @@ -73,10 +74,10 @@ public class Footer extends LocatableHLayout { // leave space for the RPC Activity Spinner addMember(createHSpacer(16));
- addMember(alertsMessage); - addMember(messageBar);
+ addMember(alertsMessage); + VLayout favoritesLayout = new VLayout(); favoritesLayout.setHeight100(); favoritesLayout.setAutoWidth(); @@ -153,12 +154,12 @@ public class Footer extends LocatableHLayout { public AlertsMessage(String locatorId) { super(locatorId); setHeight100(); + setWidth(25); setPadding(5); - - setIcon("subsystems/alert/Alert_LOW_16.png"); + setHoverWidth(200); setIconSize(16); setWrap(false); - + changeIcon(0); addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { History.newItem(ReportTopView.VIEW_ID.getName() + "/" + ReportTopView.SECTION_SUBSYSTEMS_VIEW_ID @@ -167,6 +168,19 @@ public class Footer extends LocatableHLayout { }); }
+ private void changeIcon(int alertCount) { + if (alertCount == 0) { + setPrompt(MSG.view_core_noRecentAlerts()); + setContents(imgHTML("subsystems/alert/Alerts_16.png", 16, 16)); + } else { + setPrompt(MSG.view_core_recentAlerts(String.valueOf(alertCount))); + String link = '#' + ReportTopView.VIEW_ID.getName() + "/" + ReportTopView.SECTION_SUBSYSTEMS_VIEW_ID + + "/" + AlertHistoryView.SUBSYSTEM_VIEW_ID; + setContents("<a href="" + link + "">" + imgHTML(ImageManager.getAlertIcon(AlertPriority.HIGH)) + + "</a>"); + } + } + public void refreshLoggedIn() { AlertCriteria alertCriteria = new AlertCriteria(); alertCriteria.addFilterStartTime(System.currentTimeMillis() - (1000L * 60 * 60 * 8)); // last 8 hrs @@ -179,13 +193,7 @@ public class Footer extends LocatableHLayout { }
public void onSuccess(PageList<Alert> result) { - if (result.getTotalSize() == 0) { - setContents(MSG.view_core_recentAlerts("0")); - setIcon("subsystems/alert/Alert_LOW_16.png"); - } else { - setContents(MSG.view_core_recentAlerts(String.valueOf(result.getTotalSize()))); - setIcon("subsystems/alert/Alert_HIGH_16.png"); - } + changeIcon(result.getTotalSize()); } }); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java index f000569..1b27eee 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java @@ -62,7 +62,7 @@ public class MessageBar extends LocatableHLayout implements MessageCenter.Messag
label = new LocatableLabel(extendLocatorId("Label")); label.setAlign(Alignment.CENTER); - label.setWidth("600px"); + label.setWidth100(); label.setHeight("30px"); label.setCanSelectText(true); addMember(label); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 35ff92d..695bd9d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -2057,7 +2057,8 @@ view_aboutBox_version = Version: view_core_error_1 = New Alerts lookup failed #view_core_loggedInAs = Logged in as {0} view_core_loggedOut = Logged out -view_core_recentAlerts = [{0}] recent alerts +view_core_recentAlerts = There are [{0}] recent alerts - click the icon to go to the recent alerts report +view_core_noRecentAlerts = There are no recent alerts to report view_core_uncaught = Globally uncaught exception
# Login