Greg Sheremeta has uploaded a new change for review. Change subject: webadmin: cleaned up whitespace ......................................................................
webadmin: cleaned up whitespace cleanup whitepace Change-Id: I0ffd4c9a372c4c1d468b7f419e5217f2571de416 Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml 3 files changed, 241 insertions(+), 241 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/28197/1 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 d5f19b0..75b56dc 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 @@ -180,14 +180,14 @@ float: left; } - .expanderContent,.generalExpanderContent { - padding-left: 10px; - } - - .monitorsStyles { - width: 40px; - padding-left: 5px; - } + .expanderContent,.generalExpanderContent { + padding-left: 10px; + } + + .monitorsStyles { + width: 40px; + padding-left: 5px; + } .monitorsStyles { width: 40px; @@ -690,9 +690,9 @@ </t:DialogTab> </t:tab> <t:tab> - <t:DialogTab ui:field="rngDeviceTab"> - <t:content> - <g:FlowPanel> + <t:DialogTab ui:field="rngDeviceTab"> + <t:content> + <g:FlowPanel> <w:EntityModelWidgetWithInfo ui:field="isRngEnabledCheckboxWithInfoIcon" addStyleNames="{style.checkbox}" /> <g:FlowPanel ui:field="rngPanel"> <ge:IntegerEntityModelTextBoxEditor ui:field="rngPeriodEditor"/> @@ -703,8 +703,8 @@ </g:FlowPanel> </g:FlowPanel> </t:content> - </t:DialogTab> - </t:tab> + </t:DialogTab> + </t:tab> <t:tab> <t:DialogTab ui:field="customPropertiesTab"> <t:content> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.ui.xml index 5040abc..442e912 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.ui.xml @@ -1,78 +1,78 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui" - xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog" xmlns:ge="urn:import:org.ovirt.engine.ui.common.widget.editor.generic" - xmlns:we="urn:import:org.ovirt.engine.ui.webadmin.widget.editor"> + xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog" xmlns:ge="urn:import:org.ovirt.engine.ui.common.widget.editor.generic" + xmlns:we="urn:import:org.ovirt.engine.ui.webadmin.widget.editor"> - <ui:style> - .titleLabel { - padding-top: 5px; - } + <ui:style> + .titleLabel { + padding-top: 5px; + } - .explanationLabel { - padding-top: 5px; - padding-left: 5px; - padding-bottom: 5px; - } + .explanationLabel { + padding-top: 5px; + padding-left: 5px; + padding-bottom: 5px; + } - .treePanel { - margin-top: 5px; - } + .treePanel { + margin-top: 5px; + } - .buttonPanel { - padding-left: 5px; - vertical-align: middle; - } + .buttonPanel { + padding-left: 5px; + vertical-align: middle; + } - .radioButton { - vertical-align: middle; - } + .radioButton { + vertical-align: middle; + } - .radioButton label { - vertical-align: middle; - position: relative; - padding-bottom: 7px; - padding-left: 1px; - padding-right: 2px; - } + .radioButton label { + vertical-align: middle; + position: relative; + padding-bottom: 7px; + padding-left: 1px; + padding-right: 2px; + } - .label { - color: #FFFFFF; - font-size: 12px; - font-weight: bold; - font-family: Arial,sans-serif; - line-height: 30px; - } + .label { + color: #FFFFFF; + font-size: 12px; + font-weight: bold; + font-family: Arial,sans-serif; + line-height: 30px; + } - .nameEditor { - width: 290px; - } + .nameEditor { + width: 290px; + } - .descriptionEditor { - position: absolute; - right: 2px; - width: 325px; - } - </ui:style> + .descriptionEditor { + position: absolute; + right: 2px; + width: 325px; + } + </ui:style> - <d:SimpleDialogPanel width="650px" height="500px"> - <d:content> - <g:VerticalPanel> - <g:FlowPanel> - <g:HorizontalPanel> - <ge:StringEntityModelTextBoxEditor ui:field="nameEditor" addStyleNames="{style.nameEditor}"/> - <ge:StringEntityModelTextBoxEditor ui:field="descriptionEditor" addStyleNames="{style.descriptionEditor}"/> - </g:HorizontalPanel> - <g:HorizontalPanel addStyleNames="{style.buttonPanel}"> - <g:Label ui:field="accountTypeLabel" addStyleNames="{style.titleLabel}"/> - <g:RadioButton name="accountTypeRadioButton" ui:field="userRadioButtonEditor" addStyleNames="{style.radioButton}"/> - <g:RadioButton name="accountTypeRadioButton" ui:field="adminRadioButtonEditor" addStyleNames="{style.radioButton}"/> - </g:HorizontalPanel> - <g:HTML><hr style="width:100%;" /></g:HTML> - <g:Label ui:field="explainationLabel" addStyleNames="{style.explanationLabel}"/> + <d:SimpleDialogPanel width="650px" height="500px"> + <d:content> + <g:VerticalPanel> + <g:FlowPanel> + <g:HorizontalPanel> + <ge:StringEntityModelTextBoxEditor ui:field="nameEditor" addStyleNames="{style.nameEditor}"/> + <ge:StringEntityModelTextBoxEditor ui:field="descriptionEditor" addStyleNames="{style.descriptionEditor}"/> + </g:HorizontalPanel> + <g:HorizontalPanel addStyleNames="{style.buttonPanel}"> + <g:Label ui:field="accountTypeLabel" addStyleNames="{style.titleLabel}"/> + <g:RadioButton name="accountTypeRadioButton" ui:field="userRadioButtonEditor" addStyleNames="{style.radioButton}"/> + <g:RadioButton name="accountTypeRadioButton" ui:field="adminRadioButtonEditor" addStyleNames="{style.radioButton}"/> + </g:HorizontalPanel> + <g:HTML><hr style="width:100%;" /></g:HTML> + <g:Label ui:field="explainationLabel" addStyleNames="{style.explanationLabel}"/> <g:HorizontalPanel addStyleNames="{style.buttonPanel}"> <g:Button ui:field="expandAllButton"/> - <g:Button ui:field="collapseAllButton"/> + <g:Button ui:field="collapseAllButton"/> </g:HorizontalPanel> <g:ScrollPanel height="300px" addStyleNames="{style.treePanel} rpv_treePanel_pfly_fix"> <we:EntityModelCellTree ui:field="tree"/> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml index ef6c295..91af71f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml @@ -1,173 +1,173 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" - xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog" - xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor" xmlns:we="urn:import:org.ovirt.engine.ui.webadmin.widget.editor" + xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:d="urn:import:org.ovirt.engine.ui.common.widget.dialog" + xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor" xmlns:we="urn:import:org.ovirt.engine.ui.webadmin.widget.editor" xmlns:ge="urn:import:org.ovirt.engine.ui.common.widget.editor.generic" - xmlns:p="urn:import:org.ovirt.engine.ui.webadmin.section.main.view.popup.scheduling.panels" - xmlns:k="urn:import:org.ovirt.engine.ui.common.widget.form.key_value"> + xmlns:p="urn:import:org.ovirt.engine.ui.webadmin.section.main.view.popup.scheduling.panels" + xmlns:k="urn:import:org.ovirt.engine.ui.common.widget.form.key_value"> - <ui:with field='constants' - type='org.ovirt.engine.ui.webadmin.ApplicationConstants' /> - <ui:style - type="org.ovirt.engine.ui.webadmin.section.main.view.popup.scheduling.ClusterPolicyPopupView.WidgetStyle"> - .sectionLabel { - font-weight: bold; - font-size: 15px; - margin-top: 2px; - margin-bottom: 1px; - margin-left: 5px; - width: 100%; - } - .labelStyle { - font-size: 11px; - margin-left: 10px; - line-height: 25px; - } - .panelHeaderLabelStyle { - margin-left: 30%; - } - .policyListPanel{ - background-color: - #F6F6F6; - width: 97%; - height: 100px; - margin: 5px 5px 5px - 5px; - } - .separator { - background-color: #CED8DF; - width: 100%; - height: 100%; - } - .unusedPolicyUnitStyle { - height: 20px; - width: 94%; - background-color: - white; - border: 1px solid - black; - margin: 4px; - cursor: move; - } - .unusedPolicyUnitStyle:HOVER { - box-shadow: 1px 1px 1px 1px rgba(33, 33, 33, 0.3); - cursor: move; - } - .usedFilterPolicyUnitStyle { - height: 20px; - width: 240px; - background-color: #CED8DF; - border: 1px - solid - black; - margin: 4px; - cursor: move; - } - .usedFilterPolicyUnitStyle:HOVER { - box-shadow: 1px 1px 1px 1px rgba(33, 33, 33, 0.3); - } - .positionLabelStyle { - height: - 20px; - width: 52px; - margin: 4px; - } - .iconInfoStyle { - margin-left: 10px; - } - .externalLabel { - line-height: 30px; - font-weight: bold; - } - </ui:style> + <ui:with field='constants' + type='org.ovirt.engine.ui.webadmin.ApplicationConstants' /> + <ui:style + type="org.ovirt.engine.ui.webadmin.section.main.view.popup.scheduling.ClusterPolicyPopupView.WidgetStyle"> + .sectionLabel { + font-weight: bold; + font-size: 15px; + margin-top: 2px; + margin-bottom: 1px; + margin-left: 5px; + width: 100%; + } + .labelStyle { + font-size: 11px; + margin-left: 10px; + line-height: 25px; + } + .panelHeaderLabelStyle { + margin-left: 30%; + } + .policyListPanel{ + background-color: + #F6F6F6; + width: 97%; + height: 100px; + margin: 5px 5px 5px + 5px; + } + .separator { + background-color: #CED8DF; + width: 100%; + height: 100%; + } + .unusedPolicyUnitStyle { + height: 20px; + width: 94%; + background-color: + white; + border: 1px solid + black; + margin: 4px; + cursor: move; + } + .unusedPolicyUnitStyle:HOVER { + box-shadow: 1px 1px 1px 1px rgba(33, 33, 33, 0.3); + cursor: move; + } + .usedFilterPolicyUnitStyle { + height: 20px; + width: 240px; + background-color: #CED8DF; + border: 1px + solid + black; + margin: 4px; + cursor: move; + } + .usedFilterPolicyUnitStyle:HOVER { + box-shadow: 1px 1px 1px 1px rgba(33, 33, 33, 0.3); + } + .positionLabelStyle { + height: + 20px; + width: 52px; + margin: 4px; + } + .iconInfoStyle { + margin-left: 10px; + } + .externalLabel { + line-height: 30px; + font-weight: bold; + } + </ui:style> - <d:SimpleDialogPanel width="700px" height="650px"> - <d:content> - <g:VerticalPanel> - <g:FlowPanel> - <g:HorizontalPanel> - <ge:StringEntityModelTextBoxEditor ui:field="nameEditor" /> - <ge:StringEntityModelTextBoxEditor ui:field="descriptionEditor" /> - </g:HorizontalPanel> - <g:HorizontalPanel> - <g:Label addStyleNames="{style.sectionLabel}" - text="{constants.clusterPolicyFilterLabel}" /> - <g:Label addStyleNames="{style.labelStyle}" - text="{constants.clusterPolicyExplanationMessage}" /> - <d:InfoIcon ui:field="filterInfoIcon" addStyleNames="{style.iconInfoStyle}"/> - </g:HorizontalPanel> - <g:HTML> - <hr style="width:100%;" /> - </g:HTML> - <g:HorizontalPanel height="100px" width="100%"> - <g:Cell width="50%" height="100%"> - <g:VerticalPanel width="100%" height="100%"> - <g:Label addStyleNames="{style.panelHeaderLabelStyle}" - text="{constants.enabledFilters}" /> - <p:PolicyUnitListPanel ui:field="usedFilterPanel" - styleName="{style.policyListPanel}" /> - </g:VerticalPanel> - </g:Cell> - <g:Cell width="1%" height="100%"> - <g:HTMLPanel styleName="{style.separator}"> - </g:HTMLPanel> - </g:Cell> - <g:Cell width="50%" height="100%"> - <g:VerticalPanel width="100%" height="100%"> - <g:Label addStyleNames="{style.panelHeaderLabelStyle}" - text="{constants.disabledFilters}" /> - <p:PolicyUnitListPanel ui:field="unusedFilterPanel" - styleName="{style.policyListPanel}" /> - </g:VerticalPanel> - </g:Cell> - </g:HorizontalPanel> - <g:HorizontalPanel> - <g:Label addStyleNames="{style.sectionLabel}" - text="{constants.clusterPolicyFunctionLabel}" /> - <g:Label addStyleNames="{style.labelStyle}" - text="{constants.clusterPolicyExplanationMessage}" /> - <d:InfoIcon ui:field="functionInfoIcon" addStyleNames="{style.iconInfoStyle}"/> - </g:HorizontalPanel> - <g:HTML> - <hr style="width:100%;" /> - </g:HTML> - <g:HorizontalPanel height="100px" width="100%"> - <g:Cell width="50%" height="100%"> - <g:VerticalPanel width="100%" height="100%"> - <g:Label addStyleNames="{style.panelHeaderLabelStyle}" - text="{constants.enabledFunctions}" /> - <p:PolicyUnitListPanel ui:field="usedFunctionPanel" - styleName="{style.policyListPanel}" /> - </g:VerticalPanel> - </g:Cell> - <g:Cell width="1%" height="100%"> - <g:HTMLPanel styleName="{style.separator}"> - </g:HTMLPanel> - </g:Cell> - <g:Cell width="50%" height="100%"> - <g:VerticalPanel width="100%" height="100%"> - <g:Label addStyleNames="{style.panelHeaderLabelStyle}" - text="{constants.disabledFunctions}" /> - <p:PolicyUnitListPanel ui:field="unusedFunctionPanel" - styleName="{style.policyListPanel}" /> - </g:VerticalPanel> - </g:Cell> - </g:HorizontalPanel> - <g:HorizontalPanel> - <g:Label addStyleNames="{style.sectionLabel}" - text="{constants.clusterPolicyLoadBalancerLabel}" /> - <d:InfoIcon ui:field="loadBalancingInfoIcon" addStyleNames="{style.iconInfoStyle}"/> - </g:HorizontalPanel> - <g:HTML> - <hr style="width:100%;" /> - </g:HTML> - <g:HorizontalPanel> - <e:ListModelListBoxOnlyEditor - ui:field="loadBalanceListEditor" /> - <g:Label ui:field="externalLabel" addStyleNames="{style.externalLabel}"/> - </g:HorizontalPanel> - </g:FlowPanel> + <d:SimpleDialogPanel width="700px" height="650px"> + <d:content> + <g:VerticalPanel> + <g:FlowPanel> + <g:HorizontalPanel> + <ge:StringEntityModelTextBoxEditor ui:field="nameEditor" /> + <ge:StringEntityModelTextBoxEditor ui:field="descriptionEditor" /> + </g:HorizontalPanel> + <g:HorizontalPanel> + <g:Label addStyleNames="{style.sectionLabel}" + text="{constants.clusterPolicyFilterLabel}" /> + <g:Label addStyleNames="{style.labelStyle}" + text="{constants.clusterPolicyExplanationMessage}" /> + <d:InfoIcon ui:field="filterInfoIcon" addStyleNames="{style.iconInfoStyle}"/> + </g:HorizontalPanel> + <g:HTML> + <hr style="width:100%;" /> + </g:HTML> + <g:HorizontalPanel height="100px" width="100%"> + <g:Cell width="50%" height="100%"> + <g:VerticalPanel width="100%" height="100%"> + <g:Label addStyleNames="{style.panelHeaderLabelStyle}" + text="{constants.enabledFilters}" /> + <p:PolicyUnitListPanel ui:field="usedFilterPanel" + styleName="{style.policyListPanel}" /> + </g:VerticalPanel> + </g:Cell> + <g:Cell width="1%" height="100%"> + <g:HTMLPanel styleName="{style.separator}"> + </g:HTMLPanel> + </g:Cell> + <g:Cell width="50%" height="100%"> + <g:VerticalPanel width="100%" height="100%"> + <g:Label addStyleNames="{style.panelHeaderLabelStyle}" + text="{constants.disabledFilters}" /> + <p:PolicyUnitListPanel ui:field="unusedFilterPanel" + styleName="{style.policyListPanel}" /> + </g:VerticalPanel> + </g:Cell> + </g:HorizontalPanel> + <g:HorizontalPanel> + <g:Label addStyleNames="{style.sectionLabel}" + text="{constants.clusterPolicyFunctionLabel}" /> + <g:Label addStyleNames="{style.labelStyle}" + text="{constants.clusterPolicyExplanationMessage}" /> + <d:InfoIcon ui:field="functionInfoIcon" addStyleNames="{style.iconInfoStyle}"/> + </g:HorizontalPanel> + <g:HTML> + <hr style="width:100%;" /> + </g:HTML> + <g:HorizontalPanel height="100px" width="100%"> + <g:Cell width="50%" height="100%"> + <g:VerticalPanel width="100%" height="100%"> + <g:Label addStyleNames="{style.panelHeaderLabelStyle}" + text="{constants.enabledFunctions}" /> + <p:PolicyUnitListPanel ui:field="usedFunctionPanel" + styleName="{style.policyListPanel}" /> + </g:VerticalPanel> + </g:Cell> + <g:Cell width="1%" height="100%"> + <g:HTMLPanel styleName="{style.separator}"> + </g:HTMLPanel> + </g:Cell> + <g:Cell width="50%" height="100%"> + <g:VerticalPanel width="100%" height="100%"> + <g:Label addStyleNames="{style.panelHeaderLabelStyle}" + text="{constants.disabledFunctions}" /> + <p:PolicyUnitListPanel ui:field="unusedFunctionPanel" + styleName="{style.policyListPanel}" /> + </g:VerticalPanel> + </g:Cell> + </g:HorizontalPanel> + <g:HorizontalPanel> + <g:Label addStyleNames="{style.sectionLabel}" + text="{constants.clusterPolicyLoadBalancerLabel}" /> + <d:InfoIcon ui:field="loadBalancingInfoIcon" addStyleNames="{style.iconInfoStyle}"/> + </g:HorizontalPanel> + <g:HTML> + <hr style="width:100%;" /> + </g:HTML> + <g:HorizontalPanel> + <e:ListModelListBoxOnlyEditor + ui:field="loadBalanceListEditor" /> + <g:Label ui:field="externalLabel" addStyleNames="{style.externalLabel}"/> + </g:HorizontalPanel> + </g:FlowPanel> <g:FlowPanel ui:field="clusterPolicyPropertiesZone"> <g:HorizontalPanel> <g:Label addStyleNames="{style.sectionLabel}" @@ -181,8 +181,8 @@ <k:KeyValueWidget ui:field="customPropertiesSheetEditor" /> </g:ScrollPanel> </g:FlowPanel> - </g:VerticalPanel> - </d:content> - </d:SimpleDialogPanel> + </g:VerticalPanel> + </d:content> + </d:SimpleDialogPanel> -</ui:UiBinder> \ No newline at end of file +</ui:UiBinder> -- To view, visit http://gerrit.ovirt.org/28197 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ffd4c9a372c4c1d468b7f419e5217f2571de416 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches