modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java | 13 - 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/users/UserEditView.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java | 34 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java | 18 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 65 +++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 11 + modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 102 ++++++++-- 9 files changed, 200 insertions(+), 54 deletions(-)
New commits: commit 0f6ed7a6e6f29db2bcef9c4d82b0c66b4a254945 Author: Ian Springer ian.springer@redhat.com Date: Tue Nov 16 11:55:04 2010 -0500
v1 of message bundle props file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java index 53397f6..47b1f91 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java @@ -50,7 +50,10 @@ public class ViewPath { return viewPath; }
- + public String getParentViewPath() { + return getPathToIndex(this.index - 1); + } + public ViewPath next() { index++; return this; @@ -73,12 +76,16 @@ public class ViewPath { }
public String getPathToCurrent() { + return getPathToIndex(this.index); + } + + private String getPathToIndex(int endIndex) { String path = ""; - for (int i = 0; i < index; i++) { + for (int i = 0; i < endIndex; i++) { if (i > 0) { path += "/"; } - path += viewPath.get(i).getPath(); + path += this.viewPath.get(i).getPath(); } return path; } 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 9f0db3a..32be094 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 @@ -80,6 +80,7 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen
@Override public void renderView(ViewPath viewPath) { + super.renderView(viewPath); UserPermissionsManager.getInstance().loadGlobalPermissions( new PermissionsLoadedListener() { public void onPermissionsLoaded(Set<Permission> globalPermissions) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java index 857ea0c..3bec8c3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java @@ -67,6 +67,7 @@ public class UserEditView extends AbstractRecordEditor<UsersDataSource> {
@Override public void renderView(ViewPath viewPath) { + super.renderView(viewPath); UserPermissionsManager.getInstance().loadGlobalPermissions( new PermissionsLoadedListener() { public void onPermissionsLoaded(Set<Permission> globalPermissions) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java index 2c02a00..1f28821 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java @@ -97,15 +97,17 @@ public class UsersDataSource extends RPCDataSource<Subject> { idDataField.setCanEdit(false); fields.add(idDataField);
- DataSourceTextField usernameField = createTextField(Field.NAME, "User Name", 3, 100, true); + DataSourceTextField usernameField = createTextField(Field.NAME, MESSAGES.dataSource_users_field_name(), 3, 100, + true);
fields.add(usernameField);
- DataSourceTextField ldapField = createBooleanField(Field.LDAP, "LDAP Login?", true); + DataSourceTextField ldapField = createBooleanField(Field.LDAP, MESSAGES.dataSource_users_field_ldap(), true); ldapField.setCanEdit(false); // read-only fields.add(ldapField);
- DataSourcePasswordField passwordField = new DataSourcePasswordField(Field.PASSWORD, "Password", 100, true); + DataSourcePasswordField passwordField = new DataSourcePasswordField(Field.PASSWORD, + MESSAGES.dataSource_users_field_password(), 100, true); LengthRangeValidator passwordValidator = new LengthRangeValidator(); passwordValidator.setMin(6); passwordValidator.setMax(100); @@ -113,7 +115,7 @@ public class UsersDataSource extends RPCDataSource<Subject> { fields.add(passwordField);
DataSourcePasswordField passwordVerifyField = new DataSourcePasswordField(Field.PASSWORD_VERIFY, - "Verify Password", 100, true); + MESSAGES.dataSource_users_field_passwordVerify(), 100, true); MatchesFieldValidator passwordsEqualValidator = new MatchesFieldValidator(); passwordsEqualValidator.setOtherField(Field.PASSWORD); passwordsEqualValidator.setErrorMessage("Passwords do not match."); @@ -121,25 +123,31 @@ public class UsersDataSource extends RPCDataSource<Subject> { fields.add(passwordVerifyField);
- DataSourceTextField firstNameField = createTextField(Field.FIRST_NAME, "First Name", null, 100, true); + DataSourceTextField firstNameField = createTextField(Field.FIRST_NAME, + MESSAGES.dataSource_users_field_firstName(), null, 100, true); fields.add(firstNameField);
- DataSourceTextField lastNameField = createTextField(Field.LAST_NAME, "Last Name", null, 100, true); + DataSourceTextField lastNameField = createTextField(Field.LAST_NAME, MESSAGES.dataSource_users_field_lastName(), + null, 100, true); fields.add(lastNameField);
- DataSourceTextField emailAddressField = createTextField(Field.EMAIL_ADDRESS, "Email Address", null, 100, true); + DataSourceTextField emailAddressField = createTextField(Field.EMAIL_ADDRESS, + MESSAGES.dataSource_users_field_emailAddress(), null, 100, true); fields.add(emailAddressField); RegExpValidator emailAddressValidator = new RegExpValidator(EMAIL_ADDRESS_REGEXP); emailAddressValidator.setErrorMessage("Invalid email address."); emailAddressField.setValidators(emailAddressValidator);
- DataSourceTextField phoneNumberField = createTextField(Field.PHONE_NUMBER, "Phone Number", null, 100, false); + DataSourceTextField phoneNumberField = createTextField(Field.PHONE_NUMBER, + MESSAGES.dataSource_users_field_phoneNumber(), null, 100, false); fields.add(phoneNumberField);
- DataSourceTextField departmentField = createTextField(Field.DEPARTMENT, "Department", null, 100, false); + DataSourceTextField departmentField = createTextField(Field.DEPARTMENT, + MESSAGES.dataSource_users_field_department(), null, 100, false); fields.add(departmentField);
- DataSourceTextField enabledField = createBooleanField(Field.FACTIVE, "Login Enabled?", true); + DataSourceTextField enabledField = createBooleanField(Field.FACTIVE, MESSAGES.dataSource_users_field_factive(), + true); fields.add(enabledField);
return fields; @@ -208,9 +216,8 @@ public class UsersDataSource extends RPCDataSource<Subject> { }
public void onSuccess(Void nothing) { - Message message = new Message("Created user [" + newSubject.getName() + "]."); Record createdUserRecord = copyValues(createdSubject, false); - sendSuccessResponse(request, response, createdUserRecord, message, UsersView.VIEW_PATH); + sendSuccessResponse(request, response, createdUserRecord); } });
@@ -236,8 +243,7 @@ public class UsersDataSource extends RPCDataSource<Subject> { }
public void onSuccess(final Subject updatedSubject) { - Message message = new Message("User updated.", "User [" + username + "] updated."); - sendSuccessResponse(request, response, editedUserRecord, message, UsersView.VIEW_PATH); + sendSuccessResponse(request, response, editedUserRecord); } }); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java index 5dc5b91..df144cb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java @@ -71,7 +71,7 @@ public class AboutModalWindow extends Window {
public void onSuccess(ProductInfo result) { PRODUCT_INFO = result; - setTitle(MESSAGES.about_title(PRODUCT_INFO.getFullName())); + setTitle(MESSAGES.view_aboutBox_title(PRODUCT_INFO.getFullName()));
finishOnInit(); } @@ -88,16 +88,16 @@ public class AboutModalWindow extends Window {
HTMLFlow htmlFlow = new HTMLFlow(); String html = "<span class="DisplaySubhead">\n" + " <a href="" + PRODUCT_INFO.getUrl() + "" title="" - + PRODUCT_INFO.getFullName() + " " + MESSAGES.about_homepage() + "" target="_blank">" + + PRODUCT_INFO.getFullName() + " " + MESSAGES.view_aboutBox_homepage() + "" target="_blank">" + PRODUCT_INFO.getFullName() + "</a>\n" + "</span><br/>\n" + "<span class="DisplayLabel">" - + MESSAGES.about_version() + " " + PRODUCT_INFO.getVersion() + "</span><br/>\n" - + "<span class="DisplayLabel">" + MESSAGES.about_buildNumber() + " " + PRODUCT_INFO.getBuildNumber() - + "</span><p/>\n" + "<span class="DisplayLabel">GWT version: " + MESSAGES.gwt_version() + + MESSAGES.view_aboutBox_version() + " " + PRODUCT_INFO.getVersion() + "</span><br/>\n" + + "<span class="DisplayLabel">" + MESSAGES.view_aboutBox_buildNumber() + " " + PRODUCT_INFO.getBuildNumber() + + "</span><p/>\n" + "<span class="DisplayLabel">GWT version: " + MESSAGES.common_buildInfo_gwtVersion() + "</span><br/>\n" + "<span class="DisplayLabel">SmartGWT version: " + Version.getVersion() - + "</span><br/>\n" + "<p><a href="http://jboss.org/%5C" title="JBoss " + MESSAGES.about_homepage() - + "">\n" + " <img height="55" alt="" + MESSAGES.about_jbossByRedHat() + + "</span><br/>\n" + "<p><a href="http://jboss.org/%5C" title="JBoss " + MESSAGES.view_aboutBox_homepage() + + "">\n" + " <img height="55" alt="" + MESSAGES.view_aboutBox_jbossByRedHat() + "" src="/images/jboss_logo.png">\n" + "</a></p>\n" + "<div style="top-margin: 10px">" - + MESSAGES.about_allRightsReserved() + "</div>\n"; + + MESSAGES.view_aboutBox_allRightsReserved() + "</div>\n"; htmlFlow.setContents(html); contentPane.addMember(htmlFlow);
@@ -109,7 +109,7 @@ public class AboutModalWindow extends Window { spacer.setWidth("*"); bottomPanel.addMember(spacer);
- Button closeButton = new Button(MESSAGES.button_close()); + Button closeButton = new Button(MESSAGES.common_button_close()); closeButton.setShowRollOver(true); closeButton.setShowDown(true); closeButton.setWidth("60"); 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 1961822..ff327a9 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 @@ -27,6 +27,7 @@ import com.smartgwt.client.data.DSCallback; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; import com.smartgwt.client.data.Record; +import com.smartgwt.client.rpc.RPCResponse; import com.smartgwt.client.types.DSOperationType; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.widgets.IButton; @@ -41,10 +42,13 @@ import com.smartgwt.client.widgets.layout.HLayout; import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.DetailsView; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.TitleBar; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -56,6 +60,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends LocatableVLayout implements BookmarkableView, DetailsView {
+ protected static final Messages MESSAGES = CoreGUI.getMessages(); + private static final Label LOADING_LABEL = new Label("Loading..."); private static final String FIELD_ID = "id"; private static final String FIELD_NAME = "name"; @@ -70,6 +76,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc private boolean isReadOnly; private VLayout bottomLayout; private String dataTypeName; + private String listViewPath;
public AbstractRecordEditor(String locatorId, DS dataSource, int recordId, String dataTypeName, String headerIcon) { @@ -90,6 +97,17 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc addMember(this.titleBar); }
+ @Override + public void renderView(ViewPath viewPath) { + String parentViewPath = viewPath.getParentViewPath(); + if (!viewPath.isEnd()) { + CoreGUI.getErrorHandler().handleError(MESSAGES.widget_recordEditor_error_invalidViewPath(viewPath.toString())); + CoreGUI.goToView(parentViewPath); + } else { + this.listViewPath = parentViewPath; // e.g. Administration/Security/Roles + } + } + /** * <b>IMPORTANT:</b> Subclasses are responsible for invoking this method after all asynchronous operations invoked * by {@link #renderView(ViewPath)} have completed. @@ -149,7 +167,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc private HLayout createButtons() { HLayout buttonLayout = new HLayout(10);
- saveButton = new LocatableIButton(this.extendLocatorId("Save"), "Save"); + saveButton = new LocatableIButton(this.extendLocatorId("Save"), MESSAGES.common_button_save()); saveButton.setDisabled(true); saveButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { @@ -157,7 +175,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc } });
- resetButton = new LocatableIButton(this.extendLocatorId("Reset"), "Reset"); + resetButton = new LocatableIButton(this.extendLocatorId("Reset"), MESSAGES.common_button_reset()); resetButton.setDisabled(true); resetButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { @@ -166,7 +184,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc } });
- IButton cancelButton = new LocatableIButton(this.extendLocatorId("Cancel"), "Cancel"); + IButton cancelButton = new LocatableIButton(this.extendLocatorId("Cancel"), MESSAGES.common_button_cancel()); cancelButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { History.back(); @@ -199,6 +217,10 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc return recordId; }
+ public String getListViewPath() { + return listViewPath; + } + protected abstract List<FormItem> createFormItems(boolean newUser);
/** @@ -221,7 +243,32 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc }
protected void save() { - this.form.saveData(); + this.form.saveData(new DSCallback() { + public void execute(DSResponse response, Object rawData, DSRequest request) { + if (response.getStatus() == RPCResponse.STATUS_SUCCESS) { + Record[] data = response.getData(); + Record record = data[0]; + String id = record.getAttribute(FIELD_ID); + String name = record.getAttribute(getTitleFieldName()); + Message message; + DSOperationType operationType = request.getOperationType(); + switch (operationType) { + case ADD: + message = new Message(MESSAGES.widget_recordEditor_info_recordCreatedConcise(dataTypeName), + MESSAGES.widget_recordEditor_info_recordCreatedDetailed(dataTypeName, name)); + break; + case UPDATE: + message = new Message(MESSAGES.widget_recordEditor_info_recordUpdatedConcise(dataTypeName), + MESSAGES.widget_recordEditor_info_recordUpdatedDetailed(dataTypeName, name)); + break; + default: + throw new IllegalStateException( + MESSAGES.widget_recordEditor_error_unsupportedOperationType(operationType.name())); + } + CoreGUI.goToView(getListViewPath(), message); + } + } + }); }
@SuppressWarnings("unchecked") @@ -253,10 +300,10 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc if (response.getStatus() == DSResponse.STATUS_SUCCESS) { Record[] records = response.getData(); if (records.length == 0) { - throw new IllegalStateException("No records were returned - expected exactly one."); + throw new IllegalStateException(MESSAGES.widget_recordEditor_error_noRecords()); } if (records.length > 1) { - throw new IllegalStateException("Multiple records were returned - expected exactly one."); + throw new IllegalStateException(MESSAGES.widget_recordEditor_error_multipleRecords()); } Record record = records[0]; onExistingRecordFetched(record); @@ -274,8 +321,10 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc // NOTE: We do *not* do this for new records, since we expect most of the required fields to be blank. this.form.validate();
- String username = record.getAttribute(getTitleFieldName()); - this.titleBar.setTitle((this.isReadOnly ? "View" : "Edit") + " " + this.dataTypeName + " '" + username + "'"); + String recordName = record.getAttribute(getTitleFieldName()); + String title = (this.isReadOnly) ? MESSAGES.widget_recordEditor_title_view(this.dataTypeName, recordName) : + MESSAGES.widget_recordEditor_title_edit(this.dataTypeName, recordName); + this.titleBar.setTitle(title); }
protected String getTitleFieldName() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java index a675a7a..fb7ed78 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java @@ -199,13 +199,14 @@ public abstract class TableSection extends Table implements BookmarkableView {
@Override public void renderView(ViewPath viewPath) { - basePath = viewPath.getPathToCurrent(); + this.basePath = viewPath.getPathToCurrent();
if (!viewPath.isEnd()) { int id = Integer.parseInt(viewPath.getCurrent().getPath()); - detailsView = getDetailsView(id); - if (detailsView instanceof BookmarkableView) { - ((BookmarkableView) detailsView).renderView(viewPath); + this.detailsView = getDetailsView(id); + if (this.detailsView instanceof BookmarkableView) { + viewPath.next(); + ((BookmarkableView) this.detailsView).renderView(viewPath); }
switchToDetailsView(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java index d5a9914..1708dce 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java @@ -51,6 +51,7 @@ import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.util.effects.ColoringUtility; import org.rhq.enterprise.gui.coregui.client.util.message.Message; @@ -64,6 +65,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; */ public abstract class RPCDataSource<T> extends DataSource {
+ protected static final Messages MESSAGES = CoreGUI.getMessages(); + private List<String> hightlightingFieldNames = new ArrayList<String>();
public RPCDataSource() { @@ -183,6 +186,14 @@ public abstract class RPCDataSource<T> extends DataSource { } }
+ protected void sendSuccessResponse(DSRequest request, DSResponse response, T dataObject) { + sendSuccessResponse(request, response, dataObject, null); + } + + protected void sendSuccessResponse(DSRequest request, DSResponse response, Record record) { + sendSuccessResponse(request, response, record, null); + } + protected void sendSuccessResponse(DSRequest request, DSResponse response, T dataObject, Message message) { sendSuccessResponse(request, response, dataObject, message, null); } 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 927f231..b41be8a 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 @@ -1,24 +1,94 @@ # -# i18n Messages - English -########################### +# RHQ GUI i18n Messages - English +################################### + +#************************************** SHARED **************************************** + +#=================== Common =====================
# # Build Info # -gwt.version = ${gwt.version} +common_buildInfo_gwtVersion = ${gwt.version}
-# -# Standard Button Labels -# -button.ok = OK -button.close = Close +# Button Labels +#-------------- +common_button_ok = OK +common_button_close = Close +common_button_save = Save +common_button_reset = Reset +common_button_cancel = Cancel +common_button_new = New + + +#=================== Widgets ===================== + +# Record Editor +#-------------- +widget_recordEditor_title_view = View {0} "{1}" +widget_recordEditor_title_edit = Edit {0} "{1}" +widget_recordEditor_title_new = Create New {0} +widget_recordEditor_label_loading = Loading... +widget_recordEditor_error_invalidViewPath = Invalid view path: "{0}" +widget_recordEditor_error_noRecords = No records were returned - expected exactly one. +widget_recordEditor_error_multipleRecords = Multiple records were returned - expected exactly one. +widget_recordEditor_info_recordCreatedConcise = {0} created. +widget_recordEditor_info_recordCreatedDetailed = {0} "{1}" created. +widget_recordEditor_info_recordUpdatedConcise = {0} updated. +widget_recordEditor_info_recordUpdatedDetailed = {0} "{1}" updated. +widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: "{0}" + + +#================== DataSources ==================== + +# Users +#------ +dataSource_users_field_id = ID +dataSource_users_field_name = User Name +dataSource_users_field_ldap = LDAP Login? +dataSource_users_field_password = Password +dataSource_users_field_passwordVerify = Verify Password +dataSource_users_field_firstName = First Name +dataSource_users_field_lastName = Last Name +dataSource_users_field_emailAddress = Email Address +dataSource_users_field_phoneNumber = Phone Number +dataSource_users_field_department = Department +dataSource_users_field_factive = Login Enabled? + + +#********************************** VIEW-SPECIFIC ************************************* + +#=================== Top Level =====================
-# # About Box -# -about.title = About {0} -about.homepage = Homepage -about.version = Version: -about.buildNumber = Build Number: -about.jbossByRedHat = JBoss by Red Hat -about.allRightsReserved = All Rights Reserved. +#---------- +view_aboutBox_title = About {0} +view_aboutBox_homepage = Homepage +view_aboutBox_version = Version: +view_aboutBox_buildNumber = Build Number: +view_aboutBox_jbossByRedHat = JBoss by Red Hat +view_aboutBox_allRightsReserved = All Rights Reserved. + + +#=================== Dashboard ===================== + + +#=================== Inventory ===================== + + +#==================== Reports ====================== + + +#==================== Bundles ====================== + + +#================= Administration ================== + + +# Administration/Security/Users +#------------------------------ +view_adminUsers_title = Users + +# Administration/Security/Users/# +#-------------------------------- +view_adminUsersDetails_dataTypeName = user
rhq-commits@lists.fedorahosted.org