Merge branch '0.11-dev' of github.com:Froxlor/Froxlor into 0.11-dev

templates/Froxlor/form/formfields.html.twig

@@ -6,7 +6,7 @@
 					{% if field.desc is defined and field.desc is not empty %}<br><small>{{ field.desc|raw }}</small>
 					{% endif %}
 				</label>
-				<div class="col-sm-8">
+				<div class="col-sm-8{% if field.type == 'infotext' %} d-flex align-items-center{% endif %}">
 				{% endif %}
 				{% if field.type == 'text' or field.type == 'password' or field.type == 'number' or field.type == 'file' or field.type == 'email' or field.type == 'hidden' %}
 					{{ _self.input(id, field) }}
@@ -24,6 +24,8 @@
 					{{ _self.link(id, field) }}
 				{% elseif field.type == 'itemlist' %}
 					{{ _self.itemlist(id, field) }}
+				{% elseif field.type == 'infotext' %}
+					{{ _self.infotext(id, field) }}
 				{% endif %}
 				{% if norow == false and field.type != 'hidden' %}
 				</div>
@@ -49,11 +51,27 @@
 	{% endif %}
 {% endmacro %}
 
+{% macro infotext(id, field) %}
+	{% if field.next_to is defined %}
+		<div class="input-group">
+		{% endif %}
+		<span {% if field.classes is defined %} class="{{ field.classes }}" {% endif %}>{{ field.value }}</span>
+		{% if field.next_to is defined %}
+			{% for nid, nfield in field.next_to %}
+				{% if nfield.next_to_prefix is defined %}
+					<span class="input-group-text">{{ nfield.next_to_prefix }}</span>
+				{% endif %}
+				{{ _self.fieldrow(nid, nfield, true) }}
+			{% endfor %}
+		</div>
+	{% endif %}
+{% endmacro %}
+
 {% macro plain(id, field) %}
 	{% if field.next_to is defined %}
 		<div class="input-group">
 		{% endif %}
-		<input type="text" readonly class="form-control-plaintext" id="{{ id }}" value="{{ field.value }}">
+		<input type="text" readonly class="form-control-plaintext" id="{{ id }}" name="{{ id }}" value="{{ field.value }}">
 		{% if field.next_to is defined %}
 			{% for nid, nfield in field.next_to %}
 				{% if nfield.next_to_prefix is defined %}
@@ -74,7 +92,7 @@
 			<input type="text" readonly class="form-control-plaintext" value="{{ field.display }}">
 		{% endif %}
 		{% if field.note is defined and field.note is not empty %}
-		<div class="invalid-feedback">{{ field.note|raw }}</div>
+			<div class="invalid-feedback">{{ field.note|raw }}</div>
 		{% endif %}
 		{% if field.next_to is defined %}
 			{% for nid, nfield in field.next_to %}

templates/Froxlor/table/callbacks.html.twig

@@ -18,6 +18,17 @@
     {% endif %}
 {% endmacro %}
 
+{% macro booleanWithInfo(data) %}
+    {% if (data.checked) %}
+        <i class="fa fa-check-circle text-success"></i>
+    {% else %}
+        <i class="fa fa-times-circle text-danger"></i>
+    {% endif %}
+	{% if data.info is not empty %}
+	{{ data.info }}
+	{% endif %}
+{% endmacro %}
+
 {% macro link(data) %}
     {% apply spaceless %}
         <a href="{{ data.href }}" {% if data.class is defined %}class="{{ data.class }}"{% endif %} {% if data.target is defined %}target="{{ data.target }}"{% endif %}>

templates/Froxlor/table/table.html.twig

@@ -32,6 +32,8 @@
 											{{ callbacks.progressbar(td.data.data) }}
 										{% elseif td.data.type == 'boolean' %}
 											{{ callbacks.boolean(td.data.data) }}
+										{% elseif td.data.type == 'booleanWithInfo' %}
+											{{ callbacks.booleanWithInfo(td.data.data) }}
 										{% elseif td.data.type == 'link' %}
 											{{ callbacks.link(td.data.data) }}
 										{% elseif td.data.type == 'domainWithSan' %}

templates/Froxlor/user/table.html.twig

@@ -1,9 +1,26 @@
 {% extends "Froxlor/userarea.html.twig" %}
 
 {% block content %}
-
-	{% import "Froxlor/table/table.html.twig" as table %}
-
-	{{ table.table(listing) }}
-
+	<div class="row">
+		<div class="col-12 {% if actions_links is iterable or (entity_info is defined and entity_info is not empty) %}col-md-10 order-2 order-md-1{% endif %}">
+			{% import "Froxlor/table/table.html.twig" as table %}
+			{{ table.table(listing) }}
+		</div>
+		{% if actions_links is iterable or (entity_info is defined and entity_info is not empty) %}
+			<div class="col-12 col-md-2 order-1 order-md-2">
+				{% if actions_links is iterable %}
+					{% for link in actions_links %}
+						<a class="btn {{ link.class|default('btn-success') }} d-block mb-2" href="{{ link.href|raw }}">
+							<i class="{{ link.icon|default('fa-solid fa-plus-circle') }} me-1"></i>
+							{{ link.label }}</a>
+					{% endfor %}
+				{% endif %}
+				{% if entity_info is defined and entity_info is not empty %}
+					<div class="alert alert-info" role="alert">
+						{{ entity_info|raw }}
+					</div>
+				{% endif %}
+			</div>
+		{% endif %}
+	</div>
 {% endblock %}

templates/Froxlor/userarea.html.twig

@@ -43,7 +43,7 @@
 					</li>
 					<li class="nav-item dropdown me-2">
 						<a class="btn btn-secondary btn-sm d-block dropdown-toggle" href="#" id="navbarOpts" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-							<i class="fa fa-wrench"></i> {{ lng('panel.options') }}
+							<i class="fa fa-gears"></i> {{ lng('panel.options') }}
 						</a>
 						<ul class="dropdown-menu" aria-labelledby="navbarOpts">
 							<li>