Daniel Erez has uploaded a new change for review. Change subject: webadmin: replace login target button with an image ......................................................................
webadmin: replace login target button with an image New/Edit storage domain: replacing login target button with an image (preventing truncation in various translations). Change-Id: I0dee7a0bb923f18ec5eb6370ffea9f5ff6c78f92 Bug-Url: https://bugzilla.redhat.com/927504 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/AbstractSanStorageList.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageTargetToLunList.java A frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/login.png A frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/login_disabled.png M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanTargetModel.java 6 files changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/14500/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java index 118a122..98de4d9 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java @@ -208,6 +208,12 @@ @Source("images/vms.png") ImageResource vmsImage(); + @Source("images/login.png") + ImageResource loginIcon(); + + @Source("images/login_disabled.png") + ImageResource loginDisabledIcon(); + // Network @Source("images/network/icn_plugged.png") ImageResource pluggedNetworkImage(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/AbstractSanStorageList.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/AbstractSanStorageList.java index 5f3d8e7..7ff218b 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/AbstractSanStorageList.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/AbstractSanStorageList.java @@ -6,6 +6,7 @@ import org.ovirt.engine.core.common.businessentities.LUNs; 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.widget.editor.EntityModelCellTable; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; @@ -52,6 +53,7 @@ protected static final CommonApplicationConstants constants = GWT.create(CommonApplicationConstants.class); protected static final CommonApplicationMessages messages = GWT.create(CommonApplicationMessages.class); + protected static final CommonApplicationResources resources = GWT.create(CommonApplicationResources.class); public AbstractSanStorageList(SanStorageModelBase model) { this(model, false, false); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageTargetToLunList.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageTargetToLunList.java index ec347b7..ee2601d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageTargetToLunList.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/SanStorageTargetToLunList.java @@ -104,7 +104,7 @@ public String getValue(SanTargetModel model) { return ""; //$NON-NLS-1$ } - }, constants.empty(), "70px"); //$NON-NLS-1$ + }, constants.empty(), "35px"); //$NON-NLS-1$ table.addColumn(new TextColumn<SanTargetModel>() { @Override public String getValue(SanTargetModel model) { @@ -123,7 +123,9 @@ private void addLoginButton(HorizontalPanel panel, SanTargetModel rootModel) { final UiCommandButton loginButton = new UiCommandButton(); loginButton.setCommand(rootModel.getLoginCommand()); - loginButton.setLabel(constants.storageIscsiPopupLoginButtonLabel()); + loginButton.setTitle(constants.storageIscsiPopupLoginButtonLabel()); + loginButton.setImage(rootModel.getLoginCommand().getIsExecutionAllowed() ? + resources.loginIcon() : resources.loginDisabledIcon()); loginButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { @@ -133,9 +135,10 @@ }); loginButton.getElement().getStyle().setFloat(Float.RIGHT); loginButton.getElement().getStyle().setMarginRight(2, Unit.PX); + loginButton.getElement().getStyle().setProperty("lineHeight", "18px"); //$NON-NLS-1$ //$NON-NLS-2$ panel.add(loginButton); - panel.setCellWidth(loginButton, "60px"); //$NON-NLS-1$ + panel.setCellWidth(loginButton, "30px"); //$NON-NLS-1$ } private void additemToRootNodePanel(HorizontalPanel panel, diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/login.png b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/login.png new file mode 100644 index 0000000..2d5cf79 --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/login.png Binary files differ diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/login_disabled.png b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/login_disabled.png new file mode 100644 index 0000000..2d376a7 --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/login_disabled.png Binary files differ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanTargetModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanTargetModel.java index e93e741..bb8fb70 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanTargetModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/SanTargetModel.java @@ -145,7 +145,7 @@ public SanTargetModel() { setLoggedInEvent(new Event(LoggedInEventDefinition)); - setLoginCommand(new UICommand("Login", this)); //$NON-NLS-1$ + setLoginCommand(new UICommand("", this)); //$NON-NLS-1$ setLunsList(new ListModel()); } -- To view, visit http://gerrit.ovirt.org/14500 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0dee7a0bb923f18ec5eb6370ffea9f5ff6c78f92 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
