StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #164 from CanonicalLtd/mwhudson/ui-remarks 

address some UI comments from Mark
This commit is contained in:
Mathieu Trudel-Lapierre 2016-09-20 11:01:35 -04:00 committed by GitHub
parent f94e7fce52 e765538c95
commit 4c29d4fd42
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console_conf/controllers/welcome.py
View File

@ -25,9 +25,7 @@ class WelcomeController(WelcomeControllerBase):
def welcome(self):
title = "Ubuntu Core"
excerpt = ("Configure the network and setup an administrator "
"account on this all-snap Ubuntu Core system. After "
"this setup process you will have secure web or command "
"access to the system.")
"account on this all-snap Ubuntu Core system.")
self.ui.set_header(title, excerpt)
self.ui.set_footer("")
view = WelcomeView(self.model, self.signal)

2
subiquitycore/controllers/network.py
View File

@ -206,7 +206,7 @@ class NetworkController(BaseController):
def start(self):
title = "Network connections"
excerpt = ("Configure at least the main interface this server will "
"use to talk to the store.")
"use to receive updates.")
footer = ("Additional networking info here")
self.ui.set_header(title, excerpt)
self.ui.set_footer(footer, 20)

6
subiquitycore/ui/views/network_configure_interface.py
View File

@ -119,7 +119,7 @@ class NetworkConfigureInterfaceView(BaseView):
def _build_ipv4_method_buttons(self):
dhcp4 = self.iface_obj.dhcp6
button_padding = 40
button_padding = 70
buttons = []
btn = menu_btn(label="Use a static IPv4 configuration",
@ -140,7 +140,7 @@ class NetworkConfigureInterfaceView(BaseView):
def _build_ipv6_method_buttons(self):
dhcp6 = self.iface_obj.dhcp6
button_padding = 40
button_padding = 70
buttons = []
btn = menu_btn(label="Use a static IPv6 configuration",
@ -166,7 +166,7 @@ class NetworkConfigureInterfaceView(BaseView):
return [Text("No access point configured.")]
def _build_wifi_config(self):
return [Padding.left_40(menu_btn(label="Configure WIFI settings",
return [Padding.left_70(menu_btn(label="Configure WIFI settings",
on_press=self.show_wlan_configuration))]
def _build_buttons(self):