From 989f613dbff17c091289d0bad278a2f518143066 Mon Sep 17 00:00:00 2001 From: Chris Johnston Date: Tue, 2 Feb 2016 20:38:35 +0000 Subject: [PATCH 1/2] Fix wording for creating a new password screen --- cloudinstall/controllers/installbase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloudinstall/controllers/installbase.py b/cloudinstall/controllers/installbase.py index cf88a260..40f2a5bf 100644 --- a/cloudinstall/controllers/installbase.py +++ b/cloudinstall/controllers/installbase.py @@ -54,7 +54,7 @@ def __init__(self, ui, config, loop): def _set_install_type(self, install_type): self.install_type = install_type self.ui.show_password_input( - 'Create a New OpenStack Password', self._save_password) + 'Create a New Landscape Password', self._save_password) def _save_password(self, creds): """ Checks passwords match and proceeds @@ -63,7 +63,7 @@ def _save_password(self, creds): if password.isdigit(): self.ui.status_error_message("Password must not be a number") return self.ui.show_password_input( - 'Create a New OpenStack Password', self._save_password) + 'Create a New Landscape Password', self._save_password) if 'confirm_password' in creds: confirm_password = creds['confirm_password'].value if password and password == confirm_password: @@ -72,7 +72,7 @@ def _save_password(self, creds): else: self.ui.status_error_message('Passwords did not match') return self.ui.show_password_input( - 'Create a New OpenStack Password', self._save_password) + 'Create a New Landscape Password', self._save_password) def _save_maas_creds(self, creds): maas_server = creds['maas_server'].value From deaffa7558e9fe21ba87714653df5ab8bad6dae3 Mon Sep 17 00:00:00 2001 From: Chris Johnston Date: Tue, 2 Feb 2016 20:46:06 +0000 Subject: [PATCH 2/2] Make wording more generic per review --- cloudinstall/controllers/installbase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloudinstall/controllers/installbase.py b/cloudinstall/controllers/installbase.py index 40f2a5bf..8e63683a 100644 --- a/cloudinstall/controllers/installbase.py +++ b/cloudinstall/controllers/installbase.py @@ -54,7 +54,7 @@ def __init__(self, ui, config, loop): def _set_install_type(self, install_type): self.install_type = install_type self.ui.show_password_input( - 'Create a New Landscape Password', self._save_password) + 'Create a New Password', self._save_password) def _save_password(self, creds): """ Checks passwords match and proceeds @@ -63,7 +63,7 @@ def _save_password(self, creds): if password.isdigit(): self.ui.status_error_message("Password must not be a number") return self.ui.show_password_input( - 'Create a New Landscape Password', self._save_password) + 'Create a New Password', self._save_password) if 'confirm_password' in creds: confirm_password = creds['confirm_password'].value if password and password == confirm_password: @@ -72,7 +72,7 @@ def _save_password(self, creds): else: self.ui.status_error_message('Passwords did not match') return self.ui.show_password_input( - 'Create a New Landscape Password', self._save_password) + 'Create a New Password', self._save_password) def _save_maas_creds(self, creds): maas_server = creds['maas_server'].value