Daniel Erez has uploaded a new change for review. Change subject: webadmin: LoginPopupView - construct form as table ......................................................................
webadmin: LoginPopupView - construct form as table Construct login form as a table of two columns: labels and editors. I.e. labels column is auto expandable (required for localization). Change-Id: I346a858bcd26868cc2eb77c832cc553f415cb928 Bug-Url: https://bugzilla.redhat.com/867428 Signed-off-by: Daniel Erez <de...@redhat.com> --- M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.ui.xml 4 files changed, 71 insertions(+), 56 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/9153/1 diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.java index 2951653..e1d5ca6 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.java @@ -20,6 +20,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.editor.client.SimpleBeanEditorDriver; +import com.google.gwt.editor.client.Editor.Ignore; import com.google.gwt.event.shared.EventBus; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -63,6 +64,18 @@ @Path("domain.selectedItem") @WithElementId("domain") ListModelListBoxEditor<Object> domainEditor; + + @UiField + @Ignore + Label userNameLabel; + + @UiField + @Ignore + Label passwordLabel; + + @UiField + @Ignore + Label domainLabel; @UiField @WithElementId @@ -114,9 +127,9 @@ void localize(ApplicationConstants constants) { headerLabel.setText(constants.loginHeaderLabel()); - userNameEditor.setLabel(constants.loginFormUserNameLabel()); - passwordEditor.setLabel(constants.loginFormPasswordLabel()); - domainEditor.setLabel(constants.loginFormDomainLabel()); + userNameLabel.setText(constants.loginFormUserNameLabel()); + passwordLabel.setText(constants.loginFormPasswordLabel()); + domainLabel.setText(constants.loginFormDomainLabel()); connectAutomatically.setLabel(constants.loginFormConnectAutomaticallyLabel()); loginButton.setLabel(constants.loginButtonLabel()); } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.ui.xml b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.ui.xml index aa30089..f8b4716 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.ui.xml +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/view/LoginPopupView.ui.xml @@ -11,26 +11,23 @@ padding-top: 40px; background-color: #FFFFFF; height: 100%; - text-align: center; } .loginFormTable { - width: 88%; margin: auto; } - .formTextBox { + .formWidget { color: #333333; - font-size: 11px; + font-size: 13px; + padding: 0 5px; + font-family: Verdana,sans-serif; + line-height: 30px; + text-align: left; } .localizationLabel { font-size: 11px; - } - - .formRow { - height: 40px; - color: #333333; } .errorMessagePanel { @@ -47,7 +44,7 @@ } .buttonBar { - padding-top: 10px; + padding-bottom: 10px; } .button { @@ -126,28 +123,25 @@ <d:content> <g:HTMLPanel addStyleNames="{style.loginForm}"> <table class="{style.loginFormTable}"> - <tr class="formRow"> - <td class="{style.formTextBox}"> - <e:EntityModelTextBoxEditor ui:field="userNameEditor" /> + <tr> + <td> + <g:Label ui:field="userNameLabel" addStyleNames="{style.formWidget}" /> + <g:Label ui:field="passwordLabel" addStyleNames="{style.formWidget}" /> + <g:Label ui:field="domainLabel" addStyleNames="{style.formWidget}" /> </td> - </tr> - <tr class="formRow"> - <td class="{style.formTextBox}"> - <e:EntityModelPasswordBoxEditor ui:field="passwordEditor" /> - </td> - </tr> - <tr class="formRow"> - <td class="{style.formTextBox}"> - <e:ListModelListBoxEditor ui:field="domainEditor" /> - </td> - </tr> - <tr class="formRow"> <td> + <e:EntityModelTextBoxEditor ui:field="userNameEditor" addStyleNames="{style.formWidget}" /> + <e:EntityModelPasswordBoxEditor ui:field="passwordEditor" addStyleNames="{style.formWidget}" /> + <e:ListModelListBoxEditor ui:field="domainEditor" addStyleNames="{style.formWidget}" /> + </td> + </tr> + <tr> + <td colspan="2"> <e:EntityModelCheckBoxEditor ui:field="connectAutomatically" /> </td> </tr> - <tr class="formRow"> - <td height="20"> + <tr> + <td height="20" colspan="2"> <g:HTMLPanel addStyleNames="{style.buttonBar}"> <w:UiCommandButton ui:field="loginButton" addStyleNames="{style.button}" /> <div style="clear: both;" /> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.java index 9b33830..9727a51 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.java @@ -63,6 +63,18 @@ ListModelListBoxEditor<Object> domainEditor; @UiField + @Ignore + Label userNameLabel; + + @UiField + @Ignore + Label passwordLabel; + + @UiField + @Ignore + Label domainLabel; + + @UiField @WithElementId UiCommandButton loginButton; @@ -114,9 +126,9 @@ private void localize(ApplicationConstants constants) { headerLabel.setText(constants.loginHeaderLabel()); - userNameEditor.setLabel(constants.loginFormUserNameLabel()); - passwordEditor.setLabel(constants.loginFormPasswordLabel()); - domainEditor.setLabel(constants.loginFormDomainLabel()); + userNameLabel.setText(constants.loginFormUserNameLabel()); + passwordLabel.setText(constants.loginFormPasswordLabel()); + domainLabel.setText(constants.loginFormDomainLabel()); loginButton.setLabel(constants.loginButtonLabel()); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.ui.xml index c1f65af..be97fd0 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/view/LoginPopupView.ui.xml @@ -11,22 +11,19 @@ padding-top: 40px; background-color: #FFFFFF; height: 100%; - text-align: center; } .loginFormTable { - width: 88%; margin: auto; } - .formTextBox { + .formWidget { color: #333333; - font-size: 11px; - } - - .formRow { - height: 40px; - color: #333333; + font-size: 13px; + padding: 0 5px; + font-family: Verdana,sans-serif; + line-height: 30px; + text-align: left; } .errorMessagePanel { @@ -44,6 +41,7 @@ .buttonBar { padding-top: 10px; + padding-bottom: 10px; } .button { @@ -122,22 +120,20 @@ <d:content> <g:HTMLPanel addStyleNames="{style.loginForm}"> <table class="{style.loginFormTable}"> - <tr class="formRow"> - <td class="{style.formTextBox}"> - <e:EntityModelTextBoxEditor ui:field="userNameEditor" /> + <tr> + <td> + <g:Label ui:field="userNameLabel" addStyleNames="{style.formWidget}" /> + <g:Label ui:field="passwordLabel" addStyleNames="{style.formWidget}" /> + <g:Label ui:field="domainLabel" addStyleNames="{style.formWidget}" /> + </td> + <td> + <e:EntityModelTextBoxEditor ui:field="userNameEditor" addStyleNames="{style.formWidget}" /> + <e:EntityModelPasswordBoxEditor ui:field="passwordEditor" addStyleNames="{style.formWidget}" /> + <e:ListModelListBoxEditor ui:field="domainEditor" addStyleNames="{style.formWidget}" /> </td> </tr> - <tr class="formRow"> - <td class="{style.formTextBox}"> - <e:EntityModelPasswordBoxEditor ui:field="passwordEditor" /> - </td> - </tr> - <tr class="formRow"> - <td class="{style.formTextBox}"> - <e:ListModelListBoxEditor ui:field="domainEditor" /> - </td> - </tr> - <tr class="formRow"> + <tr> + <td /> <td height="20"> <g:HTMLPanel addStyleNames="{style.buttonBar}"> <w:UiCommandButton ui:field="loginButton" addStyleNames="{style.button}" /> -- To view, visit http://gerrit.ovirt.org/9153 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I346a858bcd26868cc2eb77c832cc553f415cb928 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
