From b6a27582c92f5c07b018474b94306d4f2c4208d1 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Fri, 20 Oct 2017 14:55:01 +1300
Subject: [PATCH] redo padding and layout of network views

---
 subiquitycore/ui/views/network.py             |  3 ++-
 .../ui/views/network_configure_interface.py   | 16 ++++++++++++---
 .../network_configure_manual_interface.py     | 20 +++++++++++--------
 .../views/network_configure_wlan_interface.py | 19 ++++++++++--------
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/subiquitycore/ui/views/network.py b/subiquitycore/ui/views/network.py
index 7635cc7e..85665fbb 100644
--- a/subiquitycore/ui/views/network.py
+++ b/subiquitycore/ui/views/network.py
@@ -127,9 +127,10 @@ class NetworkView(BaseView):
                 ])
         self.error_showing = False
         self.frame = Pile([
+            ('pack', Text("")),
             self.lb,
             ('pack', self.footer)])
-        self.frame.focus_position = 1
+        self.frame.focus_position = 2
         super().__init__(self.frame)
 
     def _build_buttons(self):
diff --git a/subiquitycore/ui/views/network_configure_interface.py b/subiquitycore/ui/views/network_configure_interface.py
index cc53a013..5ded6e7c 100644
--- a/subiquitycore/ui/views/network_configure_interface.py
+++ b/subiquitycore/ui/views/network_configure_interface.py
@@ -13,12 +13,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import logging
+
+from urwid import Text
+
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import done_btn, menu_btn
 from subiquitycore.ui.container import ListBox, Pile
 from subiquitycore.ui.utils import button_pile, Padding
 from subiquitycore.ui.views.network import _build_gateway_ip_info_for_version, _build_wifi_info
-import logging
 
 log = logging.getLogger('subiquitycore.network.network_configure_interface')
 
@@ -29,7 +32,15 @@ class NetworkConfigureInterfaceView(BaseView):
         self.controller = controller
         self.dev = self.model.get_netdev_by_name(name)
         self._build_widgets()
-        super().__init__(ListBox(self._build_body()))
+        super().__init__(Pile([
+            ('pack', Text("")),
+            ListBox(self._build_body()),
+            ('pack', Pile([
+                ('pack', Text("")),
+                self._build_buttons(),
+                ('pack', Text("")),
+                ])),
+            ]))
 
     def _build_widgets(self):
         self.ipv4_info = Pile(_build_gateway_ip_info_for_version(self.dev, 4))
@@ -57,7 +68,6 @@ class NetworkConfigureInterfaceView(BaseView):
             Padding.center_79(self.ipv6_info),
             Padding.center_79(self.ipv6_method),
             Padding.line_break(""),
-            self._build_buttons(),
         ])
         return body
 
diff --git a/subiquitycore/ui/views/network_configure_manual_interface.py b/subiquitycore/ui/views/network_configure_manual_interface.py
index e681eb29..b46f2d52 100644
--- a/subiquitycore/ui/views/network_configure_manual_interface.py
+++ b/subiquitycore/ui/views/network_configure_manual_interface.py
@@ -20,8 +20,8 @@ from urwid import connect_signal, Text
 
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import menu_btn
-from subiquitycore.ui.container import ListBox
-from subiquitycore.ui.utils import button_pile, Padding
+from subiquitycore.ui.container import ListBox, Pile
+from subiquitycore.ui.utils import Padding
 from subiquitycore.ui.interactive import RestrictedEditor, StringEditor
 from subiquitycore.ui.form import Form, FormField, StringField
 
@@ -133,14 +133,18 @@ class BaseNetworkConfigureManualView(BaseView):
         self.form.searchdomains.value = ', '.join(self.dev.configured_searchdomains)
         self.error = Text("", align='center')
         #self.set_as_default_gw_button = Pile(self._build_set_as_default_gw_button())
-        body = [
-            Padding.center_79(self.form.as_rows(self)),
+        body = Pile([
+            ('pack', Text("")),
+            Padding.center_79(ListBox([self.form.as_rows(self)])),
             #Padding.line_break(""),
             #Padding.center_79(self.set_as_default_gw_button),
-            Padding.line_break(""),
-            self.form.buttons,
-        ]
-        super().__init__(ListBox(body))
+            ('pack', Pile([
+                ('pack', Text("")),
+                self.form.buttons,
+                ('pack', Text("")),
+                ])),
+            ])
+        super().__init__(body)
 
     def refresh_model_inputs(self):
         try:
diff --git a/subiquitycore/ui/views/network_configure_wlan_interface.py b/subiquitycore/ui/views/network_configure_wlan_interface.py
index 5839d690..154c4bfe 100644
--- a/subiquitycore/ui/views/network_configure_wlan_interface.py
+++ b/subiquitycore/ui/views/network_configure_wlan_interface.py
@@ -71,15 +71,18 @@ class NetworkConfigureWLANView(BaseView):
         self.inputs = Pile(self._build_iface_inputs())
 
         self.error = Text("")
-        self.body = [
-            Padding.center_79(self.inputs),
-            Padding.line_break(""),
-            Padding.center_79(Color.info_error(self.error)),
-            Padding.line_break(""),
-            self.form.buttons,
-        ]
+        self.body = Pile([
+            ('pack', Text("")),
+            ListBox([Padding.center_79(self.inputs)]),
+            ('pack', Pile([
+                ('pack', Text("")),
+                Padding.center_79(Color.info_error(self.error)),
+                self.form.buttons,
+                ('pack', Text("")),
+                ])),
+            ])
         self.orig_w = None
-        super().__init__(ListBox(self.body))
+        super().__init__(self.body)
 
     def show_ssid_list(self, sender):
         self.show_overlay(NetworkList(self, self.dev.actual_ssids))