Kanagaraj M has uploaded a new change for review. Change subject: webadmin: fix feedback image visiblity issue ......................................................................
webadmin: fix feedback image visiblity issue 'Feedback' section in the right-top will be hidden if there is no feedback-url is available. But that sections a collection images and text, not all of the were hidden when no feedback-url supplied. This is fixed by making the whole feedback panel invisible if there is no feedback-url available. Change-Id: I08c673909ba2a1c13e6bcac70a3ff19a99a1e6a3 Signed-off-by: Kanagaraj M <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.ui.xml 3 files changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/21084/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java index 34616ac..6eb3bc3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java @@ -12,7 +12,6 @@ import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.shared.EventBus; import com.google.gwt.event.shared.GwtEvent.Type; -import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.gwtplatform.mvp.client.annotations.ContentSlot; @@ -27,7 +26,9 @@ HasClickHandlers getAboutLink(); - Label getFeedbackLabel(); + HasClickHandlers getFeedbackLink(); + + void setFeedbackText(String feedbackText); } @ContentSlot @@ -87,14 +88,13 @@ })); if (feedbackUrl != null && feedbackUrl.length() > 0) { - getView().getFeedbackLabel().setText(feedbackLinkLabel); - registerHandler(getView().getFeedbackLabel().addClickHandler(new ClickHandler() { + getView().setFeedbackText(feedbackLinkLabel); + registerHandler(getView().getFeedbackLink().addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { WebUtils.openUrlInNewWindow(feedbackLinkLabel, feedbackUrl); } })); - getView().getFeedbackLabel().setVisible(true); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java index 79eb922..1276718 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java @@ -70,6 +70,9 @@ FlowPanel mainTabContainer; @UiField + HTMLPanel feedbackImagePanel; + + @UiField Label feedbackImageLabel; @Inject @@ -87,7 +90,7 @@ setMainTabBarOffset(mainTabBarInitialOffset); localize(dynamicMessages); - feedbackImageLabel.setVisible(false); + feedbackImagePanel.setVisible(false); } private void localize(ApplicationDynamicMessages dynamicMessages) { @@ -146,8 +149,14 @@ } @Override - public Label getFeedbackLabel() { + public HasClickHandlers getFeedbackLink() { return feedbackImageLabel; } + @Override + public void setFeedbackText(String feedbackText) { + feedbackImagePanel.setVisible(true); + feedbackImageLabel.setText(feedbackText); + } + } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.ui.xml index f075dae..e895ff2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.ui.xml @@ -84,7 +84,7 @@ <g:HTML addStyleNames="{style.obrand_logo}" /> <g:Label ui:field="headerLabel" addStyleNames="{style.headerLabelStyle}"/> - <g:HTMLPanel addStyleNames="{style.feedbackImagePanel}"> + <g:HTMLPanel ui:field="feedbackImagePanel" addStyleNames="{style.feedbackImagePanel}"> <g:HTMLPanel addStyleNames="{style.obrand_feedbackImageLeft}" /> <g:Label ui:field="feedbackImageLabel" addStyleNames="{style.obrand_feedbackImageLabel}" /> </g:HTMLPanel> -- To view, visit http://gerrit.ovirt.org/21084 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08c673909ba2a1c13e6bcac70a3ff19a99a1e6a3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
