Ramesh N has uploaded a new change for review. Change subject: webadmin: show warning in manage events pop up ......................................................................
webadmin: show warning in manage events pop up Showing a warning note in manage events pop up saying event-notifier should be configured and notifier service should be running to get email notification. Change-Id: I0fd7a7f4dbd1442ff748f64807f10f2bc50b9216 Bug-Url: https://bugzilla.redhat.com/1036500 Signed-off-by: Ramesh Nachimuthu <rnach...@redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/user/ManageEventsPopupPresenterWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/user/ManageEventsPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/user/ManageEventsPopupView.ui.xml 4 files changed, 84 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/22080/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 99a0860..da80b22 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -897,6 +897,9 @@ @DefaultStringValue("Select the Events for Notification:") String manageEventsPopupTitleLabel(); + @DefaultStringValue("Note: To receive email notifications, ensure that the mail server is configured and the ovirt-event-notifier service is running.") + String manageEventsPopupInfoLabel(); + @DefaultStringValue("Devices to configure:") String guidePopupRequiredActionsLabel(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/user/ManageEventsPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/user/ManageEventsPopupPresenterWidget.java index 5af752d..522274f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/user/ManageEventsPopupPresenterWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/user/ManageEventsPopupPresenterWidget.java @@ -1,6 +1,8 @@ package org.ovirt.engine.ui.webadmin.section.main.presenter.popup.user; import org.ovirt.engine.ui.common.presenter.AbstractModelBoundPopupPresenterWidget; +import org.ovirt.engine.ui.common.uicommon.DocumentationPathTranslator; +import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.models.users.EventNotificationModel; import com.google.gwt.event.shared.EventBus; @@ -9,11 +11,29 @@ public class ManageEventsPopupPresenterWidget extends AbstractModelBoundPopupPresenterWidget<EventNotificationModel, ManageEventsPopupPresenterWidget.ViewDef> { public interface ViewDef extends AbstractModelBoundPopupPresenterWidget.ViewDef<EventNotificationModel> { + public void setManageEventsCommand(UICommand command); } @Inject public ManageEventsPopupPresenterWidget(EventBus eventBus, ViewDef view) { super(eventBus, view); + + } + + @Override + public void init(EventNotificationModel model) { + super.init(model); + UICommand openDocumentationCommand = model.getOpenDocumentationCommand(); + if (openDocumentationCommand != null) { + String hashName = "manage-events"; //$NON-NLS-1$ + boolean isDocumentationAvailable = DocumentationPathTranslator.getPath(hashName) != null; + openDocumentationCommand.setIsAvailable(isDocumentationAvailable); + updateManageEventsHelpCommand(isDocumentationAvailable ? openDocumentationCommand : null); + } + } + + void updateManageEventsHelpCommand(UICommand command) { + getView().setManageEventsCommand(command); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/user/ManageEventsPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/user/ManageEventsPopupView.java index 1d0f761..d960d0f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/user/ManageEventsPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/user/ManageEventsPopupView.java @@ -8,6 +8,7 @@ import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel; import org.ovirt.engine.ui.common.widget.editor.EntityModelTextBoxEditor; +import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.models.common.SelectionTreeNodeModel; import org.ovirt.engine.ui.uicommonweb.models.users.EventNotificationModel; import org.ovirt.engine.ui.uicompat.Event; @@ -31,6 +32,7 @@ import com.google.gwt.user.cellview.client.CellTree; import com.google.gwt.user.cellview.client.TreeNode; import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.ButtonBase; import com.google.gwt.user.client.ui.Label; import com.google.gwt.view.client.AsyncDataProvider; import com.google.inject.Inject; @@ -75,7 +77,16 @@ @WithElementId Button collapseAllButton; + @UiField + @Ignore + Label infoLabel; + + @UiField + ButtonBase manageEventsHelpIconButton; + private final Driver driver = GWT.create(Driver.class); + + private UICommand manageEventsHelpCommand; @Inject public ManageEventsPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants) { @@ -86,6 +97,7 @@ ViewIdHandler.idHandler.generateAndSetIds(this); localize(constants); driver.initialize(this); + addManageEventsHelpButtonHandler(); } void localize(ApplicationConstants constants) { @@ -93,6 +105,7 @@ titleLabel.setText(constants.manageEventsPopupTitleLabel()); expandAllButton.setText(constants.treeExpandAll()); collapseAllButton.setText(constants.treeCollapseAll()); + infoLabel.setText(constants.manageEventsPopupInfoLabel()); } private void initTree() { @@ -118,7 +131,6 @@ @Override public void edit(EventNotificationModel object) { driver.edit(object); - // Listen to Properties object.getPropertyChangedEvent().addListener(new IEventListener() { @Override @@ -175,6 +187,19 @@ } } + private void addManageEventsHelpButtonHandler() { + manageEventsHelpIconButton.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + manageEventsHelpCommand.execute(); + } + }); + } + + public void setManageEventsCommand(UICommand command) { + manageEventsHelpCommand = command; + } + @Override public EventNotificationModel flush() { return driver.flush(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/user/ManageEventsPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/user/ManageEventsPopupView.ui.xml index 2937e49..6866ba2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/user/ManageEventsPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/user/ManageEventsPopupView.ui.xml @@ -3,33 +3,54 @@ <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog" xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor" xmlns:we="urn:import:org.ovirt.engine.ui.webadmin.widget.editor"> - + <ui:with field='resources' + type='org.ovirt.engine.ui.common.CommonApplicationResources' /> <ui:style> .titleLabel { padding-top: 5px; padding-left: 5px; } - + .descriptionEditor { width: 100%; } - + .errorMessageLabel { color: #CD2127; margin-top: 10px; margin-left: 5px; } - + .treePanel { margin-top: 5px; } - + .buttonPanel { padding-left: 5px; } + + .infoLabel { + font-size: 13px; + left: 10px; + padding-left: 5px; + color: #0000FF; + } + + .manageEventsHelpIconButton { + background: transparent; + border: 1px solid transparent; + line-height: 32px; + vertical-align: middle; + padding: 1px; + cursor: pointer; + z-index: 1; + float: left; + position: relative; + top: -5px; + } </ui:style> - <d:SimpleDialogPanel width="580px" height="560px"> + <d:SimpleDialogPanel width="580px" height="600px"> <d:content> <g:VerticalPanel> <g:Label ui:field="titleLabel" addStyleNames="{style.titleLabel}" /> @@ -44,6 +65,14 @@ <we:EntityModelCellTree ui:field="tree" /> </g:ScrollPanel> <e:EntityModelTextBoxEditor ui:field="emailEditor" /> + <g:HorizontalPanel> + <g:Label ui:field="infoLabel" addStyleNames="{style.infoLabel}" /> + <g:PushButton ui:field="manageEventsHelpIconButton" addStyleNames="{style.manageEventsHelpIconButton}"> + <g:upFace image='{resources.dialogIconHelp}' /> + <g:downFace image='{resources.dialogIconHelpDown}' /> + <g:upHoveringFace image='{resources.dialogIconHelpRollover}' /> + </g:PushButton> + </g:HorizontalPanel> </g:VerticalPanel> </d:content> </d:SimpleDialogPanel> -- To view, visit http://gerrit.ovirt.org/22080 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fd7a7f4dbd1442ff748f64807f10f2bc50b9216 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ramesh N <rnach...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
