Merge pull request #298 from CanonicalLtd/mwhudson/design-feedback

address feedback from sprint
This commit is contained in:
Michael Hudson-Doyle 2018-03-14 15:00:02 +13:00 committed by GitHub
commit dfc6627801
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions

View File

@ -187,7 +187,7 @@ class IdentityView(BaseView):
iu.caption = _ssh_import_captions[val]
iu.enabled = val is not None
if val is not None:
self.form_rows.body.focus += 1
self.form_rows.body.focus += 2
def done(self, result):
cpassword = self.model.encrypt_password(self.form.password.value)

View File

@ -105,7 +105,7 @@ class BoundFormField(object):
self.form = form
self.in_error = False
self._help = None
self.help_text = Text("", align="center")
self.help_text = Text("")
self._caption = None
self.pile = None
self._enabled = True
@ -331,6 +331,8 @@ class Form(object, metaclass=MetaForm):
rows = []
for field in self._fields:
rows.append(field.as_row(view, longest_caption))
rows.append(Text(""))
del rows[-1:]
return rows
def validated(self):

View File

@ -121,7 +121,7 @@ class BaseNetworkConfigureManualView(BaseView):
connect_signal(self.form, 'submit', self.done)
connect_signal(self.form, 'cancel', self.cancel)
self.form.subnet.help = _("CIDR e.g. %s"%(self.example_address,))
self.form.subnet.help = _("Example: %s"%(self.example_address,))
configured_addresses = self.dev.configured_ip_addresses_for_version(self.ip_version)
if configured_addresses:
addr = ipaddress.ip_interface(configured_addresses[0])