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

ubuntu-pro: update screen that asks whether to enable Ubuntu Pro 

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
Olivier Gayot 2022-08-09 11:54:28 +02:00
parent d81afa4b59
commit 384e5dc9b9
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
subiquity/ui/views/ubuntu_pro.py
View File

@ -146,9 +146,9 @@ class UpgradeModeForm(Form):
class UpgradeYesNoForm(Form): class UpgradeYesNoForm(Form):
""" Represents a form asking if we want to upgrade to Ubuntu Pro. """ Represents a form asking if we want to upgrade to Ubuntu Pro.
+---------------------------------------------------------+ +---------------------------------------------------------+
| (X) Upgrade to Ubuntu Pro | | (X) Enable Ubuntu Pro |
| | | |
| ( ) Do this later | | ( ) Skip for now |
| | | |
| You can always enable Ubuntu Pro later via the | | You can always enable Ubuntu Pro later via the |
| 'pro attach' command. | | 'pro attach' command. |
@ -163,10 +163,10 @@ class UpgradeYesNoForm(Form):
group: List[RadioButtonField] = [] group: List[RadioButtonField] = []
upgrade = RadioButtonField( upgrade = RadioButtonField(
group, _("Upgrade to Ubuntu Pro"), group, _("Enable Ubuntu Pro"),
help=NO_HELP) help=NO_HELP)
skip = RadioButtonField( skip = RadioButtonField(
group, _("Do this later"), group, _("Skip for now"),
help="\n" + _("You can always enable Ubuntu Pro later via the" help="\n" + _("You can always enable Ubuntu Pro later via the"
" 'pro attach' command.")) " 'pro attach' command."))
@ -275,13 +275,16 @@ class UbuntuProView(BaseView):
def upgrade_yes_no_screen(self) -> Widget: def upgrade_yes_no_screen(self) -> Widget:
""" Return a screen that asks the user to skip or upgrade. """ Return a screen that asks the user to skip or upgrade.
+---------------------------------------------------------+ +---------------------------------------------------------+
| Upgrade this machine to Ubuntu Pro or skip this step. | | Upgrade this machine to Ubuntu Pro for security updates |
| on a much wider range of packages, until 2032. Assists |
| with FedRAMP, FIPS, STIG, HIPAA and other compliance or |
| hardening requirements. |
| | | |
| [ About Ubuntu Pro -> ] | | [ About Ubuntu Pro -> ] |
| | | |
| ( ) Upgrade to Ubuntu Pro | | ( ) Enable Ubuntu Pro |
| | | |
| (X) Do this later | | (X) Skip for now |
| You can always enable Ubuntu Pro later via the | | You can always enable Ubuntu Pro later via the |
| 'pro attach' command. | | 'pro attach' command. |
| | | |
@ -290,7 +293,10 @@ class UbuntuProView(BaseView):
+---------------------------------------------------------+ +---------------------------------------------------------+
""" """
excerpt = _("Upgrade this machine to Ubuntu Pro or skip this step.") excerpt = _("Upgrade this machine to Ubuntu Pro for security updates"
" on a much wider range of packages, until 2032. Assists"
" with FedRAMP, FIPS, STIG, HIPAA and other compliance or"
" hardening requirements.")
about_pro_btn = menu_btn( about_pro_btn = menu_btn(
_("About Ubuntu Pro"), _("About Ubuntu Pro"),