diff --git a/src/applets/hardware/__init__.py b/src/applets/hardware/__init__.py new file mode 100644 index 0000000..2ee4eff --- /dev/null +++ b/src/applets/hardware/__init__.py @@ -0,0 +1,7 @@ +from flask import Blueprint + +bp = Blueprint('hardware', __name__, + template_folder='') + +from applets.hardware import routes + diff --git a/src/applets/hardware/hardware.html b/src/applets/hardware/hardware.html new file mode 100644 index 0000000..ea84634 --- /dev/null +++ b/src/applets/hardware/hardware.html @@ -0,0 +1,41 @@ +{% extends "layout.html" %} +{% block body %} + +

Would you like fries with that?

+ +
+ +
+ +Real-time Clock + +
+

Date / time. / timezone


+ +
+
+
+ +
+ +Firmware + +
+

Install additional firmware.


+ +
+
+
+ + +{% endblock %} diff --git a/src/applets/hardware/routes.py b/src/applets/hardware/routes.py new file mode 100644 index 0000000..e51488c --- /dev/null +++ b/src/applets/hardware/routes.py @@ -0,0 +1,65 @@ +from applets.hardware import bp +from flask import Flask, request, session, redirect, \ + url_for, render_template, flash, Blueprint +from flask import current_app + +@bp.route('/hardware') +def webui_hardware(): + """ + Hardware screen for the webui. + """ + menu = current_app.config['CONFIG']['settings']['menu_order'].split(" ") + next_step_url = menu[menu.index("hardware")+1] + if menu[menu.index("hardware")] == 1: + previous_step_url = False + else: + previous_step_url = menu[menu.index("hardware")-1] + + sources_button = '  ' + blends_button = '  ' + bottom_menu = sources_button + blends_button + build_summary() + + return render_template('hardware.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, + bottom_menu = bottom_menu, + popcon=current_app.config['CONFIG']['recipe']['popcon']['enable_popcon']) + + +@bp.route('/hardware/settings', methods=['GET', 'POST']) +def hardware_settings(): + """ + Receive settings for the hardware applet. + """ + if request.method == 'POST': + popcon = "popcon" in request.form + current_app.config['CONFIG']['recipe']['popcon']['enable_popcon'] = popcon + print(current_app.config['CONFIG']['recipe']['popcon']['enable_popcon']) + build_summary() + return ('', 204) + + +def build_menu(): + """ + Define menu items and paths. + """ + # proper one once translations are done: + #current_app.config['CONFIG']['settings']['menu']['welcome'] = (build_stringlist()['menu_item'], "/welcome", 10) + current_app.config['CONFIG']['settings']['menu']['hardware'] = ("Hardware", "/hardware", 40) + + +def build_summary(): + """ + Write up a summary of what this module will do. + """ + current_app.config['CONFIG']['Summary']['hardware'] = {} + current_app.config['CONFIG']['Summary']['hardware']['heading'] = "Hardware" + current_app.config['CONFIG']['Summary']['hardware']['bleh'] = current_app.config['CONFIG']['recipe']['popcon']['enable_popcon'] + current_app.config['CONFIG']['Summary']['hardware']['text'] = "Participate in Popularity Contest: " + str(current_app.config['CONFIG']['recipe']['popcon']['enable_popcon']) + "
No desktop environment selected." + return("ok?") + + +build_menu() diff --git a/src/applets/main/help.html b/src/applets/main/help.html index e468fbe..66cbf3c 100644 --- a/src/applets/main/help.html +++ b/src/applets/main/help.html @@ -4,16 +4,13 @@

Help

-

The help system is not yet implemented. +

The help system is not yet implemented.

- -
-
diff --git a/src/applets/main/quit.html b/src/applets/main/quit.html index bc1575a..5c4b96e 100644 --- a/src/applets/main/quit.html +++ b/src/applets/main/quit.html @@ -4,13 +4,14 @@

Exit system installer

-

Quitting is not yet implemented. +

Quitting is not yet implemented. +
+

ALT+F4 will bring up a dialog that works though.

+ +
- -
-
diff --git a/src/applets/users/routes.py b/src/applets/users/routes.py index e4b1f0d..1ca77d1 100644 --- a/src/applets/users/routes.py +++ b/src/applets/users/routes.py @@ -33,7 +33,7 @@ def users_root(): else: previous_step_url = menu[menu.index("users")-1] - root_button = '  ' + root_button = '  ' ldap_button = '  ' ad_button = '  ' csv_button = '  ' diff --git a/src/applets/welcome/routes.py b/src/applets/welcome/routes.py index be3a200..e1a56f2 100644 --- a/src/applets/welcome/routes.py +++ b/src/applets/welcome/routes.py @@ -5,6 +5,7 @@ from flask import Flask, request, session, redirect, \ from flask import current_app import gettext import dmm.lsblk as lsblk +import dmm.timezone as timezone # Set up Gettext def set_language(LANG): @@ -60,6 +61,7 @@ def welcome_index(): string_dict=string_dict, selected_lang=lang, menu=current_app.config['CONFIG']['settings']['menu'], menu_order=current_app.config['CONFIG']['settings']['menu_order'].split(), + timezones=timezone.list_timezones()[1].split("\n"), previous_step=previous_step_url, next_step=next_step_url, bottom_menu=bottom_menu) diff --git a/src/applets/welcome/welcome.html b/src/applets/welcome/welcome.html index a9a6df7..044c22f 100644 --- a/src/applets/welcome/welcome.html +++ b/src/applets/welcome/welcome.html @@ -8,11 +8,12 @@

{{ string_dict['welcome_text'] }}

{{ string_dict['confirm_text'] }}


-
+
+
+
- -
diff --git a/src/templates/footer.html b/src/templates/footer.html index 8197859..6a2d931 100644 --- a/src/templates/footer.html +++ b/src/templates/footer.html @@ -2,29 +2,35 @@
{% if previous_step %} - - - + + + {% endif %} {% if bottom_menu %} -{{ bottom_menu | safe }} + {{ bottom_menu | safe }} {% endif %} -
+
+ {% if next_step %} -{% if next_step == "install" %} - -{% else %} - - -Next + {% if next_step == "install" %} + + {% else %} + + + Next + {% endif %} + {% endif %} -{% endif %} -{% endif %} -
+ diff --git a/src/templates/header.html b/src/templates/header.html index 569f62f..87ccfc4 100644 --- a/src/templates/header.html +++ b/src/templates/header.html @@ -2,18 +2,17 @@
- +
{% for item in menu_order %} - + {% endfor %}
-