modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 20 +++------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsView.java | 2 - 2 files changed, 7 insertions(+), 15 deletions(-)
New commits: commit 78f624cc534e7c23b3665bcc082420c38badcfe3 Merge: f26b9c1... 22aff4a... Author: Simeon Pinder spinder@redhat.com Date: Mon Nov 22 16:22:45 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into track-master
commit f26b9c10181e67ab91d93adc8b266024c80733eb Author: Simeon Pinder spinder@redhat.com Date: Mon Nov 22 16:21:24 2010 -0500
i)fixed wrong i18n mesg ii)fixed modal plugin errors issue.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java index 37ba5f3..2054855 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java @@ -32,8 +32,6 @@ import com.smartgwt.client.widgets.Img; import com.smartgwt.client.widgets.Window; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; -import com.smartgwt.client.widgets.events.CloseClickHandler; -import com.smartgwt.client.widgets.events.CloseClientEvent; import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.fields.CheckboxItem; import com.smartgwt.client.widgets.form.fields.LinkItem; @@ -185,20 +183,14 @@ public class ResourceTitleBar extends LocatableVLayout { @Override public void onClick(com.smartgwt.client.widgets.form.fields.events.ClickEvent event) { final Window winModal = new Window(); - winModal.setWidth("70%"); - winModal.setHeight("70%"); - winModal.setTitle(MSG.common_title_component_errors() + ":"); winModal.setShowMinimizeButton(false); - winModal.setIsModal(true); winModal.setShowModalMask(true); winModal.setShowCloseButton(true); + winModal.setWidth("70%"); + winModal.setHeight("70%"); + winModal.setIsModal(true); winModal.centerInPage(); - winModal.addCloseClickHandler(new CloseClickHandler() { - @Override - public void onCloseClick(CloseClientEvent event) { - winModal.destroy(); - } - }); + winModal.setTitle(MSG.common_title_component_errors() + ":");
LocatableVLayout form = new LocatableVLayout(extendLocatorId("_Modal_Form")); form.setAlign(VerticalAlignment.CENTER); @@ -217,7 +209,7 @@ public class ResourceTitleBar extends LocatableVLayout { errorsGrid.setShowFooter(false); errorsGrid.setDataSource(errors); form.addMember(errorsGrid); - winModal.addChild(form); + winModal.addItem(form);
winModal.show(); } @@ -381,4 +373,4 @@ public class ResourceTitleBar extends LocatableVLayout { toggleFavoriteLocally(); } } -} +} \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsView.java index 9bc40ff..de0bf7f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ResourceErrorsView.java @@ -6,7 +6,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table;
public class ResourceErrorsView extends Table { public ResourceErrorsView(String locatorId, String string, Criteria criteria, Object object, String[] strings) { - super(locatorId, MSG.view_bundle_bundles(), criteria); + super(locatorId, MSG.common_title_component_errors(), criteria); }
/** Set order and width of table display
rhq-commits@lists.fedorahosted.org