diff --git a/src/yasi_applets/disks/__init__.py b/src/yasi_applets/disks/__init__.py index d9ee8c2..0ee44c4 100644 --- a/src/yasi_applets/disks/__init__.py +++ b/src/yasi_applets/disks/__init__.py @@ -1,7 +1,9 @@ from flask import Blueprint bp = Blueprint('disks', __name__, - template_folder='') + template_folder='', + static_folder='static', + static_url_path='/disks/static') from yasi_applets.disks import routes diff --git a/src/yasi_applets/disks/__pycache__/__init__.cpython-313.pyc b/src/yasi_applets/disks/__pycache__/__init__.cpython-313.pyc index 1db37ec..f78dd00 100644 Binary files a/src/yasi_applets/disks/__pycache__/__init__.cpython-313.pyc and b/src/yasi_applets/disks/__pycache__/__init__.cpython-313.pyc differ diff --git a/src/yasi_applets/disks/__pycache__/routes.cpython-313.pyc b/src/yasi_applets/disks/__pycache__/routes.cpython-313.pyc index 41c7896..2171935 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.html b/src/yasi_applets/disks/disks_advanced.html similarity index 90% rename from src/yasi_applets/disks/disks.html rename to src/yasi_applets/disks/disks_advanced.html index 830e05c..2634b40 100644 --- a/src/yasi_applets/disks/disks.html +++ b/src/yasi_applets/disks/disks_advanced.html @@ -1,33 +1,6 @@ {% extends "layout.html" %} {% block body %} -
- -

How would you like to install Debian?

- -
- -
-
- -

+
+

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

+
+ Select Disk +
+ + {% if disk['maj:min'] == "252:0" %} +
+
+ swap +

+
+
+ {% endif %} + +{% set colors = ['teal', '#E69F00', '#56B4E9', '#009E73', '#0072B2', '#D55E00', '#CC79A7'] %} + +
+ {% for child in disk['children'] %} + +
+   {{ child['name'] }} +
+ {% endfor %} +
+ + + + + + + + +{% for child in disk['children'] %} + + + + + + + +{% endfor %} +
PartitionTypeMount PointLabelSizeUsed
{{ child['name'] }}{{ child['fstype'] }}{{ child['mountpoint'] }}{{ child['label'] }} {{ (child['size']/1024000000)|round(2) }} GiB
+
+ + +{% endfor %} + +{% endblock %} diff --git a/src/yasi_applets/disks/disks_welcome.html b/src/yasi_applets/disks/disks_welcome.html new file mode 100644 index 0000000..4b54a5b --- /dev/null +++ b/src/yasi_applets/disks/disks_welcome.html @@ -0,0 +1,60 @@ +{% extends "layout.html" %} +{% block body %} + +

How would you like to install Debian?

+ +
+ +
+ + +
+
+Install next to existing partition +
+ + + +
+
+Replace a partition +
+ + + +
+
+Erase entire disk +
+ + + +
+
+Advanced partitioning +
+ + + +
+
+Preconfigured Partitioning +
+ + +
+ +
+

The following devices have been detected: + +

+ +

+ +{% endblock %} + +
diff --git a/src/yasi_applets/disks/routes.py b/src/yasi_applets/disks/routes.py index 7a7756c..964c120 100644 --- a/src/yasi_applets/disks/routes.py +++ b/src/yasi_applets/disks/routes.py @@ -5,6 +5,50 @@ import dmm.lsblk as lsblk from flask import current_app @bp.route('/disks') +def disks_welcome(): + """ + Welcome menu for partitioning + """ + 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_welcome.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 + ) + + +@bp.route('/disks/choose_disk_erase') +def disks_choose_disk_erase(): + """ + Choose a disk to erase + """ + 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_menu.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 + ) + + +@bp.route('/disks/advanced') def disks(): """ Disks screen for the webui. @@ -25,7 +69,7 @@ def disks(): bottom_menu = "" build_summary() - return render_template('disks.html', blockdevs=blockdevs, + return render_template('disks_advanced.html', blockdevs=blockdevs, menu=current_app.config['CONFIG']['settings']['menu'], menu_order=current_app.config['CONFIG']['settings']['menu_order'].split(), previous_step = previous_step_url, diff --git a/src/yasi_applets/disks/static/img/advanced_partitioning.png b/src/yasi_applets/disks/static/img/advanced_partitioning.png new file mode 100644 index 0000000..3e90054 Binary files /dev/null and b/src/yasi_applets/disks/static/img/advanced_partitioning.png differ diff --git a/src/yasi_applets/disks/static/img/erase_disk.png b/src/yasi_applets/disks/static/img/erase_disk.png new file mode 100644 index 0000000..eeffa1a Binary files /dev/null and b/src/yasi_applets/disks/static/img/erase_disk.png differ diff --git a/src/yasi_applets/disks/static/img/erase_partition.png b/src/yasi_applets/disks/static/img/erase_partition.png new file mode 100644 index 0000000..f3d48c2 Binary files /dev/null and b/src/yasi_applets/disks/static/img/erase_partition.png differ diff --git a/src/yasi_applets/disks/static/img/install_alongside.png b/src/yasi_applets/disks/static/img/install_alongside.png new file mode 100644 index 0000000..1263c00 Binary files /dev/null and b/src/yasi_applets/disks/static/img/install_alongside.png differ diff --git a/src/yasi_applets/disks/static/img/preconfigured_partitioning.png b/src/yasi_applets/disks/static/img/preconfigured_partitioning.png new file mode 100644 index 0000000..bce5afe Binary files /dev/null and b/src/yasi_applets/disks/static/img/preconfigured_partitioning.png differ