base for simple/extended install-mode

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

templates/Froxlor/form/formfields.html.twig

@@ -63,17 +63,19 @@
 
 {# installation specific format #}
 {% macro field(id, field, norow = true, nohide = false, em = false) %}
-	{% if field.type != 'checkbox' %}
-	<div class="form-floating mb-3">
-		{{ _self.fieldrow(id, field, norow, nohide, em) }}
-		<label for="{{ id }}" class="form-label">{{ field.label|raw }}</label>
-	</div>
-	{% else %}
+	{% if field.type == 'checkbox' %}
 	<div class="form-check form-switch mb-3">
 		<input type="hidden" value="0" name="{{ id }}" />
 		<input type="checkbox" {% if (field.visible is defined and field.visible == false) or (field.disabled is defined and field.disabled == true) %} disabled {% endif %} value="{{ field.value }}" id="{{ id }}" name="{{ id }}" class="form-check-input {% if field.valid is defined and field.valid == false %}is-invalid{% endif %}" {% if field.checked is defined and field.checked == 1 %} checked="checked" {% endif %}>
 		<label for="{{ id }}" class="form-check-label">{{ field.label|raw }}</label>
 	</div>
+	{% elseif field.type == 'hidden' %}
+		{{ _self.fieldrow(id, field, norow, nohide, em) }}
+	{% else %}
+	<div class="form-floating mb-3">
+		{{ _self.fieldrow(id, field, norow, nohide, em) }}
+		<label for="{{ id }}" class="form-label">{{ field.label|raw }}</label>
+	</div>
 	{% endif %}
 {% endmacro %}
 

templates/Froxlor/install/index.html.twig

@@ -42,6 +42,10 @@
 						{% import "Froxlor/form/formfields.html.twig" as formfields %}
 
 						{% for id, field in section.fields %}
+							{% if field.advanced is defined and field.advanced == true and extended == false %}
+								{# hide advanced fields #}
+								{% set field = field|merge({'type': 'hidden'})  %}
+							{% endif %}
 							{{ formfields.field(id, field) }}
 						{% endfor %}