Frank Kobzik has uploaded a new change for review. Change subject: added branded link for console resources in portals ......................................................................
added branded link for console resources in portals Change-Id: I5f7316e6ce5032123edc2e39b4939d0c8dab1cb1 Signed-off-by: Frantisek Kobzik <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/ConsolePopupPresenterWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolEditPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolNewPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/template/TemplateNewPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmClonePopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmPopupWidget.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/template/TemplateNewPopupView.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmClonePopupView.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/pool/PoolEditPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/pool/PoolNewPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/template/TemplateNewPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmClonePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmPopupView.java M packaging/branding/ovirt.brand/messages.properties 22 files changed, 126 insertions(+), 34 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/18596/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index fada693..16e970e 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -1566,4 +1566,7 @@ @DefaultStringValue("Network") String networkProfilePopup(); + + @DefaultStringValue("Console Client Resources") + String consoleClientResources(); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/ConsolePopupPresenterWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/ConsolePopupPresenterWidget.java index 91112da..70f4051 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/ConsolePopupPresenterWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/ConsolePopupPresenterWidget.java @@ -2,6 +2,7 @@ import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.presenter.AbstractModelBoundPopupPresenterWidget; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.uicommonweb.ConsoleOptionsFrontendPersister; import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; import org.ovirt.engine.ui.uicommonweb.UICommand; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java index 466c43e..e579100 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java @@ -36,6 +36,7 @@ FEEDBACK_LINK_LABEL("feedback_link_label"), //$NON-NLS-1$ GUIDE_URL("guide_url"), //$NON-NLS-1$ GUIDE_LINK_LABEL("guide_link_label"), //$NON-NLS-1$ + CONSOLE_CLIENT_RESOURCES_URL("console_client_resources_url"), //$NON-NLS-1$ DOC("doc"); //$NON-NLS-1$ private final String value; @@ -274,6 +275,16 @@ } /** + * + * TODO doc + * + * @return The guide link label. + */ + public final String consoleClientResourcesUrl() { + return getString(DynamicMessageKey.CONSOLE_CLIENT_RESOURCES_URL); + } + + /** * Get the application documentation title using the {@code Dictionary} in the host page. With a fall back to the standard GWT * Constant. * diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java index e136e97..3767072 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java @@ -1,11 +1,16 @@ package org.ovirt.engine.ui.common.view.popup; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.Anchor; import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationResources; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.presenter.popup.ConsolePopupPresenterWidget; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.widget.Align; import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel; import org.ovirt.engine.ui.common.widget.editor.EntityModelRadioButtonEditor; @@ -142,9 +147,15 @@ @WithElementId EntityModelValueCheckBoxEditor<ConsoleModel> wanEnabled; + @UiField(provided = true) + @WithElementId + Anchor clientConsoleResourcesUrl; + private final CommonApplicationConstants constants; private final CommonApplicationMessages messages; + + private final DynamicMessages dynamicMessages; private ConsolePopupModel model; @@ -152,10 +163,12 @@ public ConsolePopupView(EventBus eventBus, CommonApplicationResources resources, CommonApplicationConstants constants, - CommonApplicationMessages messages) { + CommonApplicationMessages messages, + final DynamicMessages dynamicMessages) { super(eventBus, resources); this.constants = constants; this.messages = messages; + this.dynamicMessages = dynamicMessages; spiceRadioButton = new EntityModelRadioButtonEditor("1"); //$NON-NLS-1$ spiceRadioButton.setLabel(constants.spice()); @@ -181,6 +194,14 @@ rdpPluginImplRadioButton = new EntityModelRadioButtonEditor("4"); //$NON-NLS-1$ rdpPluginImplRadioButton.setLabel(constants.browserPlugin()); + clientConsoleResourcesUrl = new Anchor(constants.consoleClientResources()); + clientConsoleResourcesUrl.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + Window.open(dynamicMessages.consoleClientResourcesUrl(), "_blank", null); //$NON-NLS-1$ + } + }); + disableSmartcard = new EntityModelValueCheckBoxEditor<ConsoleModel>(Align.RIGHT, new SpiceRenderer() { @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.ui.xml index 76c5107..82c76b0 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.ui.xml @@ -40,6 +40,12 @@ float: left; } + .consoleResourcesLink { + cursor: hand; + position: absolute; + bottom: 0px; + left: 0px; + } </ui:style> <d:SimpleDialogPanel width="500px" height="420px"> @@ -89,6 +95,9 @@ <e:EntityModelRadioButtonEditor ui:field="rdpPluginImplRadioButton" /> <w:EntityModelValueCheckBoxEditor ui:field="useLocalDrives" /> </g:FlowPanel> + <g:FlowPanel> + <g:Anchor ui:field="clientConsoleResourcesUrl" addStyleNames="{style.consoleResourcesLink}" /> + </g:FlowPanel> </g:FlowPanel> </d:content> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index 54b2c04..ec0c2a0 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -2,6 +2,9 @@ import static org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfig.simpleField; + +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.Anchor; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -22,6 +25,7 @@ import org.ovirt.engine.ui.common.CommonApplicationResources; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.WithElementId; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.widget.Align; import org.ovirt.engine.ui.common.widget.dialog.AdvancedParametersExpander; import org.ovirt.engine.ui.common.widget.dialog.InfoIcon; @@ -549,6 +553,10 @@ @WithElementId("kernelParameters") public EntityModelTextBoxEditor kernel_parametersEditor; + @UiField(provided = true) + @Ignore + Anchor clientConsoleResourcesUrl; + @UiField @Ignore Label nativeUsbWarningMessage; @@ -562,6 +570,8 @@ protected KeyValueWidget customPropertiesSheetEditor; private final CommonApplicationMessages messages; + + private final DynamicMessages dynamicMessages; @UiField @Ignore @@ -585,10 +595,12 @@ public AbstractVmPopupWidget(CommonApplicationConstants constants, CommonApplicationResources resources, final CommonApplicationMessages messages, - CommonApplicationTemplates applicationTemplates) { + CommonApplicationTemplates applicationTemplates, + final DynamicMessages dynamicMessages) { this.messages = messages; this.applicationTemplates = applicationTemplates; + this.dynamicMessages = dynamicMessages; initListBoxEditors(); // Contains a special parser/renderer @@ -613,6 +625,13 @@ copyTemplatePermissionsEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer()); isMemoryBalloonDeviceEnabled = new EntityModelCheckBoxEditor(Align.RIGHT); isSingleQxlEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer()); + clientConsoleResourcesUrl = new Anchor(); + clientConsoleResourcesUrl.addClickHandler(new ClickHandler() { + @Override + public void onClick(ClickEvent event) { + Window.open(dynamicMessages.consoleClientResourcesUrl(), "_blank", null); //$NON-NLS-1$ + } + }); cpuPinningInfo = new InfoIcon(SafeHtmlUtils.fromTrustedString(applicationTemplates.italicFixedWidth("400px",//$NON-NLS-1$ constants.cpuPinningLabelExplanation()) @@ -952,6 +971,7 @@ usbSupportEditor.setLabel(constants.usbPolicyVmPopup()); numOfMonitorsEditor.setLabel(constants.monitorsVmPopup()); allowConsoleReconnectEditor.setLabel(constants.allowConsoleReconnect()); + clientConsoleResourcesUrl.setText(constants.consoleClientResources()); // Host Tab hostTab.setLabel(constants.hostVmPopup()); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml index ebd95f0..11d2096 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml @@ -10,6 +10,7 @@ <ui:with field='resources' type='org.ovirt.engine.ui.common.CommonApplicationResources' /> <ui:with field='constants' type='org.ovirt.engine.ui.common.CommonApplicationConstants'/> + <!--<ui:with field='dynamicMessages' type='org.ovirt.engine.ui.common.CommonApplicationConstants'/>--> <ui:style type="org.ovirt.engine.ui.common.widget.uicommon.popup.AbstractVmPopupWidget.Style"> @@ -277,6 +278,11 @@ .migrationSelectorInner { width: 260px; } + + .consoleResourcesLink { + cursor: hand; + } + </ui:style> <t:DialogTabPanel width="100%" height="100%"> @@ -421,6 +427,7 @@ </g:HorizontalPanel> </g:FlowPanel> </g:FlowPanel> + <g:Anchor ui:field="clientConsoleResourcesUrl" addStyleNames="{style.consoleResourcesLink}" /> <e:EntityModelCheckBoxEditor ui:field="isSmartcardEnabledEditor" addStyleNames="{style.checkbox}" /> <g:Label ui:field="nativeUsbWarningMessage" text="{constants.nativeUsbSupportWarning}" addStyleNames="{style.warningMessageLabel}" /> <d:AdvancedParametersExpander ui:field="expander"/> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolEditPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolEditPopupWidget.java index 3093290..7c0e0e3 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolEditPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolEditPopupWidget.java @@ -10,6 +10,7 @@ import org.ovirt.engine.ui.common.CommonApplicationResources; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.widget.editor.EntityModelRenderer; import org.ovirt.engine.ui.common.widget.editor.EntityModelTextBoxEditor; import org.ovirt.engine.ui.common.widget.editor.EntityModelTextBoxOnlyEditor; @@ -31,8 +32,9 @@ public PoolEditPopupWidget(CommonApplicationConstants constants, CommonApplicationResources resources, CommonApplicationMessages messages, - CommonApplicationTemplates applicationTemplates) { - super(constants, resources, messages, applicationTemplates); + CommonApplicationTemplates applicationTemplates, + DynamicMessages dynamicMessages) { + super(constants, resources, messages, applicationTemplates, dynamicMessages); } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolNewPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolNewPopupWidget.java index 93a3ec9..deaaef0 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolNewPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/pool/PoolNewPopupWidget.java @@ -9,6 +9,7 @@ import org.ovirt.engine.ui.common.CommonApplicationResources; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.widget.editor.EntityModelRenderer; import org.ovirt.engine.ui.common.widget.editor.EntityModelTextBoxEditor; import org.ovirt.engine.ui.common.widget.editor.EntityModelTextBoxOnlyEditor; @@ -32,8 +33,9 @@ public PoolNewPopupWidget(CommonApplicationConstants constants, CommonApplicationResources resources, CommonApplicationMessages messages, - CommonApplicationTemplates applicationTemplates) { - super(constants, resources, messages, applicationTemplates); + CommonApplicationTemplates applicationTemplates, + DynamicMessages dynamicMessages) { + super(constants, resources, messages, applicationTemplates, dynamicMessages); } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/template/TemplateNewPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/template/TemplateNewPopupWidget.java index e268802..1d163af 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/template/TemplateNewPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/template/TemplateNewPopupWidget.java @@ -7,6 +7,7 @@ import org.ovirt.engine.ui.common.CommonApplicationResources; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.widget.uicommon.popup.AbstractVmPopupWidget; import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfigMap; @@ -21,8 +22,9 @@ public TemplateNewPopupWidget(CommonApplicationConstants constants, CommonApplicationResources resources, CommonApplicationMessages messages, - CommonApplicationTemplates applicationTemplates) { - super(constants, resources, messages, applicationTemplates); + CommonApplicationTemplates applicationTemplates, + DynamicMessages dynamicMessages) { + super(constants, resources, messages, applicationTemplates, dynamicMessages); } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmClonePopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmClonePopupWidget.java index d55e684..b73f567 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmClonePopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmClonePopupWidget.java @@ -8,6 +8,7 @@ import org.ovirt.engine.ui.common.CommonApplicationResources; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.widget.uicommon.popup.AbstractVmPopupWidget; import com.google.gwt.core.client.GWT; @@ -21,8 +22,9 @@ public VmClonePopupWidget(CommonApplicationConstants constants, CommonApplicationResources resources, CommonApplicationMessages messages, - CommonApplicationTemplates applicationTemplates) { - super(constants, resources, messages, applicationTemplates); + CommonApplicationTemplates applicationTemplates, + DynamicMessages dynamicMessages) { + super(constants, resources, messages, applicationTemplates, dynamicMessages); } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmPopupWidget.java index f1744d4..50a856a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmPopupWidget.java @@ -7,6 +7,7 @@ import org.ovirt.engine.ui.common.CommonApplicationResources; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.widget.uicommon.popup.AbstractVmPopupWidget; import org.ovirt.engine.ui.uicommonweb.models.vms.UnitVmModel; @@ -21,8 +22,9 @@ public VmPopupWidget(CommonApplicationConstants constants, CommonApplicationResources resources, CommonApplicationMessages messages, - CommonApplicationTemplates applicationTemplates) { - super(constants, resources, messages, applicationTemplates); + CommonApplicationTemplates applicationTemplates, + DynamicMessages dynamicMessages) { + super(constants, resources, messages, applicationTemplates, dynamicMessages); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index c9f19b8..61620e0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -2330,7 +2330,7 @@ || (getSelectedItem() != null && getSelectedItems() != null && getSelectedItems().size() == 1)); getConsoleConnectCommand().setIsExecutionAllowed(isConsoleCommandsExecutionAllowed()); - getEditConsoleCommand().setIsExecutionAllowed(isConsoleEditEnabled()); + getEditConsoleCommand().setIsExecutionAllowed(true); } private boolean isConsoleEditEnabled() { diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/template/TemplateNewPopupView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/template/TemplateNewPopupView.java index 0d4b67f..4ed6b4e 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/template/TemplateNewPopupView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/template/TemplateNewPopupView.java @@ -1,10 +1,12 @@ package org.ovirt.engine.ui.userportal.section.main.view.popup.template; -import static org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfig.hiddenField; - +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.view.popup.AbstractVmPopupView; import org.ovirt.engine.ui.common.widget.uicommon.popup.template.TemplateNewPopupWidget; import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfigMap; @@ -12,9 +14,8 @@ import org.ovirt.engine.ui.userportal.ApplicationResources; import org.ovirt.engine.ui.userportal.section.main.presenter.popup.template.TemplateNewPopupPresenterWidget; -import com.google.gwt.core.client.GWT; -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; + +import static org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfig.hiddenField; public class TemplateNewPopupView extends AbstractVmPopupView implements TemplateNewPopupPresenterWidget.ViewDef { @@ -23,8 +24,8 @@ } @Inject - public TemplateNewPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates applicationTemplates) { - super(eventBus, resources, new TemplateNewPopupWidget(constants, resources, messages, applicationTemplates){ + public TemplateNewPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates applicationTemplates, DynamicMessages dynamicMessages) { + super(eventBus, resources, new TemplateNewPopupWidget(constants, resources, messages, applicationTemplates, dynamicMessages){ @Override protected PopupWidgetConfigMap createWidgetConfiguration() { return super.createWidgetConfiguration().update(hostTab, hiddenField()); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmClonePopupView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmClonePopupView.java index 3341c6b..6104b32 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmClonePopupView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmClonePopupView.java @@ -3,6 +3,7 @@ import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.view.popup.AbstractVmPopupView; import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.VmClonePopupWidget; import org.ovirt.engine.ui.userportal.ApplicationConstants; @@ -20,8 +21,8 @@ } @Inject - public VmClonePopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates) { - super(eventBus, resources, new VmClonePopupWidget(constants, resources, messages, templates)); + public VmClonePopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates, DynamicMessages dynamicMessages) { + super(eventBus, resources, new VmClonePopupWidget(constants, resources, messages, templates, dynamicMessages)); ViewIdHandler.idHandler.generateAndSetIds(this); } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmPopupView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmPopupView.java index 0c83f9c..303d00a 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmPopupView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmPopupView.java @@ -6,6 +6,7 @@ import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.view.popup.AbstractVmPopupView; import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfigMap; import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.VmPopupWidget; @@ -21,8 +22,8 @@ } @Inject - public VmPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates applicationTemplates) { - super(eventBus, resources, new VmPopupWidget(constants, resources, messages, applicationTemplates) { + public VmPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates applicationTemplates, DynamicMessages dynamicMessages) { + super(eventBus, resources, new VmPopupWidget(constants, resources, messages, applicationTemplates, dynamicMessages) { @Override protected PopupWidgetConfigMap createWidgetConfiguration() { return super.createWidgetConfiguration().update(hostTab, hiddenField()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/pool/PoolEditPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/pool/PoolEditPopupView.java index 5b865ef..b7cc7e2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/pool/PoolEditPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/pool/PoolEditPopupView.java @@ -3,6 +3,7 @@ import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.view.popup.AbstractVmPopupView; import org.ovirt.engine.ui.common.widget.uicommon.popup.pool.PoolEditPopupWidget; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -20,8 +21,8 @@ } @Inject - public PoolEditPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates) { - super(eventBus, resources, new PoolEditPopupWidget(constants, resources, messages, templates), "710px", "570px"); //$NON-NLS-1$ //$NON-NLS-2$ + public PoolEditPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates, DynamicMessages dynamicMessages) { + super(eventBus, resources, new PoolEditPopupWidget(constants, resources, messages, templates, dynamicMessages), "710px", "570px"); //$NON-NLS-1$ //$NON-NLS-2$ ViewIdHandler.idHandler.generateAndSetIds(this); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/pool/PoolNewPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/pool/PoolNewPopupView.java index 2a7c06c..a6ab73e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/pool/PoolNewPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/pool/PoolNewPopupView.java @@ -3,6 +3,7 @@ import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.view.popup.AbstractVmPopupView; import org.ovirt.engine.ui.common.widget.uicommon.popup.pool.PoolNewPopupWidget; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -20,8 +21,8 @@ } @Inject - public PoolNewPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates) { - super(eventBus, resources, new PoolNewPopupWidget(constants, resources, messages, templates), "670px", "565px"); //$NON-NLS-1$ //$NON-NLS-2$ + public PoolNewPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates, DynamicMessages dynamicMessages) { + super(eventBus, resources, new PoolNewPopupWidget(constants, resources, messages, templates, dynamicMessages), "670px", "565px"); //$NON-NLS-1$ //$NON-NLS-2$ ViewIdHandler.idHandler.generateAndSetIds(this); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/template/TemplateNewPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/template/TemplateNewPopupView.java index 46d2dc9..4e72cae 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/template/TemplateNewPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/template/TemplateNewPopupView.java @@ -3,6 +3,7 @@ import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.view.popup.AbstractVmPopupView; import org.ovirt.engine.ui.common.widget.uicommon.popup.template.TemplateNewPopupWidget; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -20,8 +21,8 @@ } @Inject - public TemplateNewPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates) { - super(eventBus, resources, new TemplateNewPopupWidget(constants, resources, messages, templates)); + public TemplateNewPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates, DynamicMessages dynamicMessages) { + super(eventBus, resources, new TemplateNewPopupWidget(constants, resources, messages, templates, dynamicMessages)); ViewIdHandler.idHandler.generateAndSetIds(this); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmClonePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmClonePopupView.java index 04f5987..ae5d1e4 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmClonePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmClonePopupView.java @@ -3,6 +3,7 @@ import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.view.popup.AbstractVmPopupView; import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.VmClonePopupWidget; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -20,8 +21,8 @@ } @Inject - public VmClonePopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates) { - super(eventBus, resources, new VmClonePopupWidget(constants, resources, messages, templates)); + public VmClonePopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates, DynamicMessages dynamicMessages) { + super(eventBus, resources, new VmClonePopupWidget(constants, resources, messages, templates, dynamicMessages)); ViewIdHandler.idHandler.generateAndSetIds(this); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmPopupView.java index a2735dd..c3aaad5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmPopupView.java @@ -3,6 +3,7 @@ import org.ovirt.engine.ui.common.CommonApplicationMessages; import org.ovirt.engine.ui.common.CommonApplicationTemplates; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; +import org.ovirt.engine.ui.common.utils.DynamicMessages; import org.ovirt.engine.ui.common.view.popup.AbstractVmPopupView; import org.ovirt.engine.ui.common.widget.uicommon.popup.vm.VmPopupWidget; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -20,8 +21,8 @@ } @Inject - public VmPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates) { - super(eventBus, resources, new VmPopupWidget(constants, resources, messages, templates)); + public VmPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, CommonApplicationMessages messages, CommonApplicationTemplates templates, DynamicMessages dynamicMessages) { + super(eventBus, resources, new VmPopupWidget(constants, resources, messages, templates, dynamicMessages)); ViewIdHandler.idHandler.generateAndSetIds(this); } diff --git a/packaging/branding/ovirt.brand/messages.properties b/packaging/branding/ovirt.brand/messages.properties index 52c0c97..0bd0a75 100644 --- a/packaging/branding/ovirt.brand/messages.properties +++ b/packaging/branding/ovirt.brand/messages.properties @@ -12,6 +12,8 @@ obrand.common.copy_right_notice= # The text above the version in the about box. obrand.common.version_about=oVirt Engine Version: {0} +# Console Client Resources URL +obrand.common.console_client_resources_url=http://www.ovirt.org/Console_Client_Resources # User portal specific messages that can be over written. -- To view, visit http://gerrit.ovirt.org/18596 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f7316e6ce5032123edc2e39b4939d0c8dab1cb1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
