{{ child['name'] }} ({{ (child['size']/1024000000)|round(2) }} GiB)
-/boot/efi - vfat +
{{ child['mountpoint'] }} + {{ child['fstype'] }}
Edit partition: /dev/sda2
+Edit partition: {{ partition }}
Primary Partition
diff --git a/src/applets/disks/routes.py b/src/applets/disks/routes.py
index a758327..3208526 100644
--- a/src/applets/disks/routes.py
+++ b/src/applets/disks/routes.py
@@ -18,9 +18,10 @@ def disks():
else:
previous_step_url = menu[menu.index("disks")-1]
- add_disks_button = ' '
- add_swap_button = ' '
+ add_disks_button = ' '
+ add_swap_button = ' '
bottom_menu = add_disks_button + add_swap_button
+ build_summary()
return render_template('disks.html', blockdevs=blockdevs,
menu=current_app.config['CONFIG']['settings']['menu'],
@@ -35,8 +36,11 @@ def disks_partition(part):
"""
Partition modal for the webui partition screen.
"""
+ print("Partition is: " + part)
+ partition = part
return render_template('disks_partition.html',
- menu=current_app.config['CONFIG']['settings']['menu'])
+ menu=current_app.config['CONFIG']['settings']['menu'],
+ partition=partition)
def build_menu():
@@ -47,4 +51,15 @@ def build_menu():
#current_app.config['CONFIG']['settings']['menu']['welcome'] = (build_stringlist()['menu_item'], "/welcome", 10)
current_app.config['CONFIG']['settings']['menu']['disks'] = ("Disks", "/disks", 30)
+
+def build_summary():
+ """
+ Write up a summary of what this module will do.
+ """
+ current_app.config['CONFIG']['Summary']['disks'] = {}
+ current_app.config['CONFIG']['Summary']['disks']['heading'] = "Disks and Partitions"
+ current_app.config['CONFIG']['Summary']['disks']['bleh'] = current_app.config['CONFIG']['recipe']['popcon']['enable_popcon']
+ current_app.config['CONFIG']['Summary']['disks']['text'] = "Pre-configured disk layout."
+ return("ok?")
+
build_menu()
diff --git a/src/applets/install/install.html b/src/applets/install/install.html
index bead2d7..e1fa811 100644
--- a/src/applets/install/install.html
+++ b/src/applets/install/install.html
@@ -1,9 +1,15 @@
{% extends "layout.html" %}
{% block body %}
- Installing... Installing... Installing system, the rest of the process is automated.
+ Or are we...
+
+
+
No desktop environment selected." + return("ok?") + + +build_menu() diff --git a/src/applets/software/software.html b/src/applets/software/software.html index f01ab7e..663e68f 100644 --- a/src/applets/software/software.html +++ b/src/applets/software/software.html @@ -5,11 +5,23 @@
-
-Popularity Contest -
The Popularity Contest (popcon) is a programme where anonymous data is sent back to Debian, tracking the number of packages installed. More information can be obtained at https://popcon.debian.org.
Would you like to participate in popcon?
+
The Popularity Contest (popcon) is a programme where anonymous data is sent back to Debian, tracking the number of packages installed. More information can be obtained at https://popcon.debian.org.
+ + +
" + str(current_app.config['CONFIG']['Summary']['software'])) + summary = config['Summary'] return render_template('summary.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) + next_step=next_step_url, + config=config, + html=html, + summary=summary) def build_menu(): diff --git a/src/applets/summary/summary.html b/src/applets/summary/summary.html index 611e3d3..375f30e 100644 --- a/src/applets/summary/summary.html +++ b/src/applets/summary/summary.html @@ -3,7 +3,25 @@
Ready to install! Please review all changes.
-This is the last chance to back out before committing to instal, please ensure all the details are correct.
+This is the last chance to back out before committing to install, please ensure all the details are correct.
+ ++ +{% for module in summary %} + +
{{ summary[module]['heading'] }}
+ + +{{ summary[module]['text']|safe }} + ++ +{% endfor %} + +
+ +
That username is not available
') + else: + return('That username is available
') + build_summary() + return("bleh") + def build_stringlist(): @@ -55,6 +87,7 @@ def build_stringlist(): string_dict['initial_user_text'] = _("Let's set up an initial user.") string_dict['full_name'] = _("Full Name") string_dict['user_name'] = _("Username") + string_dict['user_name_hint'] = _("One word, all lowercase") string_dict['user_name_available'] = _("This username is available") string_dict['user_name_not_available'] = _("This username is not available") string_dict['user_name_reserved'] = _("This username is reserved by the system") @@ -73,4 +106,16 @@ def build_menu(): current_app.config['CONFIG']['settings']['menu']['users'] = (build_stringlist()['menu_item'], "/users", 20) print(current_app.config['CONFIG']['settings']['menu']) + +def build_summary(): + """ + Write up a summary of what this module will do. + """ + current_app.config['CONFIG']['Summary']['users'] = {} + current_app.config['CONFIG']['Summary']['users']['heading'] = "Users and Identity" + current_app.config['CONFIG']['Summary']['users']['bleh'] = current_app.config['CONFIG']['recipe']['popcon']['enable_popcon'] + current_app.config['CONFIG']['Summary']['users']['settings'] = current_app.config['CONFIG']['recipe']['users']['users'] + current_app.config['CONFIG']['Summary']['users']['text'] = "Add primary user with the username: " + str(current_app.config['CONFIG']['recipe']['users']['users'][0]['username']) + return("ok?") + build_menu() diff --git a/src/applets/users/users.html b/src/applets/users/users.html index b3522e4..c61bad4 100644 --- a/src/applets/users/users.html +++ b/src/applets/users/users.html @@ -5,45 +5,57 @@+