modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
| 20 +++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java
| 28 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
| 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
| 15 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java
| 3 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
| 12 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java
| 4 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
| 5 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
| 28 ++--------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java
| 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 16 ++++-
17 files changed, 93 insertions(+), 53 deletions(-)
New commits:
commit a1ebd5844f059352b0b9fc4b73bd6ed807c8e87c
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 29 12:44:29 2010 -0500
i18n selector grid titles; make names links in user and role list views; fix column
widths in group list view
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
index f425e77..c3e9309 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
@@ -22,6 +22,10 @@
*/
package org.rhq.enterprise.gui.coregui.client;
+import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.enterprise.gui.coregui.client.admin.roles.RolesView;
+import org.rhq.enterprise.gui.coregui.client.admin.users.UsersView;
+
/**
* @author Greg Hinkle
*/
@@ -57,6 +61,22 @@ public class LinkManager {
}
}
+ public static String getUserLink(int subjectId) {
+ if (GWT) {
+ return "#" + UsersView.VIEW_PATH + "/" + subjectId;
+ } else {
+ return "/admin/user/UserAdmin.do?mode=view&u=" + subjectId;
+ }
+ }
+
+ public static String getRoleLink(int roleId) {
+ if (GWT) {
+ return "#" + RolesView.VIEW_PATH + "/" + roleId;
+ } else {
+ return "/admin/role/RoleAdmin.do?mode=view&r=" + roleId;
+ }
+ }
+
public static String getSubsystemConfigurationLink() {
return "/rhq/subsystem/configurationUpdate.xhtml";
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java
index fbaf720..bedccff 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java
@@ -138,13 +138,7 @@ public class PermissionsItem extends CanvasItem {
// TODO: Add table title.
- ListGridField iconField = new ListGridField("icon",
" ", 40);
- iconField.setShowDefaultContextMenu(false);
- iconField.setAlign(Alignment.CENTER);
- iconField.setType(ListGridFieldType.IMAGE);
- iconField.setImageURLSuffix("_16.png");
- iconField.setImageWidth(16);
- iconField.setImageHeight(16);
+ ListGridField iconField = createIconField();
ListGridField nameField = new ListGridField("name");
nameField.setHidden(true);
@@ -182,13 +176,7 @@ public class PermissionsItem extends CanvasItem {
ListGrid grid = createPermissionsGrid();
// TODO: Add table title.
- ListGridField iconField = new ListGridField("icon",
" ", 40);
- iconField.setShowDefaultContextMenu(false);
- iconField.setAlign(Alignment.CENTER);
- iconField.setType(ListGridFieldType.IMAGE);
- iconField.setImageURLSuffix("_16.png");
- iconField.setImageWidth(16);
- iconField.setImageHeight(16);
+ ListGridField iconField = createIconField();
ListGridField readNameField = new ListGridField("readName");
readNameField.setHidden(true);
@@ -276,6 +264,18 @@ public class PermissionsItem extends CanvasItem {
return grid;
}
+ private ListGridField createIconField() {
+ ListGridField iconField = new ListGridField("icon",
" ", 28);
+ iconField.setShowDefaultContextMenu(false);
+ iconField.setCanSort(false);
+ iconField.setAlign(Alignment.CENTER);
+ iconField.setType(ListGridFieldType.IMAGE);
+ iconField.setImageURLSuffix("_16.png");
+ iconField.setImageWidth(16);
+ iconField.setImageHeight(16);
+ return iconField;
+ }
+
private ListGrid createPermissionsGrid() {
ListGrid grid = new ListGrid();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
index f8f9b5a..ed9216b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
@@ -219,7 +219,6 @@ public class RoleEditView extends
AbstractRecordEditor<RolesDataSource> implemen
TextItem descriptionItem = new TextItem(RolesDataSource.Field.DESCRIPTION,
MSG.common_title_description());
descriptionItem.setColSpan(form.getNumCols());
- descriptionItem.setWidth("*");
items.add(descriptionItem);
permissionsItem = new PermissionsItem(this);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
index 3cc5e4b..df60177 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
@@ -167,7 +167,7 @@ public class RoleLdapGroupSelector extends
AbstractSelector<PageList<LdapGroup>>
@Override
protected String getItemTitle() {
- return "group";
+ return MSG.common_title_groups();
}
public class LdapGroupsDataSource extends
RPCDataSource<PageList<LdapGroup>> {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java
index 305b5bf..4e898e1 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java
@@ -59,7 +59,7 @@ public class RoleSubjectSelector extends AbstractSelector<Subject>
{
@Override
protected String getItemTitle() {
- return MSG.common_title_user();
+ return MSG.common_title_users();
}
@Override
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
index bde77b4..e615429 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
@@ -23,17 +23,21 @@ import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.authz.Permission;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A table that lists all roles and provides the ability to view details of or delete
those roles and to create new
@@ -45,6 +49,8 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
public class RolesView extends TableSection<RolesDataSource> implements
BookmarkableView {
public static final ViewName VIEW_ID = new ViewName("Roles",
MSG.view_adminSecurity_roles());
+ public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/"
+ + AdministrationView.SECTION_SECURITY_VIEW_ID + "/" + VIEW_ID;
// TODO: We need a 24x24 version of the Role icon.
private static final String HEADER_ICON = "global/Role_16.png";
@@ -62,8 +68,15 @@ public class RolesView extends TableSection<RolesDataSource>
implements Bookmark
super.configureTable();
ListGridField nameField = new ListGridField(RolesDataSource.Field.NAME, 150);
+ nameField.setCellFormatter(new CellFormatter() {
+ public String format(Object value, ListGridRecord record, int i, int i1) {
+ Integer roleId = getId(record);
+ String roleUrl = LinkManager.getRoleLink(roleId);
+ return SeleniumUtility.getLocatableHref(roleUrl, value.toString(),
null);
+ }
+ });
- ListGridField descriptionField = new
ListGridField(RolesDataSource.Field.DESCRIPTION, 600);
+ ListGridField descriptionField = new
ListGridField(RolesDataSource.Field.DESCRIPTION);
setListGridFields(nameField, descriptionField);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java
index e2d253d..df5036c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java
@@ -23,7 +23,6 @@
package org.rhq.enterprise.gui.coregui.client.admin.users;
import com.smartgwt.client.data.Criteria;
-import com.smartgwt.client.data.Record;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -61,7 +60,7 @@ public class SubjectRoleSelector extends AbstractSelector<Role> {
@Override
protected String getItemTitle() {
- return "role";
+ return MSG.common_title_roles();
}
@Override
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
index 7a68363..b8d7a56 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
@@ -25,17 +25,20 @@ import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.authz.Permission;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A table that lists all users and provides the ability to view or edit details of
users, delete users, or create new
@@ -76,7 +79,14 @@ public class UsersView extends TableSection<UsersDataSource> {
private List<ListGridField> createFields() {
List<ListGridField> fields = new ArrayList<ListGridField>();
- ListGridField nameField = new ListGridField(UsersDataSource.Field.NAME, 120);
+ ListGridField nameField = new ListGridField(UsersDataSource.Field.NAME, 150);
+ nameField.setCellFormatter(new CellFormatter() {
+ public String format(Object value, ListGridRecord record, int i, int i1) {
+ Integer subjectId = getId(record);
+ String userUrl = LinkManager.getUserLink(subjectId);
+ return SeleniumUtility.getLocatableHref(userUrl, value.toString(),
null);
+ }
+ });
fields.add(nameField);
ListGridField activeField = new ListGridField(UsersDataSource.Field.FACTIVE,
90);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java
index a0d3e52..606da75 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java
@@ -186,7 +186,7 @@ public class SystemRolesNotificationSenderForm extends
AbstractNotificationSende
@Override
protected String getItemTitle() {
- return "role";
+ return MSG.common_title_roles();
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java
index 894965b..726bdc5 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java
@@ -187,7 +187,7 @@ public class SystemUsersNotificationSenderForm extends
AbstractNotificationSende
@Override
protected String getItemTitle() {
- return "user";
+ return MSG.common_title_users();
}
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
index e4799ae..ab5b00d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
@@ -96,6 +96,6 @@ public class BundleSelector extends AbstractSelector<Bundle> {
@Override
protected String getItemTitle() {
- return "bundle";
+ return MSG.common_title_bundles();
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java
index 6d76f2c..350c2d4 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java
@@ -86,7 +86,7 @@ public class EnhancedDynamicForm extends LocatableDynamicForm {
//setPadding(13);
// Default to 4 columns, i.e.: itemOneTitle | itemOneValue | itemTwoTitle |
itemTwoValue
setNumCols(4);
- setColWidths(100, 220, 100, 220);
+ setColWidths(100, 200, 100, 200);
//setTitleWidth(100);
setWrapItemTitles(false);
@@ -224,7 +224,7 @@ public class EnhancedDynamicForm extends LocatableDynamicForm {
}
//item.setWidth("*"); // this causes a JavaScript exception ...
:-(
- item.setWidth(199);
+ item.setWidth(195);
}
super.setFields((FormItem[]) itemsList.toArray(new FormItem[itemsList.size()]));
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
index 7862d50..68671e7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
@@ -476,6 +476,11 @@ public abstract class AbstractSelector<T> extends
LocatableVLayout {
return "name";
}
+ /**
+ * Return the item title (i.e. display name), which should be plural and capitalized,
e.g. "Resource Groups", "Roles".
+ *
+ * @return the item title (i.e. display name), which should be plural and
capitalized, e.g. "Resource Groups", "Roles"
+ */
protected abstract String getItemTitle();
protected String getAvailableItemsGridTitle() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 3748bbf..88e78f4 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -27,7 +27,6 @@ import static
org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGro
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Alignment;
-import com.smartgwt.client.types.AutoFitWidthApproach;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -75,7 +74,7 @@ public class ResourceGroupListView extends Table {
@Override
protected void configureTable() {
- ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title());
+ ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title(),
250);
nameField.setCellFormatter(new CellFormatter() {
public String format(Object value, ListGridRecord record, int i, int i1) {
String groupId = record.getAttribute("id");
@@ -84,35 +83,22 @@ public class ResourceGroupListView extends Table {
}
});
- ListGridField idField = new ListGridField("id",
MSG.common_title_id());
ListGridField descriptionField = new ListGridField(DESCRIPTION.propertyName(),
DESCRIPTION.title());
- ListGridField typeNameField = new ListGridField(TYPE.propertyName(),
TYPE.title());
- ListGridField pluginNameField = new ListGridField(PLUGIN.propertyName(),
PLUGIN.title());
- ListGridField categoryField = new ListGridField(CATEGORY.propertyName(),
CATEGORY.title());
+ ListGridField typeNameField = new ListGridField(TYPE.propertyName(),
TYPE.title(), 130);
+ ListGridField pluginNameField = new ListGridField(PLUGIN.propertyName(),
PLUGIN.title(), 100);
+ ListGridField categoryField = new ListGridField(CATEGORY.propertyName(),
CATEGORY.title(), 60);
ListGridField availabilityChildrenField = new
ListGridField("availabilityChildren", MSG
- .view_inventory_groups_children());
+ .view_inventory_groups_children(), 70);
availabilityChildrenField.setWrap(false);
availabilityChildrenField.setAlign(Alignment.CENTER);
ListGridField availabilityDescendantsField = new
ListGridField("availabilityDescendents", MSG
- .view_inventory_groups_descendants());
+ .view_inventory_groups_descendants(), 70);
availabilityDescendantsField.setWrap(false);
availabilityDescendantsField.setAlign(Alignment.CENTER);
- nameField.setWidth("50%");
- descriptionField.setWidth("50%");
- typeNameField.setWidth(75);
- pluginNameField.setAutoFitWidth(true);
- pluginNameField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
- categoryField.setAutoFitWidth(true);
- categoryField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
- availabilityChildrenField.setAutoFitWidth(true);
- availabilityChildrenField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
- availabilityDescendantsField.setAutoFitWidth(true);
- availabilityDescendantsField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
-
- setListGridFields(false, idField, nameField, descriptionField, typeNameField,
pluginNameField, categoryField,
+ setListGridFields(false, nameField, descriptionField, typeNameField,
pluginNameField, categoryField,
availabilityChildrenField, availabilityDescendantsField);
addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(),
MSG.common_msg_areYouSure(),
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index c58fa89..fb38770 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -164,7 +164,7 @@ public class ResourceSearchView extends Table {
}
});
- ListGridField availabilityField = new ListGridField(AVAILABILITY.propertyName(),
AVAILABILITY.title(), 55);
+ ListGridField availabilityField = new ListGridField(AVAILABILITY.propertyName(),
AVAILABILITY.title(), 70);
availabilityField.setType(ListGridFieldType.IMAGE);
availabilityField.setAlign(Alignment.CENTER);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java
index 30a4bea..aaee31e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java
@@ -79,7 +79,7 @@ public class ResourceGroupSelector extends
AbstractSelector<ResourceGroup> {
@Override
protected String getItemTitle() {
- return "group";
+ return MSG.common_title_groups();
}
// protected Criteria getLatestCriteria(DynamicForm availableFilterForm) {
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 0fb9be2..347ea5a 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
@@ -76,6 +76,8 @@ common_title_availability = Availability~
common_title_average_metrics=Average Metrics per Minute~
common_title_available_resources=Available Resources~
common_title_background=Background~
+common_title_bundle = Bundle~
+common_title_bundles = Bundles~
common_title_category = Category~
common_title_columns=Columns~
common_title_configuration = Configuration~
@@ -96,6 +98,8 @@ common_title_enabled=Enabled?~
common_title_end = End~
common_title_favorites=Favorites~
common_title_generalProp = General Properties~
+common_title_group = Group~
+common_title_groups = Groups~
common_title_group_def_total=Group Definition Total~
common_title_icon = ~
common_title_id = ID~
@@ -131,10 +135,13 @@ common_title_recent_operations=Recent Operations~
common_title_remove_column=Remove Column~
common_title_repositories=Repositories~
common_title_resource = Resource~
+common_title_resources = Resources~
common_title_resource_group = Resource Group~
common_title_resource_inventory=Resource Inventory~
common_title_resource_id=Resource ID~
common_title_resource_name=Resource Name~
+common_title_role = Role~
+common_title_roles = Roles~
common_title_search = Search~
common_title_scheduled_operations = Scheduled Operations~
common_title_selected_resources = Selected Resources~
@@ -155,7 +162,8 @@ common_title_timestamp = Date/Time~
common_title_total = Total~
common_title_type = Type~
common_title_units = Units~
-common_title_user=User~
+common_title_user = User~
+common_title_users = Users~
common_title_value = Value~
common_title_version = Version~
common_title_view_mode = View Mode~
@@ -183,9 +191,9 @@ common_val_none = None~
# Common Alert Priorities
#------------------------
-common_alert_high=HIGH
-common_alert_medium=MEDIUM
-common_alert_low=LOW
+common_alert_high = HIGH
+common_alert_medium = MEDIUM
+common_alert_low = LOW
# Common Calendar
#--------------