Alexey Chub has uploaded a new change for review. Change subject: webadmin: "Fully configured" message for guide me dialogs (#850439) ......................................................................
webadmin: "Fully configured" message for guide me dialogs (#850439) http://bugzilla.redhat.com/850439 Change-Id: I594e6721ea114560784152dcdd5d85910f50b34e Signed-off-by: Alexey Chub <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java 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/view/popup/guide/GuidePopupView.java 4 files changed, 66 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/8296/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java index f1d9401..9266494 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java @@ -54,6 +54,7 @@ void updateButton() { getButtonWidget().setVisible(command.getIsAvailable() && command.getIsVisible()); getButtonWidget().setEnabled(command.getIsExecutionAllowed()); + getButtonWidget().setText(command.getTitle()); getButtonWidget().setTitle(command.getTitle()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java index 0d2ec0e..55c0a92 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java @@ -188,12 +188,11 @@ } private void UpdateOptionsLocalFS() { - UICommand tempVar = new UICommand("AddHost", this); //$NON-NLS-1$ - tempVar.setTitle(ClusterAddAnotherHostAction); - UICommand addHostAction = tempVar; - UICommand tempVar2 = new UICommand("SelectHost", this); //$NON-NLS-1$ - tempVar2.setTitle(SelectHostsAction); - UICommand selectHost = tempVar2; + + UICommand addHostAction = new UICommand("AddHost", this); //$NON-NLS-1$ + addHostAction.setTitle(ClusterAddAnotherHostAction); + UICommand selectHost = new UICommand("SelectHost", this); //$NON-NLS-1$ + selectHost.setTitle(SelectHostsAction); if (localStorageHost != null) { 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 ba52f40..e01e364 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 @@ -752,12 +752,21 @@ @DefaultStringValue("Data Center created.") String guidePopupDataCenterCreatedLabel(); + @DefaultStringValue("The Data Center is fully configured and ready for use.") + String guidePopupConfiguredDataCenterLabel(); + @DefaultStringValue("Cluster created.") String guidePopupClusterCreatedLabel(); + @DefaultStringValue("The Cluster is fully configured and ready for use.") + String guidePopupConfiguredClusterLabel(); + @DefaultStringValue("Virtual Machine created.") String guidePopupVMCreatedLabel(); + @DefaultStringValue("The Virtual Machine is fully configured and ready for use.") + String guidePopupConfiguredVmLabel(); + @DefaultStringValue("Cluster:") String moveHostPopupClusterLabel(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java index 41854ca..808b57c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java @@ -1,22 +1,5 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.guide; -import org.ovirt.engine.core.compat.Event; -import org.ovirt.engine.core.compat.EventArgs; -import org.ovirt.engine.core.compat.IEventListener; -import org.ovirt.engine.core.compat.PropertyChangedEventArgs; -import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; -import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; -import org.ovirt.engine.ui.common.widget.UiCommandButton; -import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel; -import org.ovirt.engine.ui.uicommonweb.UICommand; -import org.ovirt.engine.ui.uicommonweb.models.GuideModel; -import org.ovirt.engine.ui.uicommonweb.models.clusters.ClusterGuideModel; -import org.ovirt.engine.ui.uicommonweb.models.datacenters.DataCenterGuideModel; -import org.ovirt.engine.ui.uicommonweb.models.vms.VmGuideModel; -import org.ovirt.engine.ui.webadmin.ApplicationConstants; -import org.ovirt.engine.ui.webadmin.ApplicationResources; -import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.guide.GuidePopupPresenterWidget; - import com.google.gwt.core.client.GWT; import com.google.gwt.editor.client.SimpleBeanEditorDriver; import com.google.gwt.event.dom.client.ClickEvent; @@ -29,6 +12,24 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.inject.Inject; +import org.ovirt.engine.core.compat.Event; +import org.ovirt.engine.core.compat.EventArgs; +import org.ovirt.engine.core.compat.IEventListener; +import org.ovirt.engine.core.compat.PropertyChangedEventArgs; +import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; +import org.ovirt.engine.ui.common.widget.UiCommandButton; +import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel; +import org.ovirt.engine.ui.uicommonweb.Linq; +import org.ovirt.engine.ui.uicommonweb.UICommand; +import org.ovirt.engine.ui.uicommonweb.models.GuideModel; +import org.ovirt.engine.ui.uicommonweb.models.clusters.ClusterGuideModel; +import org.ovirt.engine.ui.uicommonweb.models.datacenters.DataCenterGuideModel; +import org.ovirt.engine.ui.uicommonweb.models.vms.VmGuideModel; +import org.ovirt.engine.ui.uicompat.ConstantsManager; +import org.ovirt.engine.ui.webadmin.ApplicationConstants; +import org.ovirt.engine.ui.webadmin.ApplicationResources; +import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.guide.GuidePopupPresenterWidget; public class GuidePopupView extends AbstractModelBoundPopupView<GuideModel> implements GuidePopupPresenterWidget.ViewDef { @@ -78,6 +79,7 @@ Style style; private final ApplicationResources resources; + private final ApplicationConstants constants; @Inject public GuidePopupView(EventBus eventBus, @@ -85,6 +87,7 @@ ApplicationConstants constants) { super(eventBus, resources); this.resources = resources; + this.constants = constants; initWidget(ViewUiBinder.uiBinder.createAndBindUi(this)); ViewIdHandler.idHandler.generateAndSetIds(this); localize(constants); @@ -113,18 +116,43 @@ if ("Progress".equals(propertyName)) { //$NON-NLS-1$ if (guideModel.getProgress() == null) { - if (guideModel.getCompulsoryActions().isEmpty()) { + + // Check whether there any available actions. + boolean hasAllowedActions = false; + for (Object item : Linq.Concat(guideModel.getCompulsoryActions(), guideModel.getOptionalActions())) { + UICommand command = (UICommand) item; + if (command.getIsExecutionAllowed()) { + hasAllowedActions = true; + break; + } + } + + // Choose an appropriate message matching the entity type (DC, Cluster or VM). + String message = null; + if (guideModel instanceof DataCenterGuideModel) { + message = constants.guidePopupConfiguredDataCenterLabel(); + } else if (guideModel instanceof ClusterGuideModel) { + message = constants.guidePopupConfiguredClusterLabel(); + } else if (guideModel instanceof VmGuideModel) { + message = constants.guidePopupConfiguredVmLabel(); + } + + if (!hasAllowedActions) { + infoLabel.setText(message); + compulsorySection.setVisible(false); + optionalSection.setVisible(false); + // Rename dialog button. + guideModel.getCommands().get(0).setTitle(ConstantsManager.getInstance().getConstants().ok()); + } else if (guideModel.getCompulsoryActions().isEmpty()) { infoLabel.setText(configurationCompleted); optionalSection.setVisible(true); compulsorySection.setVisible(false); - } - else if (guideModel.getOptionalActions().isEmpty()) { + } else if (guideModel.getOptionalActions().isEmpty()) { updateCreatedLabel(guideModel); optionalSection.setVisible(false); compulsorySection.setVisible(true); compulsoryActionsLabel.setVisible(true); - } - else { + } else { infoLabel.setText(unconfigured); optionalSection.setVisible(true); compulsorySection.setVisible(true); @@ -133,8 +161,7 @@ } updateActionsPanels(guideModel); - } - else if ("Window".equals(propertyName)) { //$NON-NLS-1$ + } else if ("Window".equals(propertyName)) { //$NON-NLS-1$ if (guideModel.getLastExecutedCommand().getName().equals("Cancel")) { //$NON-NLS-1$ redrawActionsPanels(); } -- To view, visit http://gerrit.ovirt.org/8296 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I594e6721ea114560784152dcdd5d85910f50b34e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexey Chub <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
