[gnome-initial-setup/wip/152-fix-domain-administrator-login-dialog: 5/5] account: Remove redundant box in enterprise login dialog

[Marge Bot <marge-bot src gnome org>]

commit 721491856f8e9b2d5003937ad73d87c17adc5145
Author: Will Thompson <wjt endlessos org>
Date:   Tue Sep 6 14:48:56 2022 +0100

    account: Remove redundant box in enterprise login dialog
    
    The GtkDialog's own content_area vbox is plenty, no need to nest another
    one within it.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/159>

 .../pages/account/gis-account-page-enterprise.ui   | 226 ++++++++++-----------
 1 file changed, 110 insertions(+), 116 deletions(-)
---
diff --git a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui 
b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui
index c53d8a62..d60e69e7 100644
--- a/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui
+++ b/gnome-initial-setup/pages/account/gis-account-page-enterprise.ui
@@ -127,128 +127,122 @@
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
+        <property name="margin-top">18</property>
+        <property name="margin-bottom">18</property>
+        <property name="margin-start">18</property>
+        <property name="margin-end">18</property>
+        <property name="spacing">10</property>
         <child>
-          <object class="GtkBox" id="box2">
-            <property name="orientation">vertical</property>
-            <property name="margin-top">18</property>
-            <property name="margin-bottom">18</property>
-            <property name="margin-start">18</property>
-            <property name="margin-end">18</property>
-            <property name="spacing">10</property>
+          <object class="GtkLabel" id="label12">
+            <property name="xalign">0.5</property>
+            <property name="yalign">0</property>
+            <property name="wrap">True</property>
+            <property name="max-width-chars">60</property>
+            <property name="label" translatable="yes">In order to use enterprise logins, this computer needs 
to be enrolled in a domain. Please have your network administrator type the domain password here, and choose 
a unique computer name for your computer.</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkGrid" id="grid1">
+            <property name="margin-start">12</property>
+            <property name="hexpand">True</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkLabel" id="label13">
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Domain</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">join_domain</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
+                </layout>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="join_domain">
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
+                <property name="xalign">0</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label18">
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Computer</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">join_computer</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
+                </layout>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkEntry" id="join_computer">
+                <property name="hexpand">True</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label14">
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Administrator _Name</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">join_name</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
+                </layout>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkEntry" id="join_name">
+                <property name="hexpand">True</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
+                </layout>
+              </object>
+            </child>
             <child>
-              <object class="GtkLabel" id="label12">
-                <property name="xalign">0.5</property>
-                <property name="yalign">0</property>
-                <property name="wrap">True</property>
-                <property name="max-width-chars">60</property>
-                <property name="label" translatable="yes">In order to use enterprise logins, this computer 
needs to be enrolled in a domain. Please have your network administrator type the domain password here, and 
choose a unique computer name for your computer.</property>
+              <object class="GtkLabel" id="label15">
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">Administrator Password</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">join_password</property>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
+                </layout>
+                <style>
+                  <class name="dim-label"/>
+                </style>
               </object>
             </child>
             <child>
-              <object class="GtkGrid" id="grid1">
-                <property name="margin-start">12</property>
+              <object class="GtkPasswordEntry" id="join_password">
                 <property name="hexpand">True</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label13">
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Domain</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">join_domain</property>
-                    <layout>
-                      <property name="column">0</property>
-                      <property name="row">0</property>
-                    </layout>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="join_domain">
-                    <property name="margin_top">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="xalign">0</property>
-                    <layout>
-                      <property name="column">1</property>
-                      <property name="row">0</property>
-                    </layout>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label18">
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">_Computer</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">join_computer</property>
-                    <layout>
-                      <property name="column">0</property>
-                      <property name="row">1</property>
-                    </layout>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="join_computer">
-                    <property name="hexpand">True</property>
-                    <layout>
-                      <property name="column">1</property>
-                      <property name="row">1</property>
-                    </layout>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label14">
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Administrator _Name</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">join_name</property>
-                    <layout>
-                      <property name="column">0</property>
-                      <property name="row">2</property>
-                    </layout>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="join_name">
-                    <property name="hexpand">True</property>
-                    <layout>
-                      <property name="column">1</property>
-                      <property name="row">2</property>
-                    </layout>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label15">
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Administrator Password</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">join_password</property>
-                    <layout>
-                      <property name="column">0</property>
-                      <property name="row">3</property>
-                    </layout>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkPasswordEntry" id="join_password">
-                    <property name="hexpand">True</property>
-                    <layout>
-                      <property name="column">1</property>
-                      <property name="row">3</property>
-                    </layout>
-                  </object>
-                </child>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
             </child>
           </object>