Commit previous changes

src/yasi_applets/disks/disks_erase_menu.html

@@ -10,7 +10,7 @@
 <p> <span style="width: 100%; border-radius: 8px 8px 0 0;" class="tag is-black">
         <b>{{ disk['name'] }}: &nbsp; </b>  {{ disk['model'] }} - {{ disk['tran'] }} disk ({{(disk['size']/1024000000)|round(0)|int }} GB) - Serial: {{ disk['serial'] }} </p>
     <center style="padding: 5px; padding-bottom: 5px;">
-     <td><a hx-get="/disks/choose_disk_erase_disk/{{ disk['name'] }}" hx-swap="outerHTML"><span class="tag is-link"> Select Disk  </span></a></td>
+     <td><a href="/disks/choose_disk_erase_chosen/{{ disk['name'] }}"><span class="tag is-link"> Select Disk  </span></a></td>
     </center>
 
   {% if disk['maj:min'] == "252:0" %}

src/yasi_applets/disks/routes.py

@@ -54,6 +54,34 @@ def disks_choose_disk_erase():
                            )
 
 
+@bp.route('/disks/choose_disk_erase_chosen/<disk>')
+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():
     """

src/yasi_applets/welcome/welcome.html

@@ -12,8 +12,8 @@
 <div hx-get="/software" hx-target="#none" hx-trigger="load"></div>
 <div hx-get="/summary" hx-target="#none" hx-trigger="load"></div>
 <!-- TODO: Add hook to fix next tab again after loading summary -->
-<div style="display: none;" id="none"></div>
 
+<div style="display: none;" id="none"></div>
 
 <p><b> {{ string_dict['welcome_text'] }} </b></p>
 <p>{{ string_dict['confirm_text'] }} </p> <br />