modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java | 21 ++++++++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java | 6 +- 2 files changed, 21 insertions(+), 6 deletions(-)
New commits: commit 78e22d2060257e14c9f22bafef1a04744424ab20 Author: John Mazzitelli mazz@redhat.com Date: Wed Nov 24 14:23:04 2010 -0500
use icons and i18n names for the priority filter select menu - its all purdy now
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java index bd103a9..ebd85d8 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java @@ -21,11 +21,14 @@ package org.rhq.enterprise.gui.coregui.client.alert;
import java.util.Arrays; import java.util.Date; +import java.util.LinkedHashMap;
import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.SortSpecifier; +import com.smartgwt.client.types.MultipleAppearance; import com.smartgwt.client.types.SortDirection; import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; @@ -35,7 +38,6 @@ import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.LinkManager; -import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem; import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement; import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; @@ -80,8 +82,21 @@ public class AlertHistoryView extends TableSection {
@Override protected void configureTableFilters() { - final EnumSelectItem priorityFilter = new EnumSelectItem("severities", MSG.view_alerts_table_filter_priority(), - AlertPriority.class); + SelectItem priorityFilter = new SelectItem("severities", MSG.view_alerts_table_filter_priority()); + priorityFilter.setMultiple(true); + priorityFilter.setMultipleAppearance(MultipleAppearance.PICKLIST); + + LinkedHashMap<String, String> priorities = new LinkedHashMap<String, String>(3); + priorities.put(AlertPriority.HIGH.name(), MSG.common_alert_high()); + priorities.put(AlertPriority.MEDIUM.name(), MSG.common_alert_medium()); + priorities.put(AlertPriority.LOW.name(), MSG.common_alert_low()); + LinkedHashMap<String, String> priorityIcons = new LinkedHashMap<String, String>(3); + priorityIcons.put(AlertPriority.HIGH.name(), "/images/icons/Flag_red_16.png"); + priorityIcons.put(AlertPriority.MEDIUM.name(), "/images/icons/Flag_yellow_16.png"); + priorityIcons.put(AlertPriority.LOW.name(), "/images/icons/Flag_blue_16.png"); + priorityFilter.setValueMap(priorities); + priorityFilter.setValueIcons(priorityIcons); + priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.MEDIUM.name(), AlertPriority.LOW.name());
setFilterFormItems(priorityFilter); }
commit c2cbcfef8fac401218879693577b8ea9ce1171b1 Author: John Mazzitelli mazz@redhat.com Date: Wed Nov 24 14:22:28 2010 -0500
use the i18n terms, not the enum name value
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java index 8795043..ca4c3ce 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java @@ -216,9 +216,9 @@ public class GeneralPropertiesAlertDefinitionForm extends LocatableDynamicForm i
prioritySelection = new SelectItem("priority", MSG.view_alerts_field_priority()); LinkedHashMap<String, String> priorities = new LinkedHashMap<String, String>(3); - priorities.put(AlertPriority.HIGH.name(), AlertPriority.HIGH.name()); - priorities.put(AlertPriority.MEDIUM.name(), AlertPriority.MEDIUM.name()); - priorities.put(AlertPriority.LOW.name(), AlertPriority.LOW.name()); + priorities.put(AlertPriority.HIGH.name(), MSG.common_alert_high()); + priorities.put(AlertPriority.MEDIUM.name(), MSG.common_alert_medium()); + priorities.put(AlertPriority.LOW.name(), MSG.common_alert_low()); LinkedHashMap<String, String> priorityIcons = new LinkedHashMap<String, String>(3); priorityIcons.put(AlertPriority.HIGH.name(), "/images/icons/Flag_red_16.png"); priorityIcons.put(AlertPriority.MEDIUM.name(), "/images/icons/Flag_yellow_16.png");
rhq-commits@lists.fedorahosted.org