diff --git a/src/yasi_applets/disks/__pycache__/routes.cpython-313.pyc b/src/yasi_applets/disks/__pycache__/routes.cpython-313.pyc index 3a33872..f3625ee 100644 Binary files a/src/yasi_applets/disks/__pycache__/routes.cpython-313.pyc and b/src/yasi_applets/disks/__pycache__/routes.cpython-313.pyc differ diff --git a/src/yasi_applets/disks/disks_erase_menu.html b/src/yasi_applets/disks/disks_erase_menu.html index 27b50b5..d1ca7e6 100644 --- a/src/yasi_applets/disks/disks_erase_menu.html +++ b/src/yasi_applets/disks/disks_erase_menu.html @@ -10,7 +10,7 @@

{{ disk['name'] }}:   {{ disk['model'] }} - {{ disk['tran'] }} disk ({{(disk['size']/1024000000)|round(0)|int }} GB) - Serial: {{ disk['serial'] }}

- Select Disk + Select Disk
{% if disk['maj:min'] == "252:0" %} diff --git a/src/yasi_applets/disks/routes.py b/src/yasi_applets/disks/routes.py index 3260693..c860fd7 100644 --- a/src/yasi_applets/disks/routes.py +++ b/src/yasi_applets/disks/routes.py @@ -54,6 +54,34 @@ def disks_choose_disk_erase(): ) +@bp.route('/disks/choose_disk_erase_chosen/') +def disks_choose_disk_erase_confirm(disk): + """ + Disk chosen, show before and after of disk configuration. + """ + + partitions = current_app.config['CONFIG']['recipe']['create_partitions'] + + menu = current_app.config['CONFIG']['settings']['menu_order'].split(" ") + next_step_url = menu[menu.index("disks")+1] + if menu[menu.index("disks")] == 1: + previous_step_url = False + else: + previous_step_url = menu[menu.index("disks")-1] + blockdevs = lsblk.list_block_devices() + + return render_template('disks_erase_confirmed.html', + menu=current_app.config['CONFIG'] + ['settings']['menu'], + menu_order=current_app.config['CONFIG'] + ['settings'] + ['menu_order'].split(), + previous_step = previous_step_url, + next_step=next_step_url, blockdevs=blockdevs, + diskname=disk, partitions=partitions + ) + + @bp.route('/disks/advanced') def disks(): """ diff --git a/src/yasi_applets/welcome/welcome.html b/src/yasi_applets/welcome/welcome.html index abfb29a..de96a54 100644 --- a/src/yasi_applets/welcome/welcome.html +++ b/src/yasi_applets/welcome/welcome.html @@ -12,8 +12,8 @@
- +

{{ string_dict['welcome_text'] }}

{{ string_dict['confirm_text'] }}