modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java | 62 ++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java | 19 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java | 45 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 17 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 142 +++++++++- 6 files changed, 212 insertions(+), 76 deletions(-)
New commits: commit 419c859bc2f3e4594a9c63e62fe529ae394106fc Author: Ian Springer ian.springer@redhat.com Date: Wed Nov 17 15:58:49 2010 -0500
i18n - resource config views
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java index dda7db7..9264867 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java @@ -59,7 +59,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends LocatableVLayout implements BookmarkableView, DetailsView {
- private static final Label LOADING_LABEL = new Label("Loading..."); + private static final Label LOADING_LABEL = new Label(MSG.widget_recordEditor_label_loading()); private static final String FIELD_ID = "id"; private static final String FIELD_NAME = "name";
@@ -352,4 +352,5 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc private static String capitalize(String itemTitle) { return Character.toUpperCase(itemTitle.charAt(0)) + itemTitle.substring(1); } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java index 4933639..5f4c167 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java @@ -44,6 +44,23 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; */ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfigurationUpdate> {
+ public static abstract class Field { + public static final String ID = "id"; + public static final String RESOURCE = "resource"; + public static final String CREATED_TIME = "createdTime"; + public static final String STATUS = "status"; + public static final String SUBJECT = "subject"; + public static final String RESOURCE_TYPE_ID = "resourceTypeId"; + public static final String CONFIGURATION = "configuration"; + public static final String DURATION = "duration"; + public static final String ERROR_MESSAGE = "errorMessage"; + public static final String MODIFIED_TIME = "modifiedTime"; + } + + public static abstract class CriteriaField { + public static final String RESOURCE_ID = "resourceId"; + } + private ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService();
public ConfigurationHistoryDataSource() { @@ -56,21 +73,26 @@ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfig protected List<DataSourceField> addDataSourceFields() { List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceIntegerField idField = new DataSourceIntegerField("id"); + DataSourceIntegerField idField = new DataSourceIntegerField(Field.ID, + MSG.dataSource_configurationHistory_field_id()); idField.setPrimaryKey(true); fields.add(idField);
- DataSourceTextField resourceField = new DataSourceTextField("resource", "Resource"); + DataSourceTextField resourceField = new DataSourceTextField(Field.RESOURCE, + MSG.dataSource_configurationHistory_field_resource()); fields.add(resourceField);
- DataSourceTextField submittedField = new DataSourceTextField("createdTime", "Created"); + DataSourceTextField submittedField = new DataSourceTextField(Field.CREATED_TIME, + MSG.dataSource_configurationHistory_field_createdTime()); submittedField.setType(FieldType.DATETIME); fields.add(submittedField);
- DataSourceTextField statusField = new DataSourceTextField("status", "Status"); + DataSourceTextField statusField = new DataSourceTextField(Field.STATUS, + MSG.dataSource_configurationHistory_field_status()); fields.add(statusField);
- DataSourceTextField subjectField = new DataSourceTextField("subject", "Subject"); + DataSourceTextField subjectField = new DataSourceTextField(Field.SUBJECT, + MSG.dataSource_configurationHistory_field_subject()); fields.add(subjectField);
return fields; @@ -85,7 +107,7 @@ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfig
criteria.setPageControl(getPageControl(request));
- Integer resourceId = (Integer) request.getCriteria().getValues().get("resourceId"); + Integer resourceId = (Integer) request.getCriteria().getValues().get(CriteriaField.RESOURCE_ID); if (resourceId != null) { criteria.addFilterResourceIds(resourceId); } @@ -93,7 +115,8 @@ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfig configurationService.findResourceConfigurationUpdatesByCriteria(criteria, new AsyncCallback<PageList<ResourceConfigurationUpdate>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Unable to load configuration history", caught); + CoreGUI.getErrorHandler().handleError(MSG.dataSource_configurationHistory_error_fetchFailure(), + caught); response.setStatus(DSResponse.STATUS_FAILURE); processResponse(request.getRequestId(), response); } @@ -108,24 +131,23 @@ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfig
@Override public ResourceConfigurationUpdate copyValues(Record from) { - return null; // TODO: Implement this method. + throw new UnsupportedOperationException("Updates are not supported."); }
@Override public ListGridRecord copyValues(ResourceConfigurationUpdate from) { ListGridRecord record = new ListGridRecord(); - record.setAttribute("id", from.getId()); - record.setAttribute("resource", from.getResource()); - record.setAttribute("resourceTypeId", from.getResource().getResourceType().getId()); - record.setAttribute("subject", from.getSubjectName()); - record.setAttribute("configuration", from.getConfiguration()); - record.setAttribute("createdTime", new Date(from.getCreatedTime())); - record.setAttribute("duration", from.getDuration()); - record.setAttribute("errorMessage", from.getErrorMessage()); - record.setAttribute("modifiedTime", new Date(from.getModifiedTime())); - record.setAttribute("status", from.getStatus().name()); - - record.setAttribute("entity", from); + record.setAttribute(Field.ID, from.getId()); + record.setAttribute(Field.RESOURCE, from.getResource()); + record.setAttribute(Field.RESOURCE_TYPE_ID, from.getResource().getResourceType().getId()); + record.setAttribute(Field.SUBJECT, from.getSubjectName()); + record.setAttribute(Field.CONFIGURATION, from.getConfiguration()); + record.setAttribute(Field.CREATED_TIME, new Date(from.getCreatedTime())); + record.setAttribute(Field.DURATION, from.getDuration()); + record.setAttribute(Field.ERROR_MESSAGE, from.getErrorMessage()); + record.setAttribute(Field.MODIFIED_TIME, new Date(from.getModifiedTime())); + record.setAttribute(Field.STATUS, from.getStatus().name()); + return record; } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java index 5b13ffd..cc48ae9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java @@ -40,9 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; * @author Greg Hinkle */ public class ConfigurationHistoryDetailView extends LocatableVLayout implements BookmarkableView { - - private int configurationUpdateId; - + public ConfigurationHistoryDetailView(String locatorId) { super(locatorId);
@@ -50,12 +48,6 @@ public class ConfigurationHistoryDetailView extends LocatableVLayout implements setHeight100(); }
- @Override - protected void onDraw() { - super.onDraw(); - - } - private void displayHistory(final ResourceConfigurationUpdate update) {
ResourceTypeRepository.Cache.getInstance().getResourceTypes(update.getResource().getResourceType().getId(), @@ -63,9 +55,7 @@ public class ConfigurationHistoryDetailView extends LocatableVLayout implements new ResourceTypeRepository.TypeLoadedCallback() {
public void onTypesLoaded(ResourceType type) { - ConfigurationDefinition definition = type.getResourceConfigurationDefinition(); - ConfigurationEditor editor = new ConfigurationEditor("ResConfigHist-" + update.getResource().getName(), definition, update.getConfiguration()); editor.setReadOnly(true); @@ -76,9 +66,8 @@ public class ConfigurationHistoryDetailView extends LocatableVLayout implements }
public void displayInDialog() { - Window window = new Window(); - window.setTitle("Configuration Details"); + window.setTitle(MSG.view_configurationHistoryDetails_dialogTitle()); window.setWidth(800); window.setHeight(800); window.setIsModal(true); @@ -102,7 +91,8 @@ public class ConfigurationHistoryDetailView extends LocatableVLayout implements GWTServiceLookup.getConfigurationService().findResourceConfigurationUpdatesByCriteria(criteria, new AsyncCallback<PageList<ResourceConfigurationUpdate>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Unable to load configuration history", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_configurationHistoryDetails_error_loadFailure(), + caught); }
public void onSuccess(PageList<ResourceConfigurationUpdate> result) { @@ -111,6 +101,5 @@ public class ConfigurationHistoryDetailView extends LocatableVLayout implements displayHistory(update); } }); - } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java index 1e908d2..1e933ef 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java @@ -19,11 +19,12 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration;
import java.util.ArrayList; +import java.util.List;
import com.smartgwt.client.data.Criteria; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.grid.CellFormatter; -import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; @@ -39,8 +40,9 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TableSection; * @author Greg Hinkle */ public class ConfigurationHistoryView extends TableSection { + public static final String VIEW_ID = "RecentConfigurationChanges"; - private static final String TITLE = "Configuration History"; + private static final String TITLE = MSG.view_configurationHistoryList_title();
private Integer resourceId;
@@ -67,7 +69,7 @@ public class ConfigurationHistoryView extends TableSection {
private static Criteria createCriteria(int resourceId) { Criteria criteria = new Criteria(); - criteria.addCriteria("resourceId", Integer.valueOf(resourceId)); + criteria.addCriteria(ConfigurationHistoryDataSource.CriteriaField.RESOURCE_ID, resourceId); return criteria; }
@@ -75,24 +77,27 @@ public class ConfigurationHistoryView extends TableSection { protected void configureTable() { super.configureTable();
- ListGrid grid = getListGrid(); + List<ListGridField> fields = new ArrayList<ListGridField>();
- grid.getField("id").setWidth(60); - grid.getField("createdTime").setWidth(200); + ListGridField idField = new ListGridField(ConfigurationHistoryDataSource.Field.ID, 60); + fields.add(idField);
- if (resourceId != null) { - grid.hideField("resource"); - } else { - grid.getField("resource").setCellFormatter(new CellFormatter() { + ListGridField createdTimeField = new ListGridField(ConfigurationHistoryDataSource.Field.CREATED_TIME, 200); + fields.add(createdTimeField); + + if (this.resourceId == null) { + ListGridField resourceField = new ListGridField(ConfigurationHistoryDataSource.Field.RESOURCE); + resourceField.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { Resource res = (Resource) o; return "<a href="#Resource/" + res.getId() + "">" + res.getName() + "</a>"; } }); + fields.add(resourceField); }
- grid.getField("status").setWidth(100); - grid.getField("status").setCellFormatter(new CellFormatter() { + ListGridField statusField = new ListGridField(ConfigurationHistoryDataSource.Field.STATUS, 100); + statusField.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { ConfigurationUpdateStatus status = ConfigurationUpdateStatus.valueOf((String) o); String icon = ""; @@ -112,11 +117,16 @@ public class ConfigurationHistoryView extends TableSection { return Canvas.imgHTML("subsystems/configure/Configure" + icon + "_16.png", 16, 16) + o; } }); + fields.add(statusField); + + ListGridField subjectField = new ListGridField(ConfigurationHistoryDataSource.Field.SUBJECT, 150); + fields.add(subjectField);
- grid.getField("subject").setWidth(150); + setListGridFields(fields.toArray(new ListGridField[fields.size()]));
- addTableAction(extendLocatorId("Delete"), "Delete", - "Are you sure you want to delete # configuration history items?", new AbstractTableAction( + addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), + MSG.common_msg_deleteConfirm(MSG.common_msg_deleteConfirm(MSG.view_configurationHistoryList_itemNamePlural())), + new AbstractTableAction( TableActionEnablement.ANY) { public void executeAction(ListGridRecord[] selection, Object actionValue) { // TODO: Implement this method. @@ -124,7 +134,7 @@ public class ConfigurationHistoryView extends TableSection { } });
- addTableAction(extendLocatorId("Compare"), "Compare", null, new AbstractTableAction( + addTableAction(extendLocatorId("Compare"), MSG.common_button_compare(), null, new AbstractTableAction( TableActionEnablement.MULTIPLE) { public void executeAction(ListGridRecord[] selection, Object actionValue) { ArrayList<ResourceConfigurationUpdate> configs = new ArrayList<ResourceConfigurationUpdate>(); @@ -137,7 +147,7 @@ public class ConfigurationHistoryView extends TableSection { } });
- addTableAction(extendLocatorId("ShowDetail"), "Show Details", null, new AbstractTableAction( + addTableAction(extendLocatorId("ShowDetail"), MSG.common_button_showDetails(), null, new AbstractTableAction( TableActionEnablement.SINGLE) { public void executeAction(ListGridRecord[] selection, Object actionValue) { ListGridRecord record = selection[0]; @@ -152,7 +162,6 @@ public class ConfigurationHistoryView extends TableSection { ConfigurationHistoryDetailView detailView = new ConfigurationHistoryDetailView(this.getLocatorId());
return detailView; - }
// -------- Static Utility loaders ------------ diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java index 875fc0d..525b6a3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java @@ -53,6 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; */ public class ResourceConfigurationEditView extends LocatableVLayout implements PropertyValueChangeListener, RefreshableView { + private Resource resource; private ResourcePermission resourcePermission; private ConfigurationEditor editor; @@ -74,7 +75,7 @@ public class ResourceConfigurationEditView extends LocatableVLayout
toolStrip.addMember(new LayoutSpacer());
- this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), "Save"); + this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), MSG.common_button_save()); this.saveButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { save(); @@ -86,7 +87,7 @@ public class ResourceConfigurationEditView extends LocatableVLayout refresh();
if (!this.resourcePermission.isConfigureWrite()) { - Message message = new Message("You do not have permission to edit this Resource's configuration.", + Message message = new Message(MSG.view_configurationDetails_noPermission(), Message.Severity.Info, EnumSet.of(Message.Option.Transient, Message.Option.Sticky)); CoreGUI.getMessageCenter().notify(message); } @@ -115,13 +116,13 @@ public class ResourceConfigurationEditView extends LocatableVLayout GWTServiceLookup.getConfigurationService().updateResourceConfiguration(resource.getId(), updatedConfiguration, new AsyncCallback<ResourceConfigurationUpdate>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to update configuration.", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_configurationDetails_error_updateFailure(), caught); }
public void onSuccess(ResourceConfigurationUpdate result) { CoreGUI.getMessageCenter().notify( - new Message("Configuration updated.", - "Configuration updated for Resource [" + resource.getName() + "].", + new Message(MSG.view_configurationDetails_messageConcise(), + MSG.view_configurationDetails_messageDetailed(resource.getName()), Message.Severity.Info)); refresh(); } @@ -136,12 +137,11 @@ public class ResourceConfigurationEditView extends LocatableVLayout Set<String> invalidPropertyNames = event.getInvalidPropertyNames(); if (invalidPropertyNames.isEmpty()) { this.saveButton.enable(); - message = new Message("All configuration properties have valid values, so the configuration can now be saved.", + message = new Message(MSG.view_configurationDetails_allPropertiesValid(), Message.Severity.Info, EnumSet.of(Message.Option.Transient, Message.Option.Sticky)); } else { this.saveButton.disable(); - message = new Message("The following configuration properties have invalid values: " - + invalidPropertyNames + ". The values must be corrected before the configuration can be saved.", + message = new Message(MSG.view_configurationDetails_somePropertiesInvalid(invalidPropertyNames.toString()), Message.Severity.Error, EnumSet.of(Message.Option.Transient, Message.Option.Sticky)); } messageCenter.notify(message); @@ -149,4 +149,5 @@ public class ResourceConfigurationEditView extends LocatableVLayout this.saveButton.enable(); } } + } 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 e8bf31f..dbca63a 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 @@ -33,7 +33,8 @@ common_button_reset = Reset~ common_button_save = Save~ common_button_search = Search~ common_button_uninventory = Uninventory~ - +common_button_compare = Compare~ +common_button_showDetails = Show Details...~
# Common Labels #------------------------ @@ -48,6 +49,8 @@ common_label_items=items~ common_label_milliseconds=milliseconds~ common_label_minutes=minutes~ common_label_month=month~ +common_label_search=Search~ +common_label_scheduled_operations=scheduled operations~ common_label_seconds=seconds~ common_label_selected_resources = selected resources~ common_label_unlimited = unlimited~ @@ -57,23 +60,33 @@ common_label_week=week~ #-------------- common_title_alert_range=Alert Range~ common_title_availability = Availability~ +common_title_average_metrics=Average Metrics per Minute~ common_title_available_resources=Available Resources~ common_title_category = Category~ common_title_compatibleGroups = Compatible Groups~ +common_title_compatibleGroups_total=Compatible Group Total~ common_title_dateCreated=Date Created~ common_title_description=Description~ +common_title_display=Display~ +common_title_edit_mode=Edit Mode~ common_title_enabled=Enabled?~ common_title_end = End~ common_title_generalProp = General Properties~ +common_title_group_def_total=Group Definition Total~ common_title_icon = icon~ common_title_id = ID~ common_title_inventory = Inventory~ common_title_lastUpdated=Last Updated~ common_title_lastUpdatedBy=Last Updated By~ +common_title_mashup=Mashup~ common_title_metric = Metric~ common_title_mixedGroups = Mixed Groups~ +common_title_mixedGroups_total=Mixed Group Total~ common_title_name = Name~ +common_title_new_dashboard=New Dashboard~ common_title_operations_range=Operation Range~ +common_title_over=Over~ +common_title_platform_total=Platform Total~ common_title_plugin = Plugin~ common_title_recently_added = Recently Added Resources~ common_title_recent_operations=Recent Operations~ @@ -82,13 +95,21 @@ common_title_resource_inventory=Resource Inventory~ common_title_resource_name=Resource Name~ common_title_scheduled_operations=Scheduled Operations~ common_title_selected_resources=Selected Resources~ +common_title_server_total=Server Total~ +common_title_service_total=Service Total~ common_title_start = Start~ common_title_status=Status~ +common_title_tag_cloud=Tag Cloud~ +common_title_the=The +common_title_summary_counts=Summary Counts~ common_title_timestamp =Date/Time~ +common_title_total=Total~ common_title_type = Type~ common_title_user=User~ common_title_value = Value~ common_title_version = Version~ +common_title_view_mode=View Mode~ +common_title_web_address=Web Address~
# Common Messages #-------------- @@ -127,6 +148,29 @@ widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted.~ widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}.~ widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}]~
+# Resource Selector/Picker +#-------------------------------- +widget_resourceSelector_selectResource=Select a Resource~ +widget_resourceSelector_pleaseSelectResource=Please select a resource~ +widget_resourceSelector_selectMultipleResources=Select Resources~ +widget_resourceSelector_pleaseSelectMultipleResource=Please select one or more resources~ +widget_resourceSelector_groupCategory=Group Category~ + +# Resource Factory Wizard +#-------------------------------- +widget_resourceFactoryWizard_uploadInProgress=The upload is in progress... This can take several minutes to complete for large distribution files.~ +widget_resourceFactoryWizard_uploadFileStepName=Upload Resource Content File~ +widget_resourceFactoryWizard_uploadFailure=Failed to upload file~ +widget_resourceFactoryWizard_editConfigStepName=Edit Configuration~ +widget_resourceFactoryWizard_infoStepName=Resource Information~ +widget_resourceFactoryWizard_templatePrompt=Connection Settings Template~ +widget_resourceFactoryWizard_contentTemplatePrompt=Deployment Time Configuration Templates~ +widget_resourceFactoryWizard_archPrompt=Package Architecture~ +widget_resourceFactoryWizard_versionPrompt=Package Version~ +widget_resourceFactoryWizard_importWizardWindowTitle=Resource Import Wizard~ +widget_resourceFactoryWizard_importWizardTitle=Import Resource of Type [{0}]~ +widget_resourceFactoryWizard_importFailure=Failed to manually import resource~ +widget_resourceFactoryWizard_importSubmitted=A request to import a new resource of type [{0}] has been submitted~
#===================== Utils ======================
@@ -179,7 +223,7 @@ dataSource_ContentRepoTree_field_parentId = Parent ID~
# Users #------ -// dup in common +###### dup in common dataSource_users_field_id = ID~ dataSource_users_field_name = User Name~ dataSource_users_field_ldap = LDAP Login?~ @@ -255,28 +299,39 @@ dataSource_scheduledOperations_field_operation = Operation~ dataSource_scheduledOperations_field_time = Date/Time~ dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations.
+# Configuration History +#------------------------------- +dataSource_configurationHistory_field_id = ID~ +dataSource_configurationHistory_field_resource = Resource~ +dataSource_configurationHistory_field_createdTime = Created~ +dataSource_configurationHistory_field_status = Status~ +dataSource_configurationHistory_field_subject = Subject~ +dataSource_configurationHistory_error_fetchFailure = Unable to load configuration history.~ +
#********************************** VIEW-SPECIFIC *************************************
#================= Administration ==================
view_admin_administration = Administration~ -view_admin_affinityGroups = Affinity Groups~ -view_admin_agents = Agents~ view_admin_configuration = Configuration~ -view_admin_downloads = Downloads~ -view_admin_license = License~ -view_admin_paritionEvents = Partition Events~ -view_admin_plugins = Plugins~ view_admin_security = Security~ -view_admin_servers = Servers~ -view_admin_systemSettings = System Settings~ -view_admin_templates = Templates~ view_admin_topology = Topology~
-# Administration/Security/Users -#------------------------------ -view_adminUsers_title = Users~ +view_adminSecurity_users = Users~ +view_adminSecurity_roles = Roles~ + +view_adminTopology_affinityGroups = Affinity Groups~ +view_adminTopology_agents = Agents~ +view_adminTopology_partitionEvents = Partition Events~ +view_adminTopology_remoteAgentInstall = Remote Agent Install~ +view_adminTopology_servers = Servers~ + +view_adminConfig_downloads = Downloads~ +view_adminConfig_license = License~ +view_adminConfig_plugins = Plugins~ +view_adminConfig_systemSettings = System Settings~ +view_adminConfig_templates = Templates~
# Administration/Security/Users/# #-------------------------------- @@ -374,7 +429,16 @@ view_groupCreateWizard_createFailure=Failed to create the resource group~ view_groupCreateWizard_createSuccessful_concise=You have created a new resource group. [<a href="{0}">View Group</a>]~ view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources~
+# Resource Type / Plugin View/Datasources +view_type_resourceTypes=Resource Types~ +view_type_parentId=Parent ID~ +view_type_typeTreeLoadFailure=Failed to load resource type tree data~ + #=================== Dashboard ===================== +view_dashboardManager_error=Failed to store dashboard to server~ +view_dashboardManager_success=Saved dashboard~ + +view_dashboards_title=Dashboard~ view_portlet_autodiscovery_config_platform_selection = Number of platforms to display~ view_portlet_autodiscovery_help_msg = This portlet offers the ability to import newly discovered resources into the inventory for monitoring and management or to ignore them from further action.~ view_portlet_autodiscovery_title = Discovery Queue~ @@ -384,14 +448,39 @@ view_portlet_graph_help_msg = This Portlet supports the graphing of a resource m view_portlet_graph_help_title = Graph Portlet~ view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings button to configure.~ view_portlet_graph_title = Resource Graph~ +view_portlet_inventory_error1=Failed to retrieve inventory summary~ +view_portlet_mashup_config_title=MashupPorlet Configuration~ +view_portlet_mashup_config_title_desc=The configuration settings for the mashup portlet.~ +view_portlet_mashup_help=This portlet can include a web page via an HTTP request into an iframe on the dashboard.~ +view_portlet_mashup_unconfigured=Page address not yet configured, click the settings button to setup this portlet.~ +view_portlet_message_config_title=MessagePortlet Configuration~ +view_portlet_message_config_title_desc=The configuration settings for the message portlet.~ +view_portlet_message_help=This portlet can display an HTML message on the dashboard.~ +view_portlet_message_title=Message~ +view_portlet_message_unconfigured=Message not yet configured, click the settings button to setup this portlet.~ +view_portlet_operations_config_completed_maximum=Maximum number of Completed operations to display.~ +view_portlet_operations_config_completed_enable=Whether to enable completed operations results grouping for dashboard.~ +view_portlet_operations_config_scheduled_enable=Whether to enable scheduled operations results grouping for dashboard.~ +view_portlet_operations_config_scheduled_maximum=Maximum number of Scheduled operations to display.~ view_portlet_operations_config_completed=completed operations~ view_portlet_operations_config_show_last=show Last~ +view_portlet_operations_config_show_next=show Next~ +view_portlet_operations_config_title=OperationsPortlet Configuration~ +view_portlet_operations_config_title_desc=The configuration settings for the Operations portlet.~ view_portlet_operations_disabled=(Results currently disabled. Change settings to enable results.~ view_portlet_operations_help_msg=This portlet displays both operations that have occurred and are scheduled to occur.~ view_portlet_platform_help_msg = This portlet displays information about platforms in inventory.~ view_portlet_platform_platform_error_1 = Failed to load platform metrics~ view_portlet_platform_title = Platforms Summary~ view_portlet_platform_type_error_1 = Could not load type data~ +view_portlet_problem_resources_config_display_maximum=Maximum number of Problem resources to display.~ +view_portlet_problem_resources_config_display_range=Show problem resources going back this many hours.~ +view_portlet_problem_resources_config_display_range2 = From {0} to {1}~ +view_portlet_problem_resources_config_problem_label=problem resources on dashboard.~ +view_portlet_problem_resources_config_title=ProblemResourcesPortlet Configuration~ +view_portlet_problem_resources_config_title_desc=The configuration settings for the Problem resources portlet.~ +view_portlet_problem_resources_help=This portlet displays resources that have reported alerts or Down availability.~ +view_portlet_problem_resources_title=Has Alerts or Currently Unavailable~ view_portlet_recentAlerts_config_members=Select Members~ view_portlet_recentAlerts_config_priority_label = priority Alerts,~ view_portlet_recentAlerts_config_when=within the past~ @@ -401,8 +490,11 @@ view_portlet_recentlyAdded_approved_platforms=recently approved platforms on das view_portlet_recentlyAdded_error1=Failed to load recently added resources~ view_portlet_recentlyAdded_help_msg=This portlet displays resources that have recently been imported into the inventory.~ view_portlet_recentlyAdded_title =Recently Added Portlet~ +view_portlet_tagCloud_help=portlet displays the relative tag counts in the system visible to the current user.~ +view_portlet_tagCloud_title=TagCloud~
#=================== Inventory ===================== +view_inventory_adq = Discovery Queue~ view_inventory_sectionHelp = From this section, newly discovered Resources, inventoried Resources, and Groups can be viewed and managed.~ view_inventory_cannotGetGlobalPerms = Could not determine global permissions - assuming none.~ view_inventory_problemGroups=Problem Groups~ @@ -410,6 +502,10 @@ view_inventory_collectionInterval=Collection Interval~ view_inventory_mixed=mixed~ view_inventory_downServers=Down Servers~ view_inventory_allGroups=All Groups~ +view_inventory_allResources=All Resources~ +view_inventory_platforms=Platforms~ +view_inventory_servers=Servers~ +view_inventory_services=Services~ view_metric_traits=Traits~ view_metric_viewTraitHistory=Value History for Trait [{0}]~ view_inventory_eventHistory_groupEventHistory=Group Event History~ @@ -557,6 +653,24 @@ view_group_summary_descUpdateFailure=Failed to change the description of the res view_group_summary_descUpdateSuccessful=You have changed the description of this resource group~ view_group_summary_dynamicNote=Dynamic group names and descriptions are managed, and therefore are not editable~
+# Configuration Details +#------------------------------- +view_configurationDetails_noPermission = You do not have permission to edit this Resource''s configuration.~ +view_configurationDetails_error_updateFailure = Failed to update configuration.~ +view_configurationDetails_messageConcise = Configuration updated.~ +view_configurationDetails_messageDetailed = Configuration updated for Resource [{0}].~ +view_configurationDetails_allPropertiesValid = All configuration properties have valid values, so the configuration can now be saved.~ +view_configurationDetails_somePropertiesInvalid = The following configuration properties have invalid values: {0}. The values must be corrected before the configuration can be saved.~ + +# Configuration History List +view_configurationHistoryList_title = Configuration History~ +view_configurationHistoryList_itemNamePlural = configuration history items + +# Configuration History Details +#------------------------------------------ +view_configurationHistoryDetails_dialogTitle = Configuration Details~ +view_configurationHistoryDetails_error_loadFailure = Unable to load configuration history.~ +
#==================== Reports ======================
rhq-commits@lists.fedorahosted.org