modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java
| 22 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
| 13 +++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
| 8 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
| 2
4 files changed, 26 insertions(+), 19 deletions(-)
New commits:
commit f791f5fcdf7dfe02d7c127124345023c26cd7cb4
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 24 12:58:35 2010 -0500
Changes to Footer
- Hopefully improve layout by moving Message Center to the right. The bottom
right is more traditionally a location for message handling. Note that the
Message Center is not just a button but actually a layout that uses the
entire footer left of the button as well. That is the dynamic notification
area. This makes it pretty difficult to locate other footer items to the
left of the message center, therefore other items are placed to the right.
- Fixed nav issue when clicking on the Alert Count.
- Changed margins to allow for some space between the rightmost button and
the edge of the footer.
- Left somee commented code re: handling of the logged in user until issues
with username liveness (now in the topmenubar) is resolved.
group change layout to hopefully allow easier move Message Center
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 b40d3f7..96b2e17 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
@@ -30,8 +30,10 @@ import com.smartgwt.client.widgets.toolbar.ToolStripSeparator;
import org.rhq.core.domain.alert.Alert;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView;
import org.rhq.enterprise.gui.coregui.client.footer.FavoritesButton;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.report.ReportTopView;
import org.rhq.enterprise.gui.coregui.client.util.message.MessageCenterView;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip;
@@ -47,9 +49,9 @@ public class Footer extends LocatableToolStrip {
super(LOCATOR_ID);
setHeight(30);
setAlign(VerticalAlignment.CENTER);
- // setPadding(5);
setWidth100();
- setMembersMargin(15);
+ setMembersMargin(10);
+ setLayoutRightMargin(5);
}
@Override
@@ -57,19 +59,20 @@ public class Footer extends LocatableToolStrip {
super.onDraw();
//final UserSessionState userSessionState = new
UserSessionState("UserSessionState");
- final MessageCenterView recentMessage = new
MessageCenterView(extendLocatorId(MessageCenterView.LOCATOR_ID));
- recentMessage.setWidth("*");
+ final MessageCenterView messageCenter = new
MessageCenterView(extendLocatorId(MessageCenterView.LOCATOR_ID));
final FavoritesButton favoritesButton = new
FavoritesButton(extendLocatorId("Favorites"));
final AlertsMessage alertsMessage = new
AlertsMessage(extendLocatorId("Alerts"));
- //addMember(userSessionState);
- //addMember(new ToolStripSeparator());
- addMember(favoritesButton);
+ addMember(messageCenter);
+
addMember(new ToolStripSeparator());
- addMember(recentMessage);
addMember(alertsMessage);
+ addMember(new ToolStripSeparator());
+
+ addMember(favoritesButton);
+
//userSessionState.schedule(15000);
alertsMessage.schedule(60000);
}
@@ -140,7 +143,8 @@ public class Footer extends LocatableToolStrip {
addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- History.newItem("Reports/Inventory/Recent Alerts");
+ History.newItem(ReportTopView.VIEW_ID.getName() + "/" +
ReportTopView.SECTION_SUBSYSTEMS_VIEW_ID
+ + "/" + AlertHistoryView.SUBSYSTEM_VIEW_ID);
}
});
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
index fa63445..275e251 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
@@ -52,8 +52,8 @@ import org.rhq.enterprise.gui.coregui.client.report.tag.TaggedView;
public class ReportTopView extends AbstractSectionedLeftNavigationView {
public static final ViewName VIEW_ID = new ViewName("Reports",
MSG.view_reportsTop_title());
- private static final ViewName SUBSYSTEMS_SECTION_VIEW_ID = new
ViewName("Subsystems", MSG.view_reports_subsystems());
- private static final ViewName INVENTORY_SECTION_VIEW_ID = new
ViewName("Inventory", MSG.common_title_inventory());
+ public static final ViewName SECTION_SUBSYSTEMS_VIEW_ID = new
ViewName("Subsystems", MSG.view_reports_subsystems());
+ public static final ViewName SECTION_INVENTORY_VIEW_ID = new
ViewName("Inventory", MSG.common_title_inventory());
public ReportTopView() {
// This is a top level view, so our locator id can simply be our view id.
@@ -123,7 +123,7 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView
{
}
});
- return new NavigationSection(SUBSYSTEMS_SECTION_VIEW_ID, tagItem,
suspectMetricsItem,
+ return new NavigationSection(SECTION_SUBSYSTEMS_VIEW_ID, tagItem,
suspectMetricsItem,
recentConfigurationChangesItem, recentOperationsItem, recentAlertsItem,
alertDefinitionsItem);
}
@@ -143,6 +143,6 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView
{
}
});
- return new NavigationSection(INVENTORY_SECTION_VIEW_ID, inventorySummaryItem,
platformSystemInfoItem);
+ return new NavigationSection(SECTION_INVENTORY_VIEW_ID, inventorySummaryItem,
platformSystemInfoItem);
}
}
\ No newline at end of file
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
index 0b9cf7d..f9e7ec4 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
@@ -109,8 +109,8 @@ public class MessageCenterView extends LocatableHLayout implements
MessageCenter
vl.setAlign(VerticalAlignment.CENTER);
vl.addMember(recentEventsButton);
- addMember(vl);
addMember(new LayoutSpacer());
+ addMember(vl);
}
private void showDetails(Message message) {
commit bb5532f9480c9ddc47f5e5443441e7d148707b11
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Nov 24 12:51:20 2010 -0500
Fix problem with Dashboard name editing where every character change forced
a save opertation. Use onBlurHandler as opposed to ChangeHandler.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
index 3d10400..1023efb 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
@@ -31,6 +31,8 @@ import com.smartgwt.client.widgets.form.fields.CanvasItem;
import com.smartgwt.client.widgets.form.fields.ColorPickerItem;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
+import com.smartgwt.client.widgets.form.fields.events.BlurEvent;
+import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
import com.smartgwt.client.widgets.layout.LayoutSpacer;
@@ -119,11 +121,12 @@ public class DashboardView extends LocatableVLayout {
TextItem nameItem = new TextItem("name",
MSG.common_title_dashboard_name());
nameItem.setValue(storedDashboard.getName());
- nameItem.addChangedHandler(new ChangedHandler() {
- public void onChanged(ChangedEvent changedEvent) {
- String val = (String) changedEvent.getValue();
- if (!(null == val || "".equals(val.trim()))) {
- storedDashboard.setName(val.trim());
+ nameItem.addBlurHandler(new BlurHandler() {
+ public void onBlur(BlurEvent blurEvent) {
+ String val = (String) blurEvent.getItem().getValue();
+ val = (null == val) ? "" : val.trim();
+ if (!("".equals(val) || val.equals(storedDashboard.getName())))
{
+ storedDashboard.setName(val);
save();
dashboardsView.updateNames();
}
Show replies by date